7372 Commits

Author SHA1 Message Date
ed4cf67e79 set carrier code parameter and lint existing phonenmubers 2022-03-02 13:01:01 +01:00
550168fd7c Merge branch 'issue475_bug_graphique' 2022-03-02 13:00:51 +01:00
8470430c57 try to resolve bug with flot-button.bottom placement 2022-03-02 13:00:23 +01:00
5dc117037d change label styling for view of resource/charge (suggestion) 2022-03-02 12:02:49 +01:00
7f1083aa40 Use select2 field 2022-03-02 12:02:16 +01:00
900adc7105 improvements templates 2022-03-02 11:44:10 +01:00
0648154ba1 remove comments 2022-03-02 11:43:55 +01:00
86de8137e4 restyling layout of table 2022-03-02 11:42:54 +01:00
a9415488dd Merge branch 'list_documents_page' 2022-03-02 09:55:16 +01:00
8945703785 fix template mistakes 2022-03-02 09:53:51 +01:00
9f90cc8fe1 Merge remote-tracking branch 'origin/master' into 20-update-telephone-type-new-approach 2022-03-01 16:55:33 +01:00
7b17dc692e Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles 2022-03-01 16:14:00 +01:00
e5f7120733 Merge branch 'list_documents_page' 2022-03-01 16:13:20 +01:00
1a05ffab96 fix flex item-col placement for documents list 2022-03-01 16:13:11 +01:00
aad7a21bc3 Merge branch 'list_documents_page' 2022-03-01 16:09:10 +01:00
ae0bf7bfd7 fix flex item-col placement for documents list 2022-03-01 16:08:52 +01:00
d2ecc5d3a3 Merge branch 'issue442_toggle_emergency' into 'master'
Toggle emergency only by referrer

See merge request Chill-Projet/chill-bundles!331
2022-03-01 15:02:01 +00:00
22aefca5c9 Merge remote-tracking branch 'origin/issue442_toggle_emergency' into issue442_toggle_emergency 2022-03-01 15:58:20 +01:00
cce790f2f8 add validator which force confidential course to keep a referrer 2022-03-01 15:55:18 +01:00
cefa304fb5 mixup colors fixed. color of resource to be discusses still 2022-03-01 15:49:37 +01:00
83760cc980 Merge remote-tracking branch 'origin/master' into issue469_budget 2022-03-01 15:42:59 +01:00
2b108d0d70 update changelog 2022-03-01 15:32:47 +01:00
f5accb827c fix inline address -> reopen issue462 2022-03-01 15:27:18 +01:00
nobohan
4543c411e7 quick fix: remove duplicate email info in PersonRenderBox.vue 2022-03-01 15:24:44 +01:00
4536f30da2 Merge branch 'list_documents_page' 2022-03-01 15:11:01 +01:00
8764aacd92 fix confusion between document dates 2022-03-01 15:03:21 +01:00
8b8f6027cc Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency 2022-03-01 14:52:56 +01:00
6769752c26 merge with master 2022-03-01 14:40:14 +01:00
nobohan
5695bb0e9e add missing key in v-for loop 2022-03-01 14:36:47 +01:00
nobohan
48a32f2403 residential address: filter by person in the repository 2022-03-01 14:36:22 +01:00
695b9d5bea merge with master 2022-03-01 14:32:03 +01:00
f38cfb4b28 adjustments templates 2022-03-01 14:30:12 +01:00
nobohan
a7240e8cc6 PersonJsonNormalizer: fix circular reference with residential address 2022-03-01 14:15:39 +01:00
67948f7f3a styles in scss with webpack 2022-03-01 14:00:14 +01:00
52d8776fbb Merge branch 'list_documents_page' 2022-03-01 11:34:07 +01:00
0d38cae217 fix macro metadata + fix merge conflicts from branch ux_corrections 2022-03-01 11:33:33 +01:00
d6bad9e030 reorganization of templates 2022-03-01 11:07:53 +01:00
Pol Dellaiera
b146f17d2f
Update twig function isEditable. 2022-03-01 09:58:57 +01:00
df675cd757 Merge branch 'issue463' into 'master'
issue 463: add delete button on draft periods page

See merge request Chill-Projet/chill-bundles!361
2022-03-01 08:50:23 +00:00
ecc2e390f7 Merge remote-tracking branch 'origin/master' into issue463 2022-03-01 09:48:19 +01:00
c3e0b3b708 Merge branch 'issue458_ChillCollectionType' into 'master'
ChillCollectionType: fix bug when adding 2 new items in an empty collection

See merge request Chill-Projet/chill-bundles!359
2022-03-01 08:47:01 +00:00
449a6a1b4e Merge remote-tracking branch 'origin/master' into issue458_ChillCollectionType 2022-03-01 09:28:44 +01:00
eb874a15a6 Merge branch 'issue366_modal_thirdparty' into 'master'
Thirdparty renderbox improvements

See merge request Chill-Projet/chill-bundles!356
2022-03-01 08:24:54 +00:00
3b26466a6c remove duplicate key in thirdparty serializer 2022-02-28 20:07:13 +01:00
a6ac6ee6d8 fix merge conflicts 2022-02-28 19:47:22 +01:00
a59994355b fix merge conflict 2022-02-28 17:14:37 +01:00
06c279627a Merge remote-tracking branch 'origin/master' into workflow/fixes-2022-02 2022-02-28 16:29:57 +01:00
1e146f542e try to fix some things 2022-02-28 16:09:52 +01:00
cdd21c94c6 Merge remote-tracking branch 'origin/master' into issue439_residential_address_otf 2022-02-28 15:11:50 +01:00
Pol Dellaiera
30cdcb0836
serializer update 2022-02-28 15:01:26 +01:00