Skip to content

Commit c04c799

Browse files
committed
Merge branch 'develop' into release/6.69.0
2 parents b3743a9 + 07ad40a commit c04c799

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1039
-1165
lines changed

.env

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
# Real environment variables win over .env files.
1010
#
1111
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
12+
# https://symfony.com/doc/current/configuration/secrets.html
1213
#
1314
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
1415
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
@@ -88,6 +89,7 @@ CUSTOM_BASE_TEMPLATE=
8889
# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
8990
MESSENGER_TRANSPORT_DSN=doctrine://default
9091
# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
92+
MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
9193
###< symfony/messenger ###
9294

9395
CLAMD_SOCKET='unix:///run/clamd.scan/clamd.sock'
@@ -103,6 +105,8 @@ MAILER_DSN=null://null
103105
MAINSITE='https://www.griidc.org'
104106
###< The main website ###
105107

108+
## Sitemap Parameters (Requires YYYY-MM-DD format, or set to '' to disable)
109+
SITEMAP_MIN_DATE='2025-01-01'
106110

107111
###> knplabs/knp-snappy-bundle ###
108112
WKHTMLTOPDF_PATH=/usr/local/bin/wkhtmltopdf

.env.dev

Whitespace-only changes.

assets/js/entry/login.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import '../../scss/login.scss';

assets/scss/login.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@tailwind base;
2+
@tailwind components;
3+
@tailwind utilities;

bin/console

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
use App\Kernel;
55
use Symfony\Bundle\FrameworkBundle\Console\Application;
66

7+
if (!is_dir(dirname(__DIR__).'/vendor')) {
8+
throw new LogicException('Dependencies are missing. Try running "composer install".');
9+
}
10+
711
if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
812
throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
913
}

composer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"doctrine/orm": "^2.11",
2828
"easycorp/easyadmin-bundle": "^4.12.0",
2929
"easyrdf/easyrdf": "^1.1",
30-
"fdekker/log-viewer-bundle": "^1.3",
30+
"fdekker/log-viewer-bundle": "^2.0",
3131
"friendsofsymfony/elastica-bundle": "^6.1.0",
3232
"friendsofsymfony/jsrouting-bundle": "^3.0",
3333
"friendsofsymfony/rest-bundle": "^3.0",
3434
"guzzlehttp/guzzle": "^7.6",
35-
"hidehalo/nanoid-php": "^1.1",
35+
"hidehalo/nanoid-php": "^2.0",
3636
"jms/serializer-bundle": "^5.0",
3737
"knplabs/knp-snappy-bundle": "^1.10",
3838
"maennchen/zipstream-php": "^3.0",
@@ -44,7 +44,7 @@
4444
"symfony/console": "6.4.*",
4545
"symfony/doctrine-messenger": "6.4.*",
4646
"symfony/dotenv": "6.4.*",
47-
"symfony/flex": "^1.17",
47+
"symfony/flex": "^2.4",
4848
"symfony/form": "6.4.*",
4949
"symfony/framework-bundle": "6.4.*",
5050
"symfony/ldap": "6.4.*",
@@ -61,8 +61,7 @@
6161
"symfony/webpack-encore-bundle": "^2.0",
6262
"symfony/yaml": "6.4.*",
6363
"twig/extra-bundle": "^2.12|^3.0",
64-
"twig/twig": "^2.12|^3.0",
65-
"xenolope/quahog": "^2.1"
64+
"twig/twig": "^2.12|^3.0"
6665
},
6766
"require-dev": {
6867
"friendsofphp/php-cs-fixer": "^3.13",

0 commit comments

Comments
 (0)