| 
						
					 | 
					
						
						
							
						
						71ca033b08
					 | 
					
						
						
							
							Merge branch 'issue363_localisation_type_not_available_to_users' into 'master'
						
						
						
						
						
						
						
						localisation type not available to edit by users
See merge request Chill-Projet/chill-bundles!282 
						
						
					 | 
					
						2022-01-16 22:51:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								juminet
							
						 
					 | 
					
						
						
							
						
						2c774e814e
					 | 
					
						
						
							
							localisation type not available to edit by users
						
						
						
						
						
						
					 | 
					
						2022-01-16 22:51:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3034ba411f
					 | 
					
						
						
							
							[course list in person context] show renderbox for referent
						
						
						
						
						
						
					 | 
					
						2022-01-16 23:39:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce6e51df87
					 | 
					
						
						
							
							Merge branch 'issue341_user_main_location' into 'master'
						
						
						
						
						
						
						
						[main] Add mainLocation field to User entity
See merge request Chill-Projet/chill-bundles!283 
						
						
					 | 
					
						2022-01-16 22:36:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								juminet
							
						 
					 | 
					
						
						
							
						
						6843b4cb2a
					 | 
					
						
						
							
							[main] Add mainLocation field to User entity
						
						
						
						
						
						
					 | 
					
						2022-01-16 22:36:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dcbce270ad
					 | 
					
						
						
							
							Merge branch 'issue376_internal_activityType_display' into 'master'
						
						
						
						
						
						
						
						Display of activity types
See merge request Chill-Projet/chill-bundles!286 
						
						
					 | 
					
						2022-01-16 22:18:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3f5a6c6b15
					 | 
					
						
						
							
							Display of activity types
						
						
						
						
						
						
					 | 
					
						2022-01-16 22:18:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d806551477
					 | 
					
						
						
							
							notification, list item: manage option fold_item with macro
						
						
						
						
						
						
					 | 
					
						2022-01-15 20:33:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						120ce40dbe
					 | 
					
						
						
							
							notification list: use bootstrap accordion to fold/unfold notification content
						
						
						
						
						
						
					 | 
					
						2022-01-15 17:13:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						22022e5143
					 | 
					
						
						
							
							JS toggle class read/unread status works on *all* container (change DOM selector)
						
						
						
						
						
						
					 | 
					
						2022-01-14 20:02:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						47615e2e5d
					 | 
					
						
						
							
							merge conflicts fixed
						
						
						
						
						
						
					 | 
					
						2022-01-14 16:13:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						46c6d0e293
					 | 
					
						
						
							
							minor fix: } missing in template causing an error
						
						
						
						
						
						
					 | 
					
						2022-01-14 15:25:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						20fcaa5428
					 | 
					
						
						
							
							notification: add prefix in object
						
						
						
						
						
						
					 | 
					
						2022-01-14 15:03:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb0a04b19a
					 | 
					
						
						
							
							Using translations instead of hardcoded
						
						
						
						
						
						
					 | 
					
						2022-01-14 14:37:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8d3ba314e0
					 | 
					
						
						
							
							adjustment badges into rounded-pill + red color for urgent
						
						
						
						
						
						
					 | 
					
						2022-01-14 14:18:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9e48a1db0a
					 | 
					
						
						
							
							badges added in list view for parcours that are urgent and/or confidential
						
						
						
						
						
						
					 | 
					
						2022-01-14 13:58:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						475585c5e7
					 | 
					
						
						
							
							use correct button
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:30:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a2e086be75
					 | 
					
						
						
							
							add a chill button "tpchild", to create on-the-fly thirdparty (kind=child)
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:30:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6cf1994b0
					 | 
					
						
						
							
							parent id added to thirdparty data
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:30:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bea0b69858
					 | 
					
						
						
							
							v-model added so data is taken from the form for all fields + modal title correction
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:30:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						95547e961e
					 | 
					
						
						
							
							onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:28:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c4a859f2d2
					 | 
					
						
						
							
							translations added
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:27:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a39bd79930
					 | 
					
						
						
							
							endpoints created for profession and civility for use in vue component
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:27:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						424d0533b8
					 | 
					
						
						
							
							unsaved changes
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:27:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a7d187a10
					 | 
					
						
						
							
							unsaved changes
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:27:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dc8dd6a423
					 | 
					
						
						
							
							button added to add contact to personne morale (styling not correct yet) + opening of onTheFly thirdparty, but conditions and parameters not yet correct
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:27:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						006e8cdc27
					 | 
					
						
						
							
							minor bug fix for view page of thirdparty property 'types' -> 'thirdPartyTypes'
						
						
						
						
						
						
					 | 
					
						2022-01-14 09:27:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						819017112d
					 | 
					
						
						
							
							JS toggle class read/unread when clicking on vue component NotificationReadToggle.vue
						
						
						
						
						
						
					 | 
					
						2022-01-13 18:56:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf4f6f06e9
					 | 
					
						
						
							
							use correct button
						
						
						
						
						
						
					 | 
					
						2022-01-13 17:58:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e467820345
					 | 
					
						
						
							
							add a chill button "tpchild", to create on-the-fly thirdparty (kind=child)
						
						
						
						
						
						
					 | 
					
						2022-01-13 17:53:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						416a1c4e4d
					 | 
					
						
						
							
							parent id added to thirdparty data
						
						
						
						
						
						
					 | 
					
						2022-01-13 16:36:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1febfc11e5
					 | 
					
						
						
							
							v-model added so data is taken from the form for all fields + modal title correction
						
						
						
						
						
						
					 | 
					
						2022-01-13 16:30:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d7d7fb5693
					 | 
					
						
						
							
							add a chill button "tpchild", to create on-the-fly thirdparty (kind=child)
						
						
						
						
						
						
					 | 
					
						2022-01-13 16:15:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						650e0d79be
					 | 
					
						
						
							
							improve notification list and show styles
						
						
						
						
						
						
					 | 
					
						2022-01-13 15:40:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a288fdf12d
					 | 
					
						
						
							
							resolve merge conflict
						
						
						
						
						
						
					 | 
					
						2022-01-13 14:40:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6a3f17962b
					 | 
					
						
						
							
							onTheFly modal to add contact to thirdparty - form fields for profession,civility, and comment added - no saving possible yet
						
						
						
						
						
						
					 | 
					
						2022-01-13 14:35:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3860adc435
					 | 
					
						
						
							
							translations added
						
						
						
						
						
						
					 | 
					
						2022-01-13 14:34:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						65daf2d0cf
					 | 
					
						
						
							
							endpoints created for profession and civility for use in vue component
						
						
						
						
						
						
					 | 
					
						2022-01-13 14:33:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0afccd12a9
					 | 
					
						
						
							
							fix error when twig insert onthefly with parent undefined
						
						
						
						
						
						
					 | 
					
						2022-01-13 14:11:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7abe3e1b2d
					 | 
					
						
						
							
							chill-no-data-statement smaller (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/354)
						
						
						
						
						
						
					 | 
					
						2022-01-13 14:11:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6c71cb0e80
					 | 
					
						
						
							
							Merge branch '232_resources_comment' into 'master'
						
						
						
						
						
						
						
						232 resources comment
See merge request Chill-Projet/chill-bundles!276 
						
						
					 | 
					
						2022-01-13 11:05:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						11d4450244
					 | 
					
						
						
							
							fix condition to show comment in on-the-fly
						
						
						
						
						
						
					 | 
					
						2022-01-13 11:27:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a79df0e0a
					 | 
					
						
						
							
							fix test
						
						
						
						
						
						
					 | 
					
						2022-01-12 22:34:32 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c0c2131be0
					 | 
					
						
						
							
							fix notification test
						
						
						
						
						
						
					 | 
					
						2022-01-12 22:22:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6ea2674c2
					 | 
					
						
						
							
							comment console.log, remove v-bind before ':'
						
						
						
						
						
						
					 | 
					
						2022-01-12 22:13:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						39b5ce0320
					 | 
					
						
						
							
							fix access to database in ci
						
						
						
						
						
						
					 | 
					
						2022-01-12 22:06:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e0ee817421
					 | 
					
						
						
							
							batch rename twig attribut
						
						
						
						
						
						
					 | 
					
						2022-01-12 21:36:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8159144f26
					 | 
					
						
						
							
							fix accesss to database on ci
						
						
						
						
						
						
					 | 
					
						2022-01-12 20:20:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						630115fd3a
					 | 
					
						
						
							
							update changelog
						
						
						
						
						
						
					 | 
					
						2022-01-12 20:43:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						87cf8d737e
					 | 
					
						
						
							
							remove dump
						
						
						
						
						
						
					 | 
					
						2022-01-12 20:38:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |