7249 Commits

Author SHA1 Message Date
db37527f72 try to resolve bug with flot-button.bottom placement (2) 2022-03-02 17:36:24 +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
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
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
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
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
06c279627a Merge remote-tracking branch 'origin/master' into workflow/fixes-2022-02 2022-02-28 16:29:57 +01:00
260ce8ba17 issue 463: add delete button on draft periods page 2022-02-28 14:47:35 +01:00
822f0aa737 fix cs 2022-02-28 14:38:25 +01:00
e10a6b4bf2 Merge branch 'issue441_enfant_confie' 2022-02-28 14:37:38 +01:00
8e1f3a5cc0 Merge branch 'issue345_internal_thirdparty_contact' into 'master'
Add contact to thirdparty from within modal

See merge request Chill-Projet/chill-bundles!284
2022-02-28 13:28:13 +00:00
31ec6c70ef fix cs 2022-02-28 14:27:31 +01:00
cd84700400 Merge branch 'ux_corrections' 2022-02-28 14:23:54 +01:00
08fa1edbee Merge remote-tracking branch 'origin/master' into issue345_internal_thirdparty_contact 2022-02-28 14:22:52 +01:00
15d9593d0f design correction on list documents page 2022-02-28 14:22:15 +01:00
010afded18 order civilities 2022-02-28 13:56:52 +01:00
c12f633829 fixes 2022-02-28 13:52:41 +01:00
fb6f0c316e update changelog 2022-02-28 12:22:17 +01:00
b1ed263c4e add email in personrenderbox 2022-02-28 12:18:58 +01:00
846e487e27 fix display of address in renderbox 2022-02-28 12:13:58 +01:00
72a9183ca8 fix in case of no profession 2022-02-28 12:04:05 +01:00
fe89704672 Merge remote-tracking branch 'origin/master' into issue345_internal_thirdparty_contact 2022-02-28 11:39:16 +01:00
93d023007e Merge branch 'issue388_order_social_issues' into 'master'
person: rewrite social issue api controller for ordering

See merge request Chill-Projet/chill-bundles!323
2022-02-28 10:38:24 +00:00
8bf179934d update psalm to ignore new error (sorry) 2022-02-28 11:37:03 +01:00
24c79cc4b1 fix merge conflicts 2022-02-28 10:20:29 +01:00
f93282d657 fix cs 2022-02-28 10:13:00 +01:00
3a602385cc Merge remote-tracking branch 'origin/master' into issue388_order_social_issues 2022-02-28 09:51:40 +01:00
cb4c3b46b9 fix creating two workflow on accompanying period work 2022-02-27 03:03:29 +01:00