| 
						
					 | 
					
						
						
							
						
						ba893e8429
					 | 
					
						
						
							
							Merge branch '327_pinned_comment' into 'master'
						
						
						
						
						
						
						
						327 pinned comment
See merge request Chill-Projet/chill-bundles!279 
						
						
					 | 
					
						2022-01-10 20:55:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b153fc19f6
					 | 
					
						
						
							
							327 pinned comment
						
						
						
						
						
						
					 | 
					
						2022-01-10 20:55:37 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						098c2fbaa0
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into 232_resources_comment
						
						
						
						
						
						
					 | 
					
						2022-01-10 21:50:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						479e4ffe64
					 | 
					
						
						
							
							add notification box in context person, page show activity
						
						
						
						
						
						
					 | 
					
						2022-01-10 17:08:56 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ae931b5869
					 | 
					
						
						
							
							update changelog
						
						
						
						
						
						
					 | 
					
						2022-01-10 16:04:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fded08aaaa
					 | 
					
						
						
							
							include Activity in notification (ShowInNotification)
						
						
						
						
						
						
					 | 
					
						2022-01-10 16:01:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d60938352b
					 | 
					
						
						
							
							notification: add selector on title, move styles
						
						
						
						
						
						
					 | 
					
						2022-01-10 15:59:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af6f3043ae
					 | 
					
						
						
							
							activity list page: put item bloc in a separate include
						
						
						
						
						
						
					 | 
					
						2022-01-10 15:58:11 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						01d51da7e1
					 | 
					
						
						
							
							Merge branch 'issue344_vue_multiselect_i18n' into 'master'
						
						
						
						
						
						
						
						Issue344 vue multiselect i18n
See merge request Chill-Projet/chill-bundles!278 
						
						
					 | 
					
						2022-01-10 12:04:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								juminet
							
						 
					 | 
					
						
						
							
						
						699dcc85de
					 | 
					
						
						
							
							Issue344 vue multiselect i18n
						
						
						
						
						
						
					 | 
					
						2022-01-10 12:04:57 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e677c0fe2f
					 | 
					
						
						
							
							Merge branch 'issue309_address_lines' into 'master'
						
						
						
						
						
						
						
						address: render Address as lines
See merge request Chill-Projet/chill-bundles!277 
						
						
					 | 
					
						2022-01-10 11:49:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								juminet
							
						 
					 | 
					
						
						
							
						
						edeaaf0218
					 | 
					
						
						
							
							address: render Address as lines
						
						
						
						
						
						
					 | 
					
						2022-01-10 11:49:38 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						afae3b58c2
					 | 
					
						
						
							
							notification form integration (create/edit)
						
						
						
						
						
						
					 | 
					
						2022-01-10 12:44:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						95027e93c6
					 | 
					
						
						
							
							fix translations for AddPersons in PickEntity
						
						
						
						
						
						
					 | 
					
						2022-01-10 12:41:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a3ea28d307
					 | 
					
						
						
							
							Merge branch 'issue342_location_in_acc_period' into 'master'
						
						
						
						
						
						
						
						accompanying period: add location to accompanying period + add delete button
See merge request Chill-Projet/chill-bundles!272 
						
						
					 | 
					
						2022-01-10 11:03:14 +00: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8de5c8900a
					 | 
					
						
						
							
							Merge branch 'docgen/action-add-missing-goals' into 'master'
						
						
						
						
						
						
						
						Docgen/action add missing goals
See merge request Chill-Projet/chill-bundles!280 
						
						
					 | 
					
						2022-01-10 09:35:26 +00: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5c4bef26e8
					 | 
					
						
						
							
							hotfix typo in NotificationComment
						
						
						
						
						
						
					 | 
					
						2022-01-07 14:56:17 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18959f60e2
					 | 
					
						
						
							
							reuse notification item in show template
						
						
						
						
						
						
					 | 
					
						2022-01-06 19:42:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7d4ca8d149
					 | 
					
						
						
							
							remove dropped tests, separate list item in external include
						
						
						
						
						
						
					 | 
					
						2022-01-06 19:04:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						442e2a1ede
					 | 
					
						
						
							
							notification list, item header integration (test 3 ways)
						
						
						
						
						
						
					 | 
					
						2022-01-06 19:04:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c32b767d9b
					 | 
					
						
						
							
							Notifications list template
						
						
						
						
						
						
					 | 
					
						2022-01-06 19:04:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						140f53b81f
					 | 
					
						
						
							
							setting NotificationReadToggle options for several cases. improve options
						
						
						
						
						
						
					 | 
					
						2022-01-06 13:34:39 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						40a457ba69
					 | 
					
						
						
							
							notificaiton: add mailer component
						
						
						
						
						
						
					 | 
					
						2022-01-04 22:41:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						66aac8908c
					 | 
					
						
						
							
							notification: fix translations
						
						
						
						
						
						
					 | 
					
						2022-01-04 22:41:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c17fd968be
					 | 
					
						
						
							
							notification: do not show system notification in UI
						
						
						
						
						
						
					 | 
					
						2022-01-04 22:40:48 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |