Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master into dev #14

Merged
merged 32 commits into from
Oct 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2af3fe3
Created env file because it was deleted
Jelmer-Ketelaar Oct 26, 2021
398c9b1
Fixed deleted code
Jelmer-Ketelaar Oct 26, 2021
5c7228f
Fixed deleted files
Jelmer-Ketelaar Oct 26, 2021
e47d569
Fixed deleted code
Jelmer-Ketelaar Oct 27, 2021
484d1ae
Fixed deleted code
JurrijnModderman Oct 27, 2021
f9bc194
Merge branch 'master' of https://github.com/Jelmer-Ketelaar/grandcruw…
JurrijnModderman Oct 27, 2021
91974ae
Added links to file
Jelmer-Ketelaar Oct 27, 2021
4485c5e
Formatted code
Jelmer-Ketelaar Oct 27, 2021
b37808c
Added back button
JurrijnModderman Oct 27, 2021
dbcc960
Merge branch 'master' of https://github.com/Jelmer-Ketelaar/grandcruw…
JurrijnModderman Oct 27, 2021
162b9e3
meals pagina styling klaar
Kingston02 Oct 28, 2021
0f47e44
background-color aangepast en styling toegevoegd aan de pagina
KawianW Oct 28, 2021
e7815c1
Formatted code
Kingston02 Oct 28, 2021
b34a9e2
Fixed code
Kingston02 Oct 28, 2021
bd94480
Added some styling
JurrijnModderman Oct 28, 2021
6391e6c
Merge branch 'master' of https://github.com/Jelmer-Ketelaar/grandcruw…
JurrijnModderman Oct 28, 2021
c9d5483
go back btn deleted
Kingston02 Oct 28, 2021
b9846c5
Merge branch 'master' of https://github.com/Jelmer-Ketelaar/grandcruw…
Kingston02 Oct 28, 2021
aa6e283
Merge branch 'master' of https://github.com/Jelmer-Ketelaar/grandcruw…
KawianW Oct 28, 2021
e0c9636
Changed the text
JurrijnModderman Oct 28, 2021
eb3dd0e
Merge branch 'master' of https://github.com/Jelmer-Ketelaar/grandcruw…
JurrijnModderman Oct 28, 2021
7eb4d2b
Styling the Category page
Kingston02 Oct 28, 2021
b8d7df1
Added grandcruwijnen/sdk
Jelmer-Ketelaar Oct 28, 2021
6f6b56e
Merge branch 'master' of https://github.com/Jelmer-Ketelaar/grandcruw…
Jelmer-Ketelaar Oct 28, 2021
096705a
Merge branch '#64' into master
Jelmer-Ketelaar Oct 29, 2021
17b86a3
Now you can see all the wines with this SKU
Jelmer-Ketelaar Oct 29, 2021
752aa79
Merge branch 'master' of https://github.com/Jelmer-Ketelaar/grandcruw…
Jelmer-Ketelaar Oct 29, 2021
cb06a9b
Fixed error
Jelmer-Ketelaar Oct 29, 2021
66de28b
Merge pull request #12 from Jelmer-Ketelaar/development
Jelmer-Ketelaar Oct 29, 2021
edd7dde
Set images for Category
Kingston02 Oct 29, 2021
7d9be8e
Merge branch 'master' of https://github.com/Jelmer-Ketelaar/grandcruw…
Kingston02 Oct 29, 2021
879f433
Merge pull request #13 from Jelmer-Ketelaar/development
Jelmer-Ketelaar Oct 30, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"minimum-stability": "stable",
"prefer-stable": true,
"require": {
"php": "^8.0",
"ext-ctype": "*",
"ext-curl": "*",
"ext-iconv": "*",
Expand All @@ -17,8 +16,8 @@
"doctrine/doctrine-migrations-bundle": "^3.1",
"doctrine/orm": "^2.10",
"doctrine/sql-formatter": "^1.1",
"guzzlehttp/guzzle": "^7.4",
"grandcruwijnen/sdk": "^1.0.26",
"guzzlehttp/guzzle": "^6.5",
"grandcruwijnen/sdk": "^0.1.26",
"nelmio/cors-bundle": "^2.1",
"phpdocumentor/reflection-docblock": "^5.2",
"sensio/framework-extra-bundle": "^6.1",
Expand Down Expand Up @@ -53,6 +52,8 @@
"twig/twig": "^2.12|^3.0"
},
"require-dev": {
"roave/security-advisories": "dev-latest"
,
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "5.3.*",
"symfony/css-selector": "5.3.*",
Expand All @@ -67,8 +68,12 @@
"preferred-install": {
"*": "dist"
},
"sort-packages": true
"sort-packages": true,
"platform": {
"php": "7.4"
}
},

"autoload": {
"psr-4": {
"App\\": "src/"
Expand Down
Loading