|
|
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 |
|
|
|
265ace0b4c
|
update dep to app
|
2021-06-08 19:27:46 +02:00 |
|
|
|
ebf896ac74
|
use encore functions to load assets
|
2021-06-08 19:17:07 +02:00 |
|
|
|
31befaa339
|
remove dump
|
2021-06-08 18:19:24 +02:00 |
|
|
|
780c14cfbe
|
Merge branch 'features/date-type-use-html5' into features/activity-form
|
2021-06-08 18:08:23 +02:00 |
|
|
|
8183c028f8
|
remove ref to pikaday
|
2021-06-08 18:07:59 +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 |
|
|
|
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 |
|
|
|
0fe70d00ec
|
Merge branch 'remove-uneeded-service-definition' into 'master'
[simplification] Remove custom service definitions.
See merge request Chill-Projet/chill-bundles!72
|
2021-06-07 08:29:55 +00:00 |
|
|
|
a947634f30
|
remove dump
|
2021-06-04 19:52:03 +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 |
|
|
|
574b5dcbd0
|
simplify concernedGroups template for bloc/row include
|
2021-06-04 19:50:00 +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 |
|
Marc Ducobu
|
31468aeae0
|
Using select2 for reason field inside activity form
|
2021-06-04 15:15:28 +02:00 |
|
|
|
3e57ff3ffa
|
Merge remote-tracking branch 'origin/master' into features/household-context
|
2021-06-04 15:11:36 +02:00 |
|
|
|
6cbbce03c4
|
Merge branch 'features/household' into 'master'
Manage household
See merge request Chill-Projet/chill-bundles!70
|
2021-06-04 13:10:42 +00:00 |
|
Marc Ducobu
|
e52c94aabd
|
Use SocialIssueRenderer->renderString for displaying socialIssues
|
2021-06-04 15:04:36 +02:00 |
|
|
|
ef98111a2f
|
Merge remote-tracking branch 'origin/master' into features/household
|
2021-06-04 15:03:00 +02:00 |
|
|
|
55fa16ce56
|
fix missing postgresql extension: correct class name
|
2021-06-04 14:54:14 +02:00 |
|
Marc Ducobu
|
39dca2a9ca
|
Form for socialIssues & Actions using expanded
|
2021-06-04 14:48:07 +02:00 |
|
|
|
80ccb76794
|
Merge branch 'master' into 38_modal_on-the-fly
|
2021-06-04 14:18:54 +02:00 |
|
Marc Ducobu
|
541fe8f1ad
|
Removing extra line
|
2021-06-04 12:22:17 +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 |
|
|
|
a323e84357
|
concerned parties in vue component: display 3 or 4 bloc according to context
|
2021-06-04 11:53:50 +02:00 |
|
|
|
c33f577f5a
|
activity show: concerned parties are clickable links
|
2021-06-04 10:52:07 +02:00 |
|
nobohan
|
0ce814cf52
|
hotfix: delete duplicate key in ChillPersonBundle messages translation
|
2021-06-04 09:34:36 +02:00 |
|
|
|
4ace2fef99
|
concerned parties, split in activity model persons associated or not
|
2021-06-03 20:20:56 +02:00 |
|
Marc Ducobu
|
4a1ebc1c4c
|
Removing dump
|
2021-06-03 20:18:47 +02:00 |
|
Marc Ducobu
|
4553051271
|
Review load fixtures for activityType & categories
|
2021-06-03 20:15:40 +02:00 |
|
Marc Ducobu
|
743d6cd0bf
|
Method setX with return this (and not void)
|
2021-06-03 20:15:40 +02:00 |
|
Marc Ducobu
|
0f635ca51a
|
SocialAction & Issues in Activity form
|
2021-06-03 20:15:40 +02:00 |
|
|
|
987815471c
|
add concerned parties in show activity page (2 contexts)
|
2021-06-03 19:13:58 +02:00 |
|
nobohan
|
f6d4d32ce4
|
fix conflict when merging
|
2021-06-03 15:11:09 +02:00 |
|
|
|
937be1af3a
|
fix html5 birthdate field on modal form OnTheFly
|
2021-06-03 14:34:52 +02:00 |
|
|
|
32b3d74a1b
|
fix activity entity addPersons if person is null
|
2021-06-03 13:48:03 +02:00 |
|
nobohan
|
43fb020272
|
address: remove serializer config (it is autowired)
|
2021-06-03 13:01:24 +02:00 |
|
nobohan
|
f26fafb2f2
|
address: remove comment
|
2021-06-03 10:35:27 +02:00 |
|
nobohan
|
e1e3051d00
|
address: correct customizeQuery
|
2021-06-03 10:33:09 +02:00 |
|
