Compare commits
	
		
			49 Commits
		
	
	
		
			release/te
			...
			3643283cd0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 3643283cd0 | |||
|  | 4a386488d6 | ||
| 18993e740c | |||
| 6c460d66b1 | |||
|  | 4cf77335ab | ||
| 0df0bbe7af | |||
| 2c88187d3f | |||
|  | 971d0fa9c9 | ||
| 93bcc246e9 | |||
| 2c6fb97f31 | |||
|  | c58443dd72 | ||
| b6c17f62d0 | |||
| 7712d146c7 | |||
| 8a83372e2f | |||
| 883725af10 | |||
|  | 7faee98294 | ||
| 96e0c4c97e | |||
| 921726ec75 | |||
| 61a77cc1de | |||
|  | 0c65d3d681 | ||
| 9c125c6af6 | |||
| e701b75f1e | |||
| 6c0caef3d5 | |||
| 103282e44b | |||
| dd591628a8 | |||
| 656d27080b | |||
| 8d1693285d | |||
| 818b4c36a3 | |||
| 0fb57fcdd8 | |||
|  | c8d89e2a1d | ||
| d142fbe471 | |||
| deadabefa1 | |||
| 2c9ec9db55 | |||
| 4aea2fe135 | |||
| 6fe97f3659 | |||
|  | d9980a7e18 | ||
| 59852c709d | |||
| f7dc506506 | |||
| 8ef752fdd0 | |||
| 1c544d392a | |||
|  | dcfd7e4924 | ||
| deb47dd3aa | |||
| ac909e8107 | |||
|  | 414b4e11ca | ||
| 86e27595f5 | |||
| cb3ac56084 | |||
| 4ef93ef722 | |||
| 7e3d741ea0 | |||
| bd011775a6 | 
							
								
								
									
										6
									
								
								.changes/header.tpl.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								.changes/header.tpl.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | |||||||
|  | # Changelog | ||||||
|  | All notable changes to this project will be documented in this file. | ||||||
|  |  | ||||||
|  | The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | ||||||
|  | adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), | ||||||
|  | and is generated by [Changie](https://github.com/miniscruff/changie). | ||||||
							
								
								
									
										0
									
								
								.changes/unreleased/.gitkeep
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								.changes/unreleased/.gitkeep
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										3
									
								
								.changes/v1.0.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.0.0.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | ## v1.0.0 - 2023-11-19 | ||||||
|  | ### Feature | ||||||
|  | * Integrate changie and automate release management | ||||||
							
								
								
									
										3
									
								
								.changes/v1.1.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.1.0.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | ## v1.1.0 - 2023-11-22 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.12.1 to 2.13.0 | ||||||
							
								
								
									
										3
									
								
								.changes/v1.10.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.10.0.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | ## v1.10.0 - 2024-07-03 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.18.2 to 2.22.1 | ||||||
							
								
								
									
										3
									
								
								.changes/v1.2.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.2.0.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | ## v1.2.0 - 2023-11-24 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.13.0 to 2.14.0 | ||||||
							
								
								
									
										3
									
								
								.changes/v1.3.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.3.0.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | ## v1.3.0 - 2023-11-30 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1 | ||||||
							
								
								
									
										4
									
								
								.changes/v1.4.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								.changes/v1.4.0.md
									
									
									
									
									
										Normal 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
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.4.1.md
									
									
									
									
									
										Normal 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
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.4.2.md
									
									
									
									
									
										Normal 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
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.4.3.md
									
									
									
									
									
										Normal 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
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.4.4.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | ## v1.4.4 - 2024-02-08 | ||||||
|  | ### Fixed | ||||||
|  | * fix incorrect upgrade | ||||||
							
								
								
									
										3
									
								
								.changes/v1.5.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.5.0.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | ## v1.5.0 - 2024-02-08 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.16.0 to 2.16.1 | ||||||
							
								
								
									
										5
									
								
								.changes/v1.6.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								.changes/v1.6.0.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,5 @@ | |||||||
|  | ## v1.6.0 - 2024-02-12 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.16.1 to 2.16.1 | ||||||
|  | ### Fixed | ||||||
|  | * Overwriting of bundles translations removed | ||||||
							
								
								
									
										5
									
								
								.changes/v1.7.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										5
									
								
								.changes/v1.7.0.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,5 @@ | |||||||
|  | ## v1.7.0 - 2024-02-13 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.16.1 to 2.16.1 | ||||||
|  | ### Fixed | ||||||
|  | * Upgrade vue to fix multiselect | ||||||
							
								
								
									
										3
									
								
								.changes/v1.8.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								.changes/v1.8.0.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,3 @@ | |||||||
|  | ## v1.8.0 - 2024-02-21 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.16.1 to 2.16.2 | ||||||
							
								
								
									
										4
									
								
								.changes/v1.9.0.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								.changes/v1.9.0.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,4 @@ | |||||||
|  | ## v1.9.0 - 2024-04-17 | ||||||
|  | ### Release | ||||||
|  | * Update chill bundles version to 2.18.2 | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.16.2 to 2.18.2 | ||||||
							
								
								
									
										35
									
								
								.changie.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								.changie.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,35 @@ | |||||||
|  | changesDir: .changes | ||||||
|  | unreleasedDir: unreleased | ||||||
|  | headerPath: header.tpl.md | ||||||
|  | changelogPath: CHANGELOG.md | ||||||
|  | versionExt: md | ||||||
|  | versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}' | ||||||
|  | kindFormat: '### {{.Kind}}' | ||||||
|  | # Note: it is possible to add a `.custom.Long` text manually into the yaml file produced by `changie new`. This will add a long description. | ||||||
|  | changeFormat: >- | ||||||
|  |     * {{ if and (ne .Custom.Issue "") (ne .Custom.Issue "0") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{.Body}} | ||||||
|  | custom: | ||||||
|  |     -   key: Issue | ||||||
|  |         label: Issue number (on chill-bundles repository) (optional) | ||||||
|  |         optional: true | ||||||
|  |         type: int | ||||||
|  | kinds: | ||||||
|  |     -   label: Release | ||||||
|  |         auto: minor | ||||||
|  |     -   label: Feature | ||||||
|  |         auto: minor | ||||||
|  |     -   label: Deprecated | ||||||
|  |         auto: minor | ||||||
|  |     -   label: Fixed | ||||||
|  |         auto: patch | ||||||
|  |     -   label: Security | ||||||
|  |         auto: patch | ||||||
|  |     -   label: DX | ||||||
|  |         auto: patch | ||||||
|  |     -   label: UX | ||||||
|  |         auto: patch | ||||||
|  | newlines: | ||||||
|  |   afterChangelogHeader: 1 | ||||||
|  |   beforeChangelogVersion: 1 | ||||||
|  |   endOfVersion: 1 | ||||||
|  | envPrefix: CHANGIE_ | ||||||
| @@ -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 | ||||||
|  |  | ||||||
| ... | ... | ||||||
|   | |||||||
							
								
								
									
										59
									
								
								.gitea/workflows/release/update-composer-lock.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								.gitea/workflows/release/update-composer-lock.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,59 @@ | |||||||
|  | name: Prepare release for chill app | ||||||
|  | run-name: Update composer.lock and dependencies for preparing a release | ||||||
|  |  | ||||||
|  | on: | ||||||
|  |     push: | ||||||
|  |         branches: | ||||||
|  |             - 'release/**' | ||||||
|  |  | ||||||
|  | jobs: | ||||||
|  |     update-deps: | ||||||
|  |         runs-on: ubuntu-latest | ||||||
|  |         steps: | ||||||
|  |             - name: check out repository | ||||||
|  |               uses: https://github.com/actions/checkout@v4 | ||||||
|  |             - name: get the previous chill version | ||||||
|  |               # parse the composer.lock file using jq to get the chill version before the upgrade | ||||||
|  |               id: chill-before | ||||||
|  |               uses: https://github.com/sergeysova/jq-action@v2 | ||||||
|  |               with: | ||||||
|  |                 cmd: 'cat composer.lock | jq --raw-output ''.packages[] | select ( .name | contains ("chill-project/chill-bundles")) | .version''' | ||||||
|  |             - name: run composer update to update composer.lock | ||||||
|  |               uses: docker://gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:latest | ||||||
|  |               with: | ||||||
|  |                   # this is where we set the command to execute | ||||||
|  |                   args: composer update --no-install | ||||||
|  |             - name: is composer.lock changed ? | ||||||
|  |               id: composer-lock-changed | ||||||
|  |               run: 'echo is_composer_lock_changed=$(git diff --name-only | grep "composer\.lock" | wc -l) >> $GITHUB_OUTPUT' | ||||||
|  |             - name: get the new chill version | ||||||
|  |               # parse the composer.lock file using jq to get the chill version after the upgrade | ||||||
|  |               id: chill-after | ||||||
|  |               uses: https://github.com/sergeysova/jq-action@v2 | ||||||
|  |               with: | ||||||
|  |                 cmd: 'cat composer.lock | jq --raw-output ''.packages[] | select ( .name | contains ("chill-project/chill-bundles")) | .version''' | ||||||
|  |             - name: add a changie file for the upgrade | ||||||
|  |               uses: https://github.com/miniscruff/changie-action@v2 | ||||||
|  |               if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }} | ||||||
|  |               with: | ||||||
|  |                 version: latest | ||||||
|  |                 args: 'new --body "Update dependencies. Chill-bundles upgraded from ${{ steps.chill-before.outputs.value }} to ${{ steps.chill-after.outputs.value }}" --kind Release --custom "Issue=0"' | ||||||
|  |             - name: changie batch | ||||||
|  |               if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }} | ||||||
|  |               uses: https://github.com/miniscruff/changie-action@v2 | ||||||
|  |               with: | ||||||
|  |                 version: latest | ||||||
|  |                 args: 'batch auto' | ||||||
|  |             - name: changie merge | ||||||
|  |               if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }} | ||||||
|  |               uses: https://github.com/miniscruff/changie-action@v2 | ||||||
|  |               with: | ||||||
|  |                 version: latest | ||||||
|  |                 args: 'merge' | ||||||
|  |             - name: commit changed files | ||||||
|  |               if: ${{ steps.composer-lock-changed.outputs.is_composer_lock_changed == 1 }} | ||||||
|  |               uses: https://github.com/stefanzweifel/git-auto-commit-action@v5 | ||||||
|  |               with: | ||||||
|  |                   commit_message: "update composer.lock and file (automatic update)" | ||||||
|  |                   commit_user_name: Action Bot | ||||||
|  |                   commit_user_email: bot@chill.social | ||||||
| @@ -1,25 +0,0 @@ | |||||||
| name: Prepare release for chill app |  | ||||||
| run-name: Update composer.lock and dependencies for preparing a release |  | ||||||
|  |  | ||||||
| on: |  | ||||||
|     push: |  | ||||||
|         branches: |  | ||||||
|             - 'release/**' |  | ||||||
|  |  | ||||||
| jobs: |  | ||||||
|     update-deps: |  | ||||||
|         steps: |  | ||||||
|             - name: check out repository |  | ||||||
|               uses: https://github.com/actions/checkout@v4 |  | ||||||
|             - name: run composer update to update composer.lock |  | ||||||
|               uses: docker://gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:latest |  | ||||||
|               with: |  | ||||||
|                   # this is where we set the command to execute |  | ||||||
|                   args: composer update --no-install |  | ||||||
|             - name: commit changed files |  | ||||||
|               uses: https://github.com/stefanzweifel/git-auto-commit-action@v5 |  | ||||||
|               with: |  | ||||||
|                   commit_message: "update composer.lock and file (automatic update through CI)" |  | ||||||
|                   commit_user_name: Action Bot |  | ||||||
|                   commit_user_email: bot@chill.social |  | ||||||
|  |  | ||||||
							
								
								
									
										71
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										71
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,12 +1,73 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
| All notable changes to this project will be documented in this file. | All notable changes to this project will be documented in this file. | ||||||
|  |  | ||||||
| The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | ||||||
| and this project adheres to | adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), | ||||||
|  | and is generated by [Changie](https://github.com/miniscruff/changie). | ||||||
|  |  | ||||||
| * [Semantic Versioning](https://semver.org/spec/v2.0.0.html) for stable releases; |  | ||||||
| * date versioning for test releases |  | ||||||
|  |  | ||||||
| ## Unreleased | ## v1.10.0 - 2024-07-03 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.18.2 to 2.22.1 | ||||||
|  |  | ||||||
|  | ## v1.9.0 - 2024-04-17 | ||||||
|  | ### Release | ||||||
|  | * Update chill bundles version to 2.18.2 | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.16.2 to 2.18.2 | ||||||
|  |  | ||||||
|  | ## v1.8.0 - 2024-02-21 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.16.1 to 2.16.2 | ||||||
|  |  | ||||||
|  | ## v1.7.0 - 2024-02-13 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.16.1 to 2.16.1 | ||||||
|  | ### Fixed | ||||||
|  | * Upgrade vue to fix multiselect | ||||||
|  |  | ||||||
|  | ## v1.6.0 - 2024-02-12 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.16.1 to 2.16.1 | ||||||
|  | ### Fixed | ||||||
|  | * Overwriting of bundles translations removed | ||||||
|  |  | ||||||
|  | ## v1.5.0 - 2024-02-08 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.16.0 to 2.16.1 | ||||||
|  |  | ||||||
|  | ## 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 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.14.0 to 2.14.1 | ||||||
|  |  | ||||||
|  | ## v1.2.0 - 2023-11-24 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.13.0 to 2.14.0 | ||||||
|  |  | ||||||
|  | ## v1.1.0 - 2023-11-22 | ||||||
|  | ### Release | ||||||
|  | * Update dependencies. Chill-bundles upgraded from 2.12.1 to 2.13.0 | ||||||
|  |  | ||||||
|  | ## v1.0.0 - 2023-11-19 | ||||||
|  | ### Feature | ||||||
|  | * Integrate changie and automate release management | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							| @@ -2,7 +2,7 @@ THIS_FILE := $(lastword $(MAKEFILE_LIST)) | |||||||
| PWD:=$(shell echo ${PWD}) | PWD:=$(shell echo ${PWD}) | ||||||
| UID:=$(shell id -u) | UID:=$(shell id -u) | ||||||
| GID:=$(shell id -g) | GID:=$(shell id -g) | ||||||
| DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:16 | DOCKERNODE_CMD=docker run --rm --user ${UID}:${GID} -v ${PWD}:/app --workdir /app -e YARN_CACHE_FOLDER=/app/.yarncache node:20 | ||||||
| DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php | DOCKER_COMPOSE_PHP_EXEC_CMD=docker-compose run --rm --user $(UID):$(GID) -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env php | ||||||
| DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(PHP_BASE_IMAGE_TAG) | DOCKER_PHP_EXEC_CMD_BASE=docker run --rm --user $(UID):$(GID) -v ${PWD}:/var/www/app -e CLEAR_CACHE=false -e COMPOSER_HOME=/var/www/app/.composer --entrypoint /usr/bin/env $(PHP_BASE_IMAGE_TAG) | ||||||
| PHP_BASE_IMAGE=php:8.2-fpm-alpine | PHP_BASE_IMAGE=php:8.2-fpm-alpine | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ | |||||||
|     }, |     }, | ||||||
|     "require": { |     "require": { | ||||||
|         "ext-redis": "*", |         "ext-redis": "*", | ||||||
|         "chill-project/chill-bundles": "2.10.0", |         "chill-project/chill-bundles": "2.22.1", | ||||||
|         "symfony/flex": "^1.9", |         "symfony/flex": "^1.9", | ||||||
|         "symfony/http-client": "^4.4 || ^5", |         "symfony/http-client": "^4.4 || ^5", | ||||||
|         "nelmio/alice": "^3.8", |         "nelmio/alice": "^3.8", | ||||||
|   | |||||||
							
								
								
									
										1699
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1699
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -36,4 +36,5 @@ 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], | ||||||
| ]; | ]; | ||||||
|   | |||||||
| @@ -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' | ||||||
|   | |||||||
| @@ -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} | ||||||
|   | |||||||
| @@ -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", | ||||||
|   | |||||||
							
								
								
									
										0
									
								
								translations/.gitkeep
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								translations/.gitkeep
									
									
									
									
									
										Normal file
									
								
							| @@ -1,205 +0,0 @@ | |||||||
| # activity |  | ||||||
| Show the activity: Voir l'échange |  | ||||||
| Edit the activity: Modifier l'échange |  | ||||||
| Activity: Échange |  | ||||||
| Add a new activity: Ajouter un nouvel échange |  | ||||||
| Activity list: Liste des échanges |  | ||||||
| Update activity: Modifier l'échange |  | ||||||
| Activity data: Données de l'échange |  | ||||||
| Activity location: Localisation de l'échange |  | ||||||
| Activity creation: Nouvel échange |  | ||||||
| Save activity: Sauver l'échange |  | ||||||
| '%user% has done an %activity_type%': '%user% a effectué un échange de type "%activity_type%"' |  | ||||||
| 'Success : activity created!': L'échange a été créé. |  | ||||||
| 'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'échange n'a pas été créé. |  | ||||||
| 'Success : activity updated!': L'échange a été mis à jour. |  | ||||||
| 'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'échange n'a pas été mis à jour. |  | ||||||
| Activity configuration: Configuration des échanges |  | ||||||
| Activity configuration menu: Configuration des échanges |  | ||||||
| Activity Types: Types d'échange |  | ||||||
| Activity Reasons: Sujets d'un échange |  | ||||||
| Activity Reasons Category: Catégories de sujet d'échanges |  | ||||||
| Activity Types Categories: Catégories des types d'échange |  | ||||||
| Activity Presences: Présences aux échanges |  | ||||||
| Travel time: Durée du trajet (aller/retour) |  | ||||||
| Sent received: Entrant / sortant |  | ||||||
| Sent: Sortant |  | ||||||
| Received: Entrant |  | ||||||
| activity: |  | ||||||
|     comment: Compte-rendu |  | ||||||
| See activity in accompanying course context: Voir l'échange dans le contexte du parcours d'accompagnement |  | ||||||
| ActivityPresence list: Liste des Présences aux échanges |  | ||||||
| Create a new activity presence: Créer une nouvelle "Présence aux échanges" |  | ||||||
|  |  | ||||||
| # crud activity |  | ||||||
| crud: |  | ||||||
|   save: Enregistrer |  | ||||||
|   activity_type: |  | ||||||
|     title_new: Nouveau type d'échange |  | ||||||
|     title_edit: Edition d'un type d'échange |  | ||||||
|   activity_type_category: |  | ||||||
|     title_new: Nouvelle catégorie de type d'échange |  | ||||||
|     title_edit: Edition d'une catégorie de type d'échange |  | ||||||
|   activity_presence: |  | ||||||
|     title_new: Nouvelle Présence aux échanges |  | ||||||
|     title_edit: Edition d'une Présence aux échanges |  | ||||||
|   vendee_security_profile: |  | ||||||
|     index: |  | ||||||
|       title: Profils de droits |  | ||||||
|       add_new: Créer |  | ||||||
|     title_new: Nouveau profil |  | ||||||
|     title_edit: Modifier profil |  | ||||||
| # activity reason admin |  | ||||||
| ActivityReason list: Liste des sujets |  | ||||||
| Create a new activity reason: Créer un nouveau sujet |  | ||||||
| ActivityReason creation: Nouveau sujet |  | ||||||
| ActivityReason edit: Modification d'un sujet |  | ||||||
| ActivityReason: Sujet d'échange |  | ||||||
| #activity reason category admin |  | ||||||
| ActivityReasonCategory list: Catégories de sujets |  | ||||||
| Create a new activity category reason: Créer une nouvelle catégorie |  | ||||||
| ActivityReasonCategory creation: Nouvelle catégorie de sujet |  | ||||||
| ActivityReasonCategory edit: Modification d'une catégorie de sujet |  | ||||||
| ActivityReasonCategory: Catégorie de sujet d'échange |  | ||||||
| ActivityReasonCategory is active and will be proposed: La catégorie est active et sera proposée |  | ||||||
| ActivityReasonCategory is inactive and won't be proposed: La catégorie est inactive et ne sera pas proposée |  | ||||||
| # activity type type admin |  | ||||||
| ActivityType list: Types d'échanges |  | ||||||
| Create a new activity type: Créer un nouveau type d'échange |  | ||||||
| # activity type category admin |  | ||||||
| ActivityTypeCategory list: Liste des catégories des types d'échange |  | ||||||
| Create a new activity type category: Créer une nouvelle catégorie de type d'échange |  | ||||||
| # activity delete |  | ||||||
| Remove activity: Supprimer un échange |  | ||||||
| Are you sure you want to remove the activity about "%name%" ?: Êtes-vous sûr de vouloir supprimer un échange qui concerne "%name%" ? |  | ||||||
| The activity has been successfully removed.: L'échange a été supprimé. |  | ||||||
| Sum activity duration: Total de la durée des échanges |  | ||||||
| 'Filtered by activity type: only %list%': "Filtré par type d'activity: seulement %list%" |  | ||||||
| Filtered by date activity: Filtrer par date d'échange |  | ||||||
| "Filtered by date of activity: only between %date_from% and %date_to%": "Filtré par date de l'échange: uniquement entre %date_from% et %date_to%" |  | ||||||
| This date should be after the date given in "Implied in an activity after this date" field: Cette date devrait être postérieure à la date donnée dans le champ "échanges après cette date" |  | ||||||
| Filtered by person having an activity in a period: Uniquement les personnes ayant eu un échange dans la période donnée |  | ||||||
| Implied in an activity after this date: Impliqué dans un échange après cette date |  | ||||||
| Implied in an activity before this date: Impliqué dans un échange avant cette date |  | ||||||
| Filtered by person having an activity between %date_from% and %date_to% with reasons %reasons_name%: Filtré par personnes associées à un échange entre %date_from% et %date_to% avec les sujets %reasons_name% |  | ||||||
| Activity reasons for those activities: Sujets de ces échanges |  | ||||||
| Filter by activity type: Filtrer par type d'échange |  | ||||||
| Activity type: Type d'échange |  | ||||||
| Activity user: Utilisateur lié à l'activity |  | ||||||
| Aggregate by activity user: Aggréger par utilisateur lié à l'échange |  | ||||||
| Aggregate by activity type: Aggréger par type d'échange |  | ||||||
| Aggregate by activity reason: Aggréger par sujet de l'échange |  | ||||||
| There isn't any activities.: Aucun échange enregistré. |  | ||||||
| Last activities: Les derniers échanges |  | ||||||
| Activities: Échanges |  | ||||||
|  |  | ||||||
| # person |  | ||||||
| Person: Usager |  | ||||||
| 'Add a person': 'Ajout d''un usager' |  | ||||||
| 'Person details': 'Généralités' |  | ||||||
| Back to the person details: Retour aux détails de l'usager |  | ||||||
| Show person: Voir la fiche de l'usager |  | ||||||
| Any person selected: Aucun usager sélectionné |  | ||||||
|  |  | ||||||
| Male: Masculin |  | ||||||
| Man: Masculin |  | ||||||
| man: Masculin |  | ||||||
| Female: Féminin |  | ||||||
| woman: Féminin |  | ||||||
| Woman: Féminin |  | ||||||
| both: Neutre, non binaire |  | ||||||
| Both: Neutre, non binaire |  | ||||||
| Neuter: Neutre, non binaire |  | ||||||
| neuter: Neutre, non binaire |  | ||||||
|  |  | ||||||
| 'Add the person': "Créer l'usager" |  | ||||||
| 'Add the person and create an accompanying period': "Créer l’usager ET créer un parcours d’accompagnement" |  | ||||||
| 'Add the person and create an household': "Créer l'usager ET créer un ménage" |  | ||||||
| 'Add an accompanying period in the past': Ajouter un parcours d'accompagnement dans le passé |  | ||||||
| Begin a new accompanying period: Commencer un nouveau parcours d'accompagnement |  | ||||||
| Create an accompanying period: Créer un parcours d'accompagnement |  | ||||||
| 'A period has been created.': Une parcours d'accompagnement a été créé. |  | ||||||
| 'Error! Period not created!': Le parcours d'accompagnement n'a pas été créé. |  | ||||||
| Update accompanying period: Mettre à jour un parcours d'accompagnement |  | ||||||
| 'An accompanying period has been updated.': Un parcours d'accompagnement a été mis à jour |  | ||||||
| 'Error when updating the period': Erreur pendant la mise à jour du parcours d'accompagnement. |  | ||||||
| 'An accompanying period has been closed.': Un parcours d'accompagnement a été fermé. |  | ||||||
| 'Error! Period not closed!': "Erreur: le parcours d'accompagnement n'a pas été fermé." |  | ||||||
| 'An accompanying period has been opened.': Un parcours d'accompagnement a été ouvert. |  | ||||||
| 'Period not opened': "Le parcours d'accompagnement n'a pas été ouvert" |  | ||||||
| An accompanying period starts: Un parcours d'accompagnement est ouvert |  | ||||||
| Any accompanying periods are open: Aucun parcours d'accompagnement ouvert |  | ||||||
| An accompanying period is open: Un parcours d'accompagnement est ouvert |  | ||||||
| Accompanying period list: Parcours d'accompagnement |  | ||||||
| Accompanying period list for person: Parcours d'accompagnement de l'usager |  | ||||||
| Period number %number%: 'Parcours n° %number%' |  | ||||||
| Are you sure you want to re-open this period ?: Êtes-vous sûr de vouloir ré-ouvrir ce parcours d'accompagnement ? |  | ||||||
| 'The period has been re-opened': Le parcours d'accompagnement a été ré-ouvert. |  | ||||||
| See accompanying period: Voir le parcours |  | ||||||
| See accompanying periods: Voir tous les parcours d'accompagnement |  | ||||||
| Edit accompanying period: Modifier le parcours |  | ||||||
| Close accompanying period: Clôre le parcours |  | ||||||
| Re-open accompanying period: Ré-ouvrir le parcours |  | ||||||
| Closing the accompanying period: Fermeture du parcours d'accompagnement |  | ||||||
| Opening the accompanying period: Ouverture d'un parcours d'accompagnement |  | ||||||
| "Filter by accompanying period: active period": "Filtrer par parcours d'accompagnement: en file active" |  | ||||||
| Some peoples does not belong to any household currently. Add them to an household soon: Certains usagers n'appartiennent à aucun ménage actuellement. Renseignez leur appartenance à un ménage dès que possible. |  | ||||||
| This course is located at a temporarily address. You should locate this course to an user: Le parcours est localisé à une adresse temporaire. Il devrait être localisé auprès d'un usager concerné. |  | ||||||
| Having an accompanying period opened after this date: Ayant un parcours d'accompagnement ouvert après cette date |  | ||||||
| Having an accompanying period ending before this date, or still opened at this date: Ayant un parcours d'accompagnement fermé après cette date, ou toujours ouvert à cette date |  | ||||||
| "Filtered by accompanying period: persons having an accompanying period opened after the %date_from% and closed before the %date_to% (or still opened at the %date_to%)": "Filtré par parcours d'accompagnement: personnes ayant un parcours d'accompagnement ouvert après le %date_from%, et cloturé le %date_to% (ou toujours ouvert le %date_to%)" |  | ||||||
| "Filter by accompanying period: starting between two dates": "Filtrer par parcours d'accompagnement: début de la période entre deux dates" |  | ||||||
| "Having an accompanying period opened before this date": "Ayant un parcours d'accompagnement ouvert avant cette date" |  | ||||||
| "Filtered by accompanying period: persons having an accompanying period opened between the %date_from% and %date_to%": "Filtrer par parcours d'accompagnement: ayant une période ouverte entre le %date_from% et le %date_to%" |  | ||||||
| "Filter by accompanying period: closed between two dates": "Filtrer par parcours d'accompagnement: période fermée entre deux dates" |  | ||||||
| Having an accompanying period closed after this date: Ayant un parcours d'accompagnement fermé après cette date |  | ||||||
| "Having an accompanying period closed before this date": "Ayant un parcours d'accompagnement fermé avant cette date" |  | ||||||
| "Filtered by accompanying period: persons having an accompanying period closed between the %date_from% and %date_to%": "Filtrer par parcours d'accompagnement: ayant une période fermée entre le %date_from% et le %date_to%" |  | ||||||
| Accompanying user: Référent |  | ||||||
| No accompanying user: Aucun référent |  | ||||||
| Participants: Usagers concernés |  | ||||||
| person_admin: |  | ||||||
|     closing motive explanation: > |  | ||||||
|         Les motifs de clotûre donnent des indications sur la fermeture d'un parcours d'accompagnement. |  | ||||||
| Delete accompanying period: Supprimer le parcours |  | ||||||
| Are you sure you want to remove the accompanying period "%id%" ?:  Êtes-vous sûr de vouloir supprimer le parcours %id% ? |  | ||||||
| The accompanying course has been successfully removed.: Le parcours a été supprimé. |  | ||||||
|  |  | ||||||
|  |  | ||||||
| Unknown: Non renseigné |  | ||||||
| Center: Territoire |  | ||||||
| Centers: Territoires |  | ||||||
| 'Marital status': 'État matrimonial' |  | ||||||
| Comment on the marital status: Remarques sur l'état matrimonial |  | ||||||
| Date of last marital status change: État matrimonial depuis le |  | ||||||
|  |  | ||||||
| # thirdparty |  | ||||||
| List of third parties: Liste des tiers professionnels |  | ||||||
| The party is visible in those centers: Le tiers est visible dans ces territoires |  | ||||||
|  |  | ||||||
| # household |  | ||||||
| household: |  | ||||||
|     Household history for person: Historique des ménages de l'usager |  | ||||||
|  |  | ||||||
| # thirdparty |  | ||||||
| chill_3party: |  | ||||||
|     key_label: |  | ||||||
|         caisse_secu: Caisse primaire d'assurance maladie (CPAM) |  | ||||||
|         doctor: Médecin |  | ||||||
|  |  | ||||||
| # error page |  | ||||||
| Send by email: Envoyer par email |  | ||||||
| Don't panick though, we'll fix it as soon as possible. To help us out, please send us the information below. : Pas de panique, nous allons la corriger au plus vite. Pour faciliter la résolution, communiquez les informations ci-dessous. |  | ||||||
| Oops, we came across an error!: Oops, nous avons rencontré une erreur! |  | ||||||
| Date and time of error: Date et heure de l'erreur |  | ||||||
| Error message: Contenu de l'erreur |  | ||||||
| Copy: Copier |  | ||||||
| Copied: Copié |  | ||||||
|  |  | ||||||
| You are getting a notification for a period which does not exists any more: Cette notification ne correspond pas à un parcours d'accompagnement valide |  | ||||||
| You are getting a notification for a period you are not allowed to see: La notification fait référence à un parcours d'accompagnement auquel vous n'avez pas accès. |  | ||||||
| This is the minimal period details: Parcours d'accompagnement n° |  | ||||||
|  |  | ||||||
| You get notified of an activity which does not exists any more: Cette notification ne correspond pas à un échange valide. |  | ||||||
| you are not allowed to see it details: La notification fait référence à un échange auquel vous n'avez pas accès. |  | ||||||
| This is the minimal activity data: Échange n° |  | ||||||
| @@ -1,20 +0,0 @@ | |||||||
| # Activity validators |  | ||||||
| For this type of activity, you must add at least one person: Pour ce type d'échange, vous devez ajouter au moins un usager |  | ||||||
| For this type of activity, you must add at least one user: Pour ce type d'échange, vous devez ajouter au moins un TMS |  | ||||||
| For this type of activity, you must add at least one third party: Pour ce type d'échange, vous devez ajouter au moins un tiers |  | ||||||
| For this type of activity, the user is required: Pour ce type d'échange, l'utilisateur est requis |  | ||||||
| For this type of activity, the date is required: Pour ce type d'échange, la date est requise |  | ||||||
| For this type of activity, the location is required: Pour ce type d'échange, la localisation est requise |  | ||||||
| For this type of activity, user is required: Pour ce type d'échange, l'utilisateur est requis |  | ||||||
| For this type of activity, date is required: Pour ce type d'échange, la date est requise |  | ||||||
| For this type of activity, location is required: Pour ce type d'échange, la localisation est requise |  | ||||||
| For this type of activity, attendee is required: Pour ce type d'échange, le champ "Présence de la personne" est requis |  | ||||||
| For this type of activity, duration time is required: Pour ce type d'échange, la durée est requise |  | ||||||
| For this type of activity, travel time is required: Pour ce type d'échange, la durée du trajet est requise |  | ||||||
| For this type of activity, reasons is required: Pour ce type d'échange, le champ "sujet" est requis |  | ||||||
| For this type of activity, comment is required: Pour ce type d'échange, un commentaire est requis |  | ||||||
| For this type of activity, sent/received is required: Pour ce type d'échange, le champ Entrant/Sortant est requis |  | ||||||
| For this type of activity, document is required: Pour ce type d'échange, un document est requis |  | ||||||
| For this type of activity, emergency is required: Pour ce type d'échange, le champ "Urgent" est requis |  | ||||||
| For this type of activity, accompanying period is required: Pour ce type d'échange, le parcours d'accompagnement est requis |  | ||||||
| This social issue cannot be deleted because it is associated with an activity or an action: La problématique sociale ne peut pas être supprimée car elle est associée à un échange ou une action |  | ||||||
		Reference in New Issue
	
	Block a user