451 Commits

Author SHA1 Message Date
ec536871aa Merge remote-tracking branch 'origin/master' into calendar/synchro-msgraph 2022-05-28 00:30:02 +02:00
c9ea9112f1 do not add private comment into generated documents 2022-05-27 22:24:25 +02:00
3274ecfaec Merge remote-tracking branch 'origin/master' into issue604_activity_list_documents 2022-05-27 22:03:41 +02:00
5e5a855578 fix cs 2022-05-27 15:48:50 +02:00
54a3e2b2ef Merge remote-tracking branch 'origin/master' into issue589_private_comments 2022-05-27 15:47:25 +02:00
014c460eef improvements on private comments 2022-05-27 15:40:08 +02:00
nobohan
cdbb70b9c5 activity: add title to generated document 2022-05-27 09:32:51 +02:00
nobohan
60c163ae9d storedObject: add title in form twig and in activity show 2022-05-25 17:30:26 +02:00
nobohan
e8cf7ae8e1 stored object: add has_title option to form type of StoredObject 2022-05-25 17:14:21 +02:00
7dcd5be735 fixes for editing calendar 2022-05-23 17:30:40 +02:00
nobohan
629dbb9137 admin: missing translations and css class 2022-05-11 11:30:08 +02:00
nobohan
f4652adbc2 admin: add fa icons to menu section title 2022-05-10 15:21:29 +02:00
nobohan
fde1d563c2 admin custom fields integration 2022-05-10 14:36:10 +02:00
nobohan
be27df1fd5 admin: remove obsolet header => true tag + php code fix 2022-05-10 11:46:17 +02:00
nobohan
c9b3bab508 admin sections for main bundle 2022-05-10 10:14:30 +02:00
nobohan
0f319a1003 admin: reorganising activity menu and submenus 2022-05-09 16:22:17 +02:00
e19cac168b php csfixes 2022-05-04 13:00:46 +02:00
416a88b93d fix form and take null cases into account 2022-05-04 12:30:44 +02:00
784a725ce3 fix translation 2022-05-04 09:34:16 +02:00
2ef3a3362a merge master into branch 2022-05-04 09:31:22 +02:00
02a8f5a863 Fix display privateComment in activity 2022-05-02 16:50:24 +02:00
nobohan
64d459466f activity admin: translations + remove label field for comment on admin activity type 2022-05-02 12:16:46 +02:00
79ac908631 remove a new set of unused files 2022-04-30 01:50:29 +02:00
4b9b27a8ef replace docrine shortcuts in activity bundle by fqdn 2022-04-30 00:37:26 +02:00
864e1eeabb replace more doctrine shortcuts by fqdn 2022-04-30 00:35:11 +02:00
a0392b9216 replace some entity shortcut by fqdn
* ChillPerson:Person
* ChillMain:Center
* ChillActivity:Activity
2022-04-30 00:20:18 +02:00
4dc56db018 show of activity adjusted for private comment 2022-04-27 11:51:32 +02:00
e8dcb45abb remove dump 2022-04-27 11:49:31 +02:00
452c4b85c6 Merge remote-tracking branch 'origin/master' into issue565_document_storedObject 2022-04-27 08:43:35 +02:00
c2061110dd fix cs 2022-04-26 21:16:55 +02:00
b2fb86111d fix social action consistency 2022-04-26 21:12:31 +02:00
db6c4f15f8 Merge remote-tracking branch 'origin/master' into issue471_activity_socialissue-action 2022-04-26 20:29:07 +02:00
37a198b860 PrivateCommentEmbeddable created and added to entities + datamapper 2022-04-26 20:21:33 +02:00
64b5de2c03 migrations deleted 2022-04-26 20:19:40 +02:00
75250402c8 fix ordering of social actions 2022-04-25 22:14:36 +02:00
b7abf6b6bf Merge remote-tracking branch 'origin/master' into issue571_ordering_socialactions 2022-04-25 21:30:48 +02:00
79fa030323 add private comment input field to edit form 2022-04-25 15:47:13 +02:00
b36fd57e4f Add private comment options to activity type (visibility + label) 2022-04-25 15:46:55 +02:00
ff72b28861 Revert "private comment added to activity"
This reverts commit 1f2638626cbcc84d0fe653bc5e08bd8e993a8b3e.
2022-04-25 14:52:28 +02:00
1f2638626c private comment added to activity 2022-04-25 14:43:44 +02:00
nobohan
5ae6c6397c storedObject: add validation in properties where it is used 2022-04-25 13:52:49 +02:00
a4baf89a6a social actions ordered in store 2022-04-21 21:05:32 +02:00
6cad0be181 Ignore thirdparty for socialaction created via activity 2022-04-20 17:08:27 +02:00
7f97215fe9 activity form: keep the same order for attendee field between edit and new form 2022-04-20 10:03:58 +02:00
6427fc64cd invert 'incoming' and 'receiving' 2022-04-20 10:00:48 +02:00
b95ff337b6 add more time duration for aside activities 2022-04-14 00:41:15 +02:00
01c571ab06 fix path to table 2022-04-11 21:04:36 +02:00
9765bc5663 fix cs 2022-04-11 17:12:59 +02:00
bb65909bfa add docgen context for a list of activities in a course 2022-04-11 16:52:11 +02:00
03b0a8766e remove dumps 2022-04-08 19:12:11 +02:00