6264 Commits

Author SHA1 Message Date
7564c2fde1 AccompanyingPeriodResource: add ACL 2022-01-10 23:12:52 +01:00
2c4d06371c AccompanyingPeriodResource: fix deserialization + code style 2022-01-10 23:08:23 +01:00
8e012982f5 Merge remote-tracking branch 'origin/master' into 232_resources_comment 2022-01-10 21:56:36 +01:00
ba893e8429 Merge branch '327_pinned_comment' into 'master'
327 pinned comment

See merge request Chill-Projet/chill-bundles!279
2022-01-10 20:55:37 +00:00
b153fc19f6 327 pinned comment 2022-01-10 20:55:37 +00:00
098c2fbaa0 Merge remote-tracking branch 'origin/master' into 232_resources_comment 2022-01-10 21:50:00 +01:00
01d51da7e1 Merge branch 'issue344_vue_multiselect_i18n' into 'master'
Issue344 vue multiselect i18n

See merge request Chill-Projet/chill-bundles!278
2022-01-10 12:04:57 +00:00
juminet
699dcc85de Issue344 vue multiselect i18n 2022-01-10 12:04:57 +00:00
e677c0fe2f Merge branch 'issue309_address_lines' into 'master'
address: render Address as lines

See merge request Chill-Projet/chill-bundles!277
2022-01-10 11:49:38 +00:00
juminet
edeaaf0218 address: render Address as lines 2022-01-10 11:49:38 +00:00
a3ea28d307 Merge branch 'issue342_location_in_acc_period' into 'master'
accompanying period: add location to accompanying period + add delete button

See merge request Chill-Projet/chill-bundles!272
2022-01-10 11:03:14 +00:00
juminet
921dd639bf accompanying period: add location to accompanying period + add delete button 2022-01-10 11:03:14 +00:00
8de5c8900a Merge branch 'docgen/action-add-missing-goals' into 'master'
Docgen/action add missing goals

See merge request Chill-Projet/chill-bundles!280
2022-01-10 09:35:26 +00:00
efc3e3915b Docgen/action add missing goals 2022-01-10 09:35:26 +00:00
78cf817921 docgen: add location to accompanying period 2022-01-04 23:50:22 +01:00
4f1540c541 add a patch resource api endpoint (wip) 2022-01-04 19:37:27 +01:00
Pol Dellaiera
f63afea2ce
Autofix code style. 2022-01-04 17:32:05 +01:00
Pol Dellaiera
660e45ac59
tests: Tag failing test as incomplete. 2022-01-04 17:27:30 +01:00
Pol Dellaiera
e619e58a6e
tests: Tag failing test as incomplete. 2022-01-04 17:20:25 +01:00
Pol Dellaiera
08de360677
tests: Tag failing test as incomplete. 2022-01-04 16:38:21 +01:00
Pol Dellaiera
e2ad590310
tests: Get rid of PHPUnit deprecations. 2022-01-04 16:29:49 +01:00
Pol Dellaiera
6ebcd87508
tests: Replace assertInternalType with proper method.
See https://github.com/sebastianbergmann/phpunit/issues/3369
2022-01-04 16:21:06 +01:00
nobohan
06f8014b76 Merge branch 'master' into issue303_household_fixes 2022-01-04 16:06:15 +01:00
nobohan
52f817bde7 fix conflicts when merging master 2022-01-04 15:56:32 +01:00
af2eca0d03 Change accompanyingCourse Resources comment by a string 2022-01-04 15:56:00 +01:00
Pol Dellaiera
33913867ee
cs: Use Collection more and fix potential duplicates. 2022-01-04 15:55:56 +01:00
bcd25fa950 Merge branch 'issue349-masonry' into 'master'
Issue349 masonry

See merge request Chill-Projet/chill-bundles!274
2022-01-04 14:38:04 +00:00
Pol Dellaiera
acf7142bad
cs: Use Collection more. 2022-01-04 15:29:17 +01:00
Pol Dellaiera
c8c5af8d14
cs: Update PersonJsonNormalizer. 2022-01-04 15:18:03 +01:00
nobohan
aa6b770bfe fix conflict 2022-01-04 15:11:43 +01:00
nobohan
4d5d5265df fix alt name choice array 2022-01-04 15:10:03 +01:00
Pol Dellaiera
d19c5c9e41
cs: Autofix. 2022-01-04 15:07:41 +01:00
Pol Dellaiera
cf588c97c0
cs: Autofix. 2022-01-04 14:41:52 +01:00
Pol Dellaiera
f3f5cc550c
sa: Fix PHPStan issue. 2022-01-04 14:41:52 +01:00
Pol Dellaiera
c7d00ca937
chore: Optimize composer.json. 2022-01-04 14:41:52 +01:00
nobohan
e3c0dca1d1 upd CHANGELOG 2022-01-04 14:39:43 +01:00
nobohan
f4c8d0b09a Merge remote-tracking branch 'origin/master' into issue230_person 2022-01-04 13:50:27 +01:00
Pol Dellaiera
72a15bb823
chore: Update composer.json. 2022-01-04 11:15:13 +01:00
862f9aefb0 update changelog 2022-01-04 10:27:28 +01:00
dc581fcf57 fix details and corrections 2021-12-29 15:06:33 +01:00
bd909b0061 fix details and corrections 2021-12-29 14:57:18 +01:00
9e67d9586d masonry: add origin bloc 2021-12-29 12:32:19 +01:00
982dd78828 put back warnings inside condition 2021-12-29 12:15:21 +01:00
1055fd9398 masonry: raise comment bloc width 2021-12-29 12:13:39 +01:00
5089bba4d7 improve masonry bloc style 2021-12-29 12:11:20 +01:00
Pol Dellaiera
6a0ce72836
tests: Remove @expectException annotation. 2021-12-21 16:22:31 +01:00
Pol Dellaiera
f93b1935ee
ci: Update PHPUnit behavior. 2021-12-21 16:14:27 +01:00
Pol Dellaiera
64ec3e62da
ci: Update PHPUnit behavior. 2021-12-21 15:52:47 +01:00
Pol Dellaiera
492d5caaf0
fix: Fix return types in tests. 2021-12-21 15:39:09 +01:00
Pol Dellaiera
2ed3a91d8e
fix: Fix return types in tests. 2021-12-21 15:32:58 +01:00