|
|
098c2fbaa0
|
Merge remote-tracking branch 'origin/master' into 232_resources_comment
|
2022-01-10 21:50:00 +01:00 |
|
|
|
42a14fbd6b
|
AccompanyingPeriod list: manage context entity variable in record_actions buttons (TO BE CHECKED)
Need to pass context entity in record_actions buttons to use variables like 'person' !
|
2022-01-10 16:55:01 +01:00 |
|
|
|
46ca74fc70
|
Merge branch 'master' into notification/completion
|
2022-01-10 16:11:06 +01:00 |
|
|
|
fded08aaaa
|
include Activity in notification (ShowInNotification)
|
2022-01-10 16:01:22 +01:00 |
|
|
|
8afd1ee275
|
Activity show page: move notify button and notification-box in post menu area
|
2022-01-10 15:14:50 +01:00 |
|
|
|
5a739380cd
|
force ShowInNotification background (for odd gray container)
|
2022-01-10 14:36:58 +01:00 |
|
|
|
a1ec2b637d
|
ShownInNotification: put border on alert block
|
2022-01-10 14:36:27 +01:00 |
|
|
|
584b77bbf4
|
accourse resume page: fix masonry block border
|
2022-01-10 14:36:27 +01:00 |
|
|
|
e84182cdac
|
translations + alert message position
|
2022-01-10 13:08:09 +01:00 |
|
juminet
|
699dcc85de
|
Issue344 vue multiselect i18n
|
2022-01-10 12:04:57 +00:00 |
|
|
|
95027e93c6
|
fix translations for AddPersons in PickEntity
|
2022-01-10 12:41:47 +01:00 |
|
juminet
|
921dd639bf
|
accompanying period: add location to accompanying period + add delete button
|
2022-01-10 11:03:14 +00:00 |
|
|
|
a40077e91b
|
include AccompanyingPeriod in notification (shownInNotification)
|
2022-01-10 10:52:09 +01:00 |
|
|
|
efc3e3915b
|
Docgen/action add missing goals
|
2022-01-10 09:35:26 +00:00 |
|
|
|
98ab3b66ba
|
Accompanying periods list: move item in separate template (to share)
|
2022-01-10 10:21:31 +01:00 |
|
|
|
b1cd85971a
|
notification show page: use macro to display thread comments
|
2022-01-07 15:50:47 +01:00 |
|
|
|
0a3b50568d
|
Merge branch '327_pinned_comment' into notification/completion
|
2022-01-07 15:25:54 +01:00 |
|
|
|
69b5c98d2e
|
inject record_actions buttons inside macro
|
2022-01-07 15:24:06 +01:00 |
|
|
|
bdf4b71080
|
Merge branch '327_pinned_comment' into notification/completion
|
2022-01-07 13:02:59 +01:00 |
|
|
|
c60d46c68b
|
put macro show_comment in a separate template
|
2022-01-07 12:51:03 +01:00 |
|
|
|
be4b8a94f0
|
AccompanyingCourse comments: move and rename files
|
2022-01-07 12:37:19 +01:00 |
|
|
|
a54cc70fd6
|
temporary disable previous commit
|
2022-01-07 12:34:14 +01:00 |
|
|
|
7d4ca8d149
|
remove dropped tests, separate list item in external include
|
2022-01-06 19:04:24 +01:00 |
|
|
|
c32b767d9b
|
Notifications list template
|
2022-01-06 19:04:16 +01:00 |
|
|
|
b9e5734039
|
bouton bleu
|
2022-01-05 21:16:47 +01:00 |
|
|
|
f5f5d66f3d
|
design notification box in post menu area
|
2022-01-05 20:58:51 +01:00 |
|
|
|
1e0c62b09d
|
Merge branch 'master' into notification/completion
|
2022-01-05 11:15:49 +01:00 |
|
|
|
78cf817921
|
docgen: add location to accompanying period
|
2022-01-04 23:50:22 +01:00 |
|
|
|
66aac8908c
|
notification: fix translations
|
2022-01-04 22:41:04 +01:00 |
|
|
|
6f561f57a6
|
Notification: send an email when a notification is created
|
2022-01-04 22:35:23 +01:00 |
|
|
|
4f1540c541
|
add a patch resource api endpoint (wip)
|
2022-01-04 19:37:27 +01:00 |
|
|
|
4ef024516c
|
notificaiton: improve NotificationHandlerInterface + mark notification
as unread if a comment is appended
|
2022-01-04 19:02:03 +01:00 |
|
|
|
d31661ae7a
|
notification: fix NotificationHandlerInterface
|
2022-01-04 17:55:34 +01:00 |
|
|
|
f76f7a1641
|
notification: handle activities
|
2022-01-04 17:40:47 +01:00 |
|
Pol Dellaiera
|
f63afea2ce
|
Autofix code style.
|
2022-01-04 17:32:05 +01:00 |
|
Pol Dellaiera
|
660e45ac59
|
tests: Tag failing test as incomplete.
|
2022-01-04 17:27:30 +01:00 |
|
Pol Dellaiera
|
e619e58a6e
|
tests: Tag failing test as incomplete.
|
2022-01-04 17:20:25 +01:00 |
|
|
|
a8fe049ecd
|
notification: add more variable in twig template
|
2022-01-04 17:00:31 +01:00 |
|
Pol Dellaiera
|
08de360677
|
tests: Tag failing test as incomplete.
|
2022-01-04 16:38:21 +01:00 |
|
Pol Dellaiera
|
e2ad590310
|
tests: Get rid of PHPUnit deprecations.
|
2022-01-04 16:29:49 +01:00 |
|
nobohan
|
06f8014b76
|
Merge branch 'master' into issue303_household_fixes
|
2022-01-04 16:06:15 +01:00 |
|
nobohan
|
52f817bde7
|
fix conflicts when merging master
|
2022-01-04 15:56:32 +01:00 |
|
|
|
af2eca0d03
|
Change accompanyingCourse Resources comment by a string
|
2022-01-04 15:56:00 +01:00 |
|
Pol Dellaiera
|
33913867ee
|
cs: Use Collection more and fix potential duplicates.
|
2022-01-04 15:55:56 +01:00 |
|
|
|
bcd25fa950
|
Merge branch 'issue349-masonry' into 'master'
Issue349 masonry
See merge request Chill-Projet/chill-bundles!274
|
2022-01-04 14:38:04 +00:00 |
|
Pol Dellaiera
|
acf7142bad
|
cs: Use Collection more.
|
2022-01-04 15:29:17 +01:00 |
|
Pol Dellaiera
|
c8c5af8d14
|
cs: Update PersonJsonNormalizer.
|
2022-01-04 15:18:03 +01:00 |
|
nobohan
|
aa6b770bfe
|
fix conflict
|
2022-01-04 15:11:43 +01:00 |
|
nobohan
|
4d5d5265df
|
fix alt name choice array
|
2022-01-04 15:10:03 +01:00 |
|
Pol Dellaiera
|
d19c5c9e41
|
cs: Autofix.
|
2022-01-04 15:07:41 +01:00 |
|
