Compare commits

..

15 Commits

Author SHA1 Message Date
9b42f328ae
fixes after merge of master into upgrade-sf4 2024-02-13 10:59:30 +01:00
fecb561b3b
Merge branch 'main' into upgrade-sf5 2024-02-11 22:20:04 +01:00
e701b75f1e
upgrade to node 20
Some checks failed
continuous-integration/drone/tag Build is failing
2024-02-09 00:00:13 +01:00
6c0caef3d5
release 1.4.4
Some checks failed
continuous-integration/drone/tag Build is failing
2024-02-08 22:58:06 +01:00
103282e44b
restore previous version of yarn.lock 2024-02-08 22:57:12 +01:00
dd591628a8
better restriction for bootstrap version and release 1.4.3
Some checks failed
continuous-integration/drone/tag Build is failing
2024-02-08 22:38:38 +01:00
656d27080b
release 1.4.2
Some checks failed
continuous-integration/drone/tag Build is failing
2024-02-08 22:13:30 +01:00
8d1693285d
fix version of bootstrap to 5.2.3 2024-02-08 22:10:52 +01:00
818b4c36a3
upgrade node version and update 1.4.1
Some checks failed
continuous-integration/drone/tag Build is failing
2024-02-08 21:53:25 +01:00
0fb57fcdd8 Merge pull request 'upgrade chill to version 2.16.0' (#12) from release/chill-2.16.0 into main
Some checks failed
continuous-integration/drone/tag Build is failing
Reviewed-on: #12
2024-02-08 20:31:04 +00:00
julienfastre
c8d89e2a1d update composer.lock and file (automatic update) 2024-02-08 20:26:12 +00:00
d142fbe471 upgrade chill to version 2.16.0
All checks were successful
Prepare release for chill app / update-deps (push) Successful in 1m13s
2024-02-08 20:24:58 +00:00
deadabefa1 Merge pull request 'activate bundle event in app' (#7) from 6-activate-event-bundle into main
Reviewed-on: #7
2024-02-08 20:23:54 +00:00
f7dc506506
upgrade node dependencies 2023-11-29 13:21:26 +01:00
8ef752fdd0
activate bundle event in app 2023-11-27 13:24:34 +01:00
15 changed files with 4286 additions and 3677 deletions

4
.changes/v1.4.0.md Normal file
View File

@ -0,0 +1,4 @@
## v1.4.0 - 2024-02-08
### Release
* Upgrade nodes dependencies
* Update dependencies. Chill-bundles upgraded from 2.14.1 to 2.16.0

3
.changes/v1.4.1.md Normal file
View File

@ -0,0 +1,3 @@
## v1.4.1 - 2024-02-08
### Fixed
* upgrade node version while compiling

3
.changes/v1.4.2.md Normal file
View File

@ -0,0 +1,3 @@
## v1.4.2 - 2024-02-08
### Fixed
* Fix version of bootstrap temporarily

3
.changes/v1.4.3.md Normal file
View File

@ -0,0 +1,3 @@
## v1.4.3 - 2024-02-08
### Fixed
* better restriction for bootstrap version

3
.changes/v1.4.4.md Normal file
View File

@ -0,0 +1,3 @@
## v1.4.4 - 2024-02-08
### Fixed
* fix incorrect upgrade

View File

@ -37,10 +37,11 @@ steps:
- build-base-image - build-base-image
- name: build-assets - name: build-assets
image: node:14 image: node:20
pull: always pull: always
commands: commands:
- yarn install - yarn install
- yarn list
- yarn run encore production - yarn run encore production
depends_on: depends_on:
- composer-install - composer-install
@ -111,6 +112,6 @@ steps:
--- ---
kind: signature kind: signature
hmac: 707a5ef589fb6320f9e9e1dec7d8d4d11b477ba09e3b2b08d6f31f98d6d3f5d0 hmac: 0bca4dec9822a08338f6f3b88badf771558aee19b41967837aa64853a1573cad
... ...

View File

@ -6,6 +6,27 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
and is generated by [Changie](https://github.com/miniscruff/changie). and is generated by [Changie](https://github.com/miniscruff/changie).
## v1.4.4 - 2024-02-08
### Fixed
* fix incorrect upgrade
## v1.4.3 - 2024-02-08
### Fixed
* better restriction for bootstrap version
## v1.4.2 - 2024-02-08
### Fixed
* Fix version of bootstrap temporarily
## v1.4.1 - 2024-02-08
### Fixed
* upgrade node version while compiling
## v1.4.0 - 2024-02-08
### Release
* Upgrade nodes dependencies
* Update dependencies. Chill-bundles upgraded from 2.14.1 to 2.16.0
## v1.3.0 - 2023-11-30 ## v1.3.0 - 2023-11-30
### Release ### Release
* Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1 * Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1

View File

@ -15,14 +15,14 @@
}, },
"require": { "require": {
"ext-redis": "*", "ext-redis": "*",
"chill-project/chill-bundles": "dev-upgrade-sf5@dev", "chill-project/chill-bundles": "^2.16",
"symfony/flex": "^1.9", "symfony/flex": "^1.9",
"nelmio/alice": "^3.8", "nelmio/alice": "^3.8",
"phpoffice/phpword": "^0.18.2", "phpoffice/phpword": "^0.18.2",
"phpstan/phpstan": "^1.0", "phpstan/phpstan": "^1.0",
"spomky-labs/base64url": "^2.0", "spomky-labs/base64url": "^2.0",
"twig/string-extra": "^3.3", "twig/string-extra": "^3.3",
"symfony/runtime": "^5.4" "symfony/runtime": "5.4.*"
}, },
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.13", "fakerphp/faker": "^1.13",

3511
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -35,4 +35,6 @@ return [
App\App::class => ['all' => true], App\App::class => ['all' => true],
KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true], KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true],
Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true], Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
Chill\EventBundle\ChillEventBundle::class => ['all' => true],
ChampsLibres\AsyncUploaderBundle\ChampsLibresAsyncUploaderBundle::class => ['all' => true],
]; ];

View File

@ -7,7 +7,7 @@ doctrine_migrations:
'Chill\Migrations\Activity': '@ChillActivityBundle/migrations' 'Chill\Migrations\Activity': '@ChillActivityBundle/migrations'
'Chill\Migrations\DocStore': '@ChillDocStoreBundle/migrations' 'Chill\Migrations\DocStore': '@ChillDocStoreBundle/migrations'
'Chill\Migrations\CustomFields': '@ChillCustomFieldsBundle/migrations' 'Chill\Migrations\CustomFields': '@ChillCustomFieldsBundle/migrations'
# 'Chill\Migrations\Event': '@ChillEventBundle/migrations' 'Chill\Migrations\Event': '@ChillEventBundle/migrations'
'Chill\Migrations\Person': '@ChillPersonBundle/migrations' 'Chill\Migrations\Person': '@ChillPersonBundle/migrations'
'Chill\Migrations\Task': '@ChillTaskBundle/migrations' 'Chill\Migrations\Task': '@ChillTaskBundle/migrations'
'Chill\Migrations\ThirdParty': '@ChillThirdPartyBundle/migrations' 'Chill\Migrations\ThirdParty': '@ChillThirdPartyBundle/migrations'

View File

@ -18,4 +18,4 @@ docker run \
--volume ${PWD}:/app \ --volume ${PWD}:/app \
--workdir /app \ --workdir /app \
--env YARN_CACHE_FOLDER=/app/.yarncache \ --env YARN_CACHE_FOLDER=/app/.yarncache \
node:16 ${cmd} node:20 ${cmd}

View File

@ -3,6 +3,9 @@
"vendor/chill-project/chill-bundles" "vendor/chill-project/chill-bundles"
], ],
"private": true, "private": true,
"devDependencies": {
"bootstrap": "5.2.3"
},
"scripts": { "scripts": {
"specs-build": "yaml-merge vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml", "specs-build": "yaml-merge vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillPersonBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillCalendarBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml vendor/chill-project/chill-bundles/src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
"specs-validate": "swagger-cli validate templates/api/specs.yaml", "specs-validate": "swagger-cli validate templates/api/specs.yaml",

View File

@ -2,6 +2,9 @@
"brick/math": { "brick/math": {
"version": "0.9.3" "version": "0.9.3"
}, },
"champs-libres/async-uploader-bundle": {
"version": "dev-sf4"
},
"champs-libres/wopi-bundle": { "champs-libres/wopi-bundle": {
"version": "dev-master" "version": "dev-master"
}, },

4394
yarn.lock

File diff suppressed because it is too large Load Diff