458 Commits

Author SHA1 Message Date
38c06977ca add link to household or household editor 2021-06-10 15:18:41 +02:00
3e39dd9a1e remove route for testing move 2021-06-10 13:02:35 +02:00
89734c680c backend: allow to remove people from household, or move to a new household 2021-06-10 13:01:42 +02:00
6fed008ff2 fix creation of new household during move 2021-06-10 11:48:06 +02:00
057bdf6a6a add missing message 2021-06-10 11:47:52 +02:00
f9758eff5b fix use of context into householdMember::move 2021-06-10 11:16:37 +02:00
abc79249a2 Merge remote-tracking branch 'origin/master' into features/household-editor 2021-06-10 11:01:59 +02:00
3c727d1c65 fix format for date, after use of html5 date widget 2021-06-10 10:52:37 +02:00
ac211337d6 fix denomination: bold only in list 2021-06-10 10:31:59 +02:00
30668ca67f Merge remote-tracking branch 'origin/master' into features/household-members-list 2021-06-10 10:29:57 +02:00
5da0be24ff change icon for household 2021-06-10 10:20:18 +02:00
7fddf1d5e0 fix indentation 2021-06-09 22:18:47 +02:00
315fc7f63a set default for Position attributes 2021-06-09 22:12:55 +02:00
3c889db41a style editor when no household nor persons to move 2021-06-09 22:08:10 +02:00
71f794c4d9 add ckeditor for comment 2021-06-09 17:31:55 +02:00
e135b98072 Merge remote-tracking branch 'origin/master' into features/household-editor 2021-06-09 16:27:03 +02:00
e14205ae1d first layout for form edit 2021-06-09 16:13:39 +02:00
18217f53e8 Merge branch 'features/household-members-list' into features/household-editor 2021-06-08 22:16:43 +02:00
79ec182ca3 Merge branch 'features/date-type-use-html5' into features/activity-form 2021-06-08 22:01:19 +02:00
1433af8e95 fix format for birthdate in test 2021-06-08 21:57:06 +02:00
e91596ae12 fix callback for comparing birthdate in test 2021-06-08 19:44:31 +00:00
1c42bf6400 Merge branch 'features/date-type-use-html5' into features/activity-form 2021-06-08 19:45:58 +02:00
c9da72fa0d fix test: use format for html5 date 2021-06-08 19:44:55 +02:00
3b3855089c fix social action render 2021-06-08 19:42:29 +02:00
97bba861c9 Merge branch 'features/date-type-use-html5' into features/activity-form 2021-06-08 18:03:34 +02:00
8d7d170f11 Use Html5 datetype and remove pikaday and moment.js 2021-06-08 17:58:23 +02:00
c126f680ae Merge remote-tracking branch 'origin/master' into features/activity-form 2021-06-08 17:24:47 +02:00
0aa909f060 fix misc in activity (WIP) 2021-06-08 16:55:29 +02:00
f27957e91b improve banner 2021-06-08 12:36:27 +02:00
ed891b224f allow to distinguish stle for list-with-periods and list household
members in css
2021-06-08 12:36:01 +02:00
4dc82bc207 add test for Member edition + fix path 2021-06-07 21:52:17 +02:00
7c94824c20 Merge branch 'features/household-members-list' into features/household-editor 2021-06-07 17:36:25 +02:00
a922e397f8 Merge remote-tracking branch 'origin/master' into features/household-editor 2021-06-07 17:32:29 +02:00
be13f8f65b fullfill summary page 2021-06-07 17:27:10 +02:00
1967d6ea4c Merge branch 'features/household-context' into 'master'
Create an household context

See merge request Chill-Projet/chill-bundles!74
2021-06-07 15:04:44 +00:00
5cb076495a finalize members lists 2021-06-07 17:03:45 +02:00
604e78f35e restore list with period 2021-06-07 15:31:30 +02:00
eeffa3191e page list members of an household: born date + collpse old members 2021-06-07 15:14:42 +02:00
7933aaed1c use MessageFormatter for formatting message with gender 2021-06-07 14:25:15 +02:00
e5905902cc add confirm button for move 2021-06-04 21:24:11 +02:00
3e3c9dc894 Merge branch 'features/activity-form' of gitlab.com:Chill-Projet/chill-bundles into features/activity-form 2021-06-04 19:50:50 +02:00
c1ba892811 list activity flex-table design 2021-06-04 18:59:34 +02:00
Pol Dellaiera
7a33c37b51 Fix path. 2021-06-04 15:52:13 +02:00
Pol Dellaiera
a6c4b4eb55 Remove custom service definitions. 2021-06-04 15:52:12 +02:00
Marc Ducobu
160c7f2c31 Adding fr translation for social issues 2021-06-04 15:47:52 +02:00
3e57ff3ffa Merge remote-tracking branch 'origin/master' into features/household-context 2021-06-04 15:11:36 +02:00
ef98111a2f Merge remote-tracking branch 'origin/master' into features/household 2021-06-04 15:03:00 +02:00
80ccb76794 Merge branch 'master' into 38_modal_on-the-fly 2021-06-04 14:18:54 +02:00
Marc Ducobu
bb71b9f908 Descendants for socialActions & Issues 2021-06-04 12:22:17 +02:00
330234981c Merge remote-tracking branch 'origin/features/activity-form--marc' into features/activity-form 2021-06-04 11:58:33 +02:00