6137 Commits

Author SHA1 Message Date
12309ca1b5 fix tests (wip) 2021-12-13 18:59:43 +01:00
20c95a179d first commit 2021-12-13 18:58:17 +01:00
d5290e4bdd create comments page, with menu entry, route and template 2021-12-13 17:25:39 +01:00
f4396459a0 comments: add isPinned() method 2021-12-13 16:42:41 +01:00
f8071d32c0 batch replace/rename initialComment by pinnedComment 2021-12-13 16:31:16 +01:00
3973cdd3f6 update changelog [ci-skip] 2021-12-13 16:19:32 +01:00
52a137ee77 thirdparty: no need to burst the code: complete commit 1efdade38 2021-12-13 15:46:02 +01:00
985d8f0eae thirdparty form: clean builder, and test if this kind input address 2021-12-13 15:33:43 +01:00
13a1ab380e fix import social work metadata: use child social issue if any 2021-12-13 15:03:30 +01:00
041655d26e update changelog [ci-skip] 2021-12-13 15:03:30 +01:00
6e412117d3 Merge branch 'issue324_civility_order' into 'master'
main: add order field to civility

See merge request Chill-Projet/chill-bundles!265
2021-12-13 14:00:55 +00:00
5526790d42 diaplay initialComment on course resume page 2021-12-13 14:49:16 +01:00
cc849e279d fix column name 2021-12-13 14:38:33 +01:00
550b4775bf behavior and style changed for adding motifs,obectifs, dispositifs 2021-12-13 14:32:59 +01:00
de262bbc28 civility::order: replace int by a float 2021-12-13 14:12:48 +01:00
133e4858dc household_member_editor: fix translation for onthefly and address modal, fix button appearance 2021-12-13 13:54:29 +01:00
2bafdd9e62 Merge branch 'fix/236-update-social-work-metadata-importer' into 'master'
Update Social Work Metadata importer

Closes champs-libres/departement-de-la-vendee/chill#236

See merge request Chill-Projet/chill-bundles!190
2021-12-13 12:49:03 +00:00
d01eaa8065 various fixes 2021-12-13 13:48:20 +01:00
b3ee745479 fix vue translation 2021-12-13 12:44:47 +01:00
nobohan
4a465b8f78 upd CHANGELOG 2021-12-13 12:39:09 +01:00
nobohan
eaf7ae6f2f php cs fixer 2021-12-13 12:38:18 +01:00
nobohan
b5178c3be3 main: add order field to civility 2021-12-13 12:35:17 +01:00
nobohan
4b432c64b0 php cs fixer 2021-12-13 11:07:30 +01:00
nobohan
8493a64794 upd CHANGELOG 2021-12-13 11:05:46 +01:00
nobohan
82c027fe2a add the current location of the user as API point + add it in the activity location list 2021-12-13 11:04:10 +01:00
fdae6c106a Merge remote-tracking branch 'origin/master' into fix/236-update-social-work-metadata-importer 2021-12-13 11:01:19 +01:00
1fff9ef535 stylefix 2021-12-13 10:10:05 +01:00
20c4d07668 fix of aside activity category creation 2021-12-13 10:05:51 +01:00
7f2e3ee8e2 fix filiation error with gender undefined (#331) 2021-12-13 09:45:46 +01:00
7129b3149b undo partial wip resolution 2021-12-13 09:45:05 +01:00
nobohan
1e99ca2ca5 fix: add availableForUsers condition from locationType in the location API endpoint 2021-12-13 09:41:27 +01:00
cc42a4ae51 Merge branch 'divers' of gitlab.com:Chill-Projet/chill-bundles into divers 2021-12-13 09:33:37 +01:00
6c28ff00ab onthefly create thirdparty: use badge-entity for radio buttons label 2021-12-13 09:30:34 +01:00
d7db8400d2 accompanyingCourse list: display badges as clickable onthefly modal 2021-12-13 09:30:34 +01:00
16b3be322a actions list: display badges as clickable onthefly modal 2021-12-13 09:30:34 +01:00
6e1340be27 Merge branch 'master' into 292_activity_acl 2021-12-13 09:21:32 +01:00
118b208f68 Merge branch 'master' into 292_activity_acl 2021-12-13 09:13:43 +01:00
e21f12d96c Merge remote-tracking branch 'origin/master' 2021-12-12 21:05:35 +01:00
4b213dc290 remove dump [ci-skip] 2021-12-12 21:05:12 +01:00
55991a6082 Merge branch 'issue309_format_address' into 'master'
main: change address format for France, in Address render box and normalizer

See merge request Chill-Projet/chill-bundles!259
2021-12-12 15:05:54 +00:00
juminet
898f25c0e4 main: change address format for France, in Address render box and normalizer 2021-12-12 15:05:54 +00:00
b3929321b6 Merge branch 'badge_by_entity_type' into 'master'
Badge-thirdparty

See merge request Chill-Projet/chill-bundles!258
2021-12-12 14:51:43 +00:00
c049a0b78b Badge-thirdparty 2021-12-12 14:51:42 +00:00
10aa897899 Merge branch 'docgen/improve-normalizer' into 'master'
Docgen/improve normalizer

See merge request Chill-Projet/chill-bundles!257
2021-12-12 14:43:05 +00:00
31f5d97912 Docgen/improve normalizer 2021-12-12 14:43:05 +00:00
c6cda437c4 Merge branch 'issue324_person' into 'master'
fix some person issues

See merge request Chill-Projet/chill-bundles!254
2021-12-12 14:39:59 +00:00
juminet
7e045e964a fix some person issues 2021-12-12 14:39:59 +00:00
133ac67794 Merge branch 'issue320_bug_redirect_createPeriod' into 'master'
Issue320 bug redirect create period

See merge request Chill-Projet/chill-bundles!249
2021-12-12 14:12:44 +00:00
8fb4efc16e Issue320 bug redirect create period 2021-12-12 14:12:44 +00:00
1823a1b031 Merge branch 'issue318_internal_addIssue_fromAction' into 'master'
Adding an unrelated to issue to an accompanyingCourseWork

See merge request Chill-Projet/chill-bundles!246
2021-12-12 13:55:23 +00:00