e7384343b2 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into features/improve-accompanying-course-summary  
						
						 
						
						
						
						
					 
					
						2021-06-29 21:12:21 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1e2a920200 
					 
					
						
						
							
							clean menu builder for activity  
						
						 
						
						
						
						
					 
					
						2021-06-29 21:03:38 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b5a78fa341 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into features/improve-activity  
						
						 
						
						
						
						
					 
					
						2021-06-29 20:52:06 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d9c1f52894 
					 
					
						
						
							
							improve activity  
						
						 
						
						
						
						
					 
					
						2021-06-29 20:51:08 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						f05f7415bd 
					 
					
						
						
							
							household: add household accompanying periods  
						
						 
						
						
						
						
					 
					
						2021-06-29 19:41:00 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						5553c7314c 
					 
					
						
						
							
							household address: fix conflict on branch merge  
						
						 
						
						
						
						
					 
					
						2021-06-29 17:47:40 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7dc70baf57 
					 
					
						
						
							
							permet de surcharger le label 'commentaire' des actviités  
						
						 
						
						
						
						
					 
					
						2021-06-29 17:39:19 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						34af401a98 
					 
					
						
						
							
							accompanying period: add items in the summary page  
						
						 
						
						
						
						
					 
					
						2021-06-29 17:37:58 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5bae8dc5bf 
					 
					
						
						
							
							Import also scripts tags & css for launching banner  
						
						 
						
						
						
						
					 
					
						2021-06-29 17:13:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6e277e99ae 
					 
					
						
						
							
							fix in accompanying period list: thirdparty as requestor + link  
						
						 
						
						
						
						
					 
					
						2021-06-29 17:09:55 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2688c0f0ce 
					 
					
						
						
							
							fix missing div in accompanying course work list  
						
						 
						
						
						
						
					 
					
						2021-06-29 17:09:38 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						0135f5184e 
					 
					
						
						
							
							accompanying period: wording + minor changes in twig  
						
						 
						
						
						
						
					 
					
						2021-06-29 17:09:24 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						fd698419e8 
					 
					
						
						
							
							Merge branch 'fix-prototypage-details' into 'master'  
						
						 
						
						... 
						
						
						
						Fix prototypage details
See merge request Chill-Projet/chill-bundles!94  
						
						
					 
					
						2021-06-29 15:06:20 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4a864a0b14 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into features/improve-accompanying-course-summary  
						
						 
						
						
						
						
					 
					
						2021-06-29 16:59:05 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						55dc0d3f9f 
					 
					
						
						
							
							Ajout informations manquantes dans la page "summary" des  
						
						 
						
						... 
						
						
						
						AccompanyingCourse 
						
						
					 
					
						2021-06-29 16:57:28 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						85835c8b0d 
					 
					
						
						
							
							Merge branch 'features/api-search' into 'master'  
						
						 
						
						... 
						
						
						
						Features/api search
See merge request Chill-Projet/chill-bundles!98  
						
						
					 
					
						2021-06-29 14:50:28 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						ab1edee9fb 
					 
					
						
						
							
							person menu: add style for submenus  
						
						 
						
						
						
						
					 
					
						2021-06-29 16:22:58 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6154e0912b 
					 
					
						
						
							
							fix in accompanying period list: thirdparty as requestor + link  
						
						 
						
						
						
						
					 
					
						2021-06-29 16:14:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0388428c6f 
					 
					
						
						
							
							fix missing div in accompanying course work list  
						
						 
						
						
						
						
					 
					
						2021-06-29 16:14:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7ac55275c2 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/fix_issues_juminet' into features/improve-accompanying-course-summary  
						
						 
						
						
						
						
					 
					
						2021-06-29 16:06:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1119e20a49 
					 
					
						
						
							
							Add minor fixes to summary page:  
						
						 
						
						... 
						
						
						
						* add messages when no resources
* add address to person
* replace household link label with household number 
						
						
					 
					
						2021-06-29 16:03:59 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ea2870eef8 
					 
					
						
						
							
							Merge branch 'features/create-user-endpoint' into 'master'  
						
						 
						
						... 
						
						
						
						Feature: create user endpoint
See merge request Chill-Projet/chill-bundles!96  
						
						
					 
					
						2021-06-29 14:02:16 +00:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						93a44d8303 
					 
					
						
						
							
							address: automatic return when saving address  
						
						 
						
						
						
						
					 
					
						2021-06-29 15:06:35 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						8109415e05 
					 
					
						
						
							
							address: wording button  
						
						 
						
						
						
						
					 
					
						2021-06-29 14:39:43 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						514fe6163a 
					 
					
						
						
							
							address: format address as the French format  
						
						 
						
						
						
						
					 
					
						2021-06-29 14:33:51 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						9d9be7f831 
					 
					
						
						
							
							vue activity: fix backend when hidden return empty string  
						
						 
						
						
						
						
					 
					
						2021-06-29 14:31:56 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						4cf3cc8353 
					 
					
						
						
							
							address: add focus on selectAddress field  
						
						 
						
						
						
						
					 
					
						2021-06-29 14:25:26 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2a974e1269 
					 
					
						
						
							
							fix socialActions selected visibility if all issues unchecked + cleaning  
						
						 
						
						
						
						
					 
					
						2021-06-29 12:23:11 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						beca41774e 
					 
					
						
						
							
							vue activity: fix duplicates and add condition in initial loading  
						
						 
						
						
						
						
					 
					
						2021-06-29 11:49:23 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						dd991e3572 
					 
					
						
						
							
							add test  
						
						 
						
						
						
						
					 
					
						2021-06-28 23:02:15 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0640631821 
					 
					
						
						
							
							implementation on 3party + quote keys in SearchApiQuery  
						
						 
						
						
						
						
					 
					
						2021-06-28 22:44:42 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e845d9ba90 
					 
					
						
						
							
							replace search api by a first workin implementation  
						
						 
						
						
						
						
					 
					
						2021-06-28 22:01:33 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						6f8231f6f6 
					 
					
						
						
							
							accompanying course: clean controller  
						
						 
						
						
						
						
					 
					
						2021-06-28 22:01:05 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						048161e300 
					 
					
						
						
							
							accompanying course summary (WIP)  
						
						 
						
						
						
						
					 
					
						2021-06-28 22:00:07 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b705c5910f 
					 
					
						
						
							
							dispatch action change value of hidden fields, persisted when submited  
						
						 
						
						
						
						
					 
					
						2021-06-28 20:46:30 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6f1209eaf5 
					 
					
						
						
							
							rename methods, improve logic  
						
						 
						
						
						
						
					 
					
						2021-06-28 20:20:54 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						020759180b 
					 
					
						
						
							
							prepare dispatch  
						
						 
						
						
						
						
					 
					
						2021-06-28 20:07:53 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3748b4fbf4 
					 
					
						
						
							
							vue activity: manage datas in store, not with data()  
						
						 
						
						
						
						
					 
					
						2021-06-28 19:05:26 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						4f49292178 
					 
					
						
						
							
							address: fix saving of isNoAddress  
						
						 
						
						
						
						
					 
					
						2021-06-28 17:18:57 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6eaffcae49 
					 
					
						
						
							
							fix redirection after changing household member  
						
						 
						
						
						
						
					 
					
						2021-06-28 16:22:17 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						f92d710a26 
					 
					
						
						
							
							accompanying course summary: add social actions  
						
						 
						
						
						
						
					 
					
						2021-06-28 16:16:55 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						bc6ba88acd 
					 
					
						
						
							
							menu: fix code indentation  
						
						 
						
						
						
						
					 
					
						2021-06-28 16:04:24 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						61c2934d64 
					 
					
						
						
							
							activity: get social Actions, improve reactivity  
						
						 
						
						
						
						
					 
					
						2021-06-28 15:31:41 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						28b4d9562c 
					 
					
						
						
							
							add socialAction checkbox list  
						
						 
						
						
						
						
					 
					
						2021-06-28 15:21:41 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e06aded1ec 
					 
					
						
						
							
							remove from multiselect when adding social issues + disable accompanyingcourse issues loading  
						
						 
						
						
						
						
					 
					
						2021-06-28 15:21:32 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3a81124e04 
					 
					
						
						
							
							activity vue: list socialIssues checkbox from accompanyingCourse  
						
						 
						
						
						
						
					 
					
						2021-06-28 15:21:17 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								nobohan 
							
						 
					 
					
						
						
							
						
						b72d45d9db 
					 
					
						
						
							
							accompanying period: hide activity entries from the menu if accompanyin period is DRAFT  
						
						 
						
						
						
						
					 
					
						2021-06-28 13:50:31 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2a1f5cbad1 
					 
					
						
						
							
							add test for suggestion household by accompanying period  
						
						 
						
						
						
						
					 
					
						2021-06-28 13:18:00 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e8566fd006 
					 
					
						
						
							
							change label  
						
						 
						
						
						
						
					 
					
						2021-06-28 12:36:19 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cd6b5c9a39 
					 
					
						
						
							
							Add context for household member editor form:  
						
						 
						
						... 
						
						
						
						* add context for accompanying period, if indicated in a query
parameter;
* expand automatically household suggestion, if indicated in a query
parameter 
						
						
					 
					
						2021-06-28 11:23:30 +02:00