| 
						
					 | 
					
						
						
							
						
						1967d6ea4c
					 | 
					
						
						
							
							Merge branch 'features/household-context' into 'master'
						
						
						
						
						
						
						
						Create an household context
See merge request Chill-Projet/chill-bundles!74 
						
						
					 | 
					
						2021-06-07 15:04:44 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0fe70d00ec
					 | 
					
						
						
							
							Merge branch 'remove-uneeded-service-definition' into 'master'
						
						
						
						
						
						
						
						[simplification] Remove custom service definitions.
See merge request Chill-Projet/chill-bundles!72 
						
						
					 | 
					
						2021-06-07 08:29:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pol Dellaiera
							
						 
					 | 
					
						
						
							
						
						7a33c37b51
					 | 
					
						
						
							
							Fix path.
						
						
						
						
						
						
					 | 
					
						2021-06-04 15:52:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pol Dellaiera
							
						 
					 | 
					
						
						
							
						
						a6c4b4eb55
					 | 
					
						
						
							
							Remove custom service definitions.
						
						
						
						
						
						
					 | 
					
						2021-06-04 15:52:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3e57ff3ffa
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into features/household-context
						
						
						
						
						
						
					 | 
					
						2021-06-04 15:11:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6cbbce03c4
					 | 
					
						
						
							
							Merge branch 'features/household' into 'master'
						
						
						
						
						
						
						
						Manage household
See merge request Chill-Projet/chill-bundles!70 
						
						
					 | 
					
						2021-06-04 13:10:42 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef98111a2f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into features/household
						
						
						
						
						
						
					 | 
					
						2021-06-04 15:03:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						55fa16ce56
					 | 
					
						
						
							
							fix missing postgresql extension: correct class name
						
						
						
						
						
						
					 | 
					
						2021-06-04 14:54:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						80ccb76794
					 | 
					
						
						
							
							Merge branch 'master' into 38_modal_on-the-fly
						
						
						
						
						
						
					 | 
					
						2021-06-04 14:18:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						0ce814cf52
					 | 
					
						
						
							
							hotfix: delete duplicate key in ChillPersonBundle messages translation
						
						
						
						
						
						
					 | 
					
						2021-06-04 09:34:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						f6d4d32ce4
					 | 
					
						
						
							
							fix conflict when merging
						
						
						
						
						
						
					 | 
					
						2021-06-03 15:11:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						937be1af3a
					 | 
					
						
						
							
							fix html5 birthdate field on modal form OnTheFly
						
						
						
						
						
						
					 | 
					
						2021-06-03 14:34:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						43fb020272
					 | 
					
						
						
							
							address: remove serializer config (it is autowired)
						
						
						
						
						
						
					 | 
					
						2021-06-03 13:01:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						f26fafb2f2
					 | 
					
						
						
							
							address: remove comment
						
						
						
						
						
						
					 | 
					
						2021-06-03 10:35:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						e1e3051d00
					 | 
					
						
						
							
							address: correct customizeQuery
						
						
						
						
						
						
					 | 
					
						2021-06-03 10:33:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						a659263af6
					 | 
					
						
						
							
							addresses: translations
						
						
						
						
						
						
					 | 
					
						2021-06-03 10:27:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						9333b6d2df
					 | 
					
						
						
							
							address: correct customizeQuery
						
						
						
						
						
						
					 | 
					
						2021-06-03 10:22:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d0cfbb396
					 | 
					
						
						
							
							OnTheFly modal, Person Sub-component: create/edit form, show
						
						
						
						
						
						
					 | 
					
						2021-06-02 22:29:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e9caa7b4b8
					 | 
					
						
						
							
							add groups on household serialization
						
						
						
						
						
						
					 | 
					
						2021-06-02 21:44:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						261acdfd24
					 | 
					
						
						
							
							Merge branch 'features/household' into features/household-context
						
						
						
						
						
						
					 | 
					
						2021-06-02 16:48:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						17481798fb
					 | 
					
						
						
							
							fix duplicate in messages.fr.yml
						
						
						
						
						
						
					 | 
					
						2021-06-02 16:38:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						edb8aa1dfe
					 | 
					
						
						
							
							Merge branch 'master' into features/household
						
						
						
						
						
						
					 | 
					
						2021-06-02 16:28:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						93a67c9ab9
					 | 
					
						
						
							
							Merge branch 'fix-person-tests'
						
						
						
						
						
						
						
						Conflicts:
	src/Bundle/ChillPersonBundle/translations/messages.fr.yml 
						
						
					 | 
					
						2021-06-02 16:25:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						980a305456
					 | 
					
						
						
							
							Merge branch 'dune-risky'
						
						
						
						
						
						
						
						Conflicts:
	src/Bundle/ChillActivityBundle/config/services.yaml
	src/Bundle/ChillPersonBundle/translations/messages.fr.yml 
						
						
					 | 
					
						2021-06-02 16:23:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0158c6f2ed
					 | 
					
						
						
							
							add tests for household
						
						
						
						
						
						
					 | 
					
						2021-06-02 16:21:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ff5b0bc258
					 | 
					
						
						
							
							add list for addresses
						
						
						
						
						
						
					 | 
					
						2021-06-02 16:20:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a133f56dce
					 | 
					
						
						
							
							add routes for household addresses, members, and addresses_moves
						
						
						
						
						
						
					 | 
					
						2021-06-02 15:45:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa556bbba1
					 | 
					
						
						
							
							basic context for household
						
						
						
						
						
						
					 | 
					
						2021-06-02 11:44:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e8f3c499ee
					 | 
					
						
						
							
							Merge branch 'dune-risky' into fix-person-tests
						
						
						
						
						
						
					 | 
					
						2021-06-02 00:47:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cfd9f1bab1
					 | 
					
						
						
							
							replace call to entity by class FQDN
						
						
						
						
						
						
					 | 
					
						2021-06-02 00:46:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						8011293b28
					 | 
					
						
						
							
							address form: add the possibility to create a new address
						
						
						
						
						
						
					 | 
					
						2021-06-01 21:55:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4562ed46db
					 | 
					
						
						
							
							OnTheFly modal: adapt footer button for show/edit cases (bug minor)
						
						
						
						
						
						
						
						[BUG] to reproduce:
* clic first on show item button
* in modal clic edit button
* close modal
* clic again on show item button 
						
						
					 | 
					
						2021-06-01 10:48:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cd52f7e6e8
					 | 
					
						
						
							
							Merge branch 'fix-person-tests' into features/household
						
						
						
						
						
						
					 | 
					
						2021-05-31 21:40:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						126ffc55bf
					 | 
					
						
						
							
							Merge branch 'fix-getParticipationsContainsPerson' into 'master'
						
						
						
						
						
						
						
						Fix `::getParticipationsContainsPerson`.
See merge request Chill-Projet/chill-bundles!50 
						
						
					 | 
					
						2021-05-31 19:35:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f49c54d51f
					 | 
					
						
						
							
							fix redirection after creating accompanying course in test
						
						
						
						
						
						
					 | 
					
						2021-05-31 21:31:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1410213258
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into fix-person-tests
						
						
						
						
						
						
					 | 
					
						2021-05-31 21:17:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						35e0b98687
					 | 
					
						
						
							
							temporarily remove test for person duplicate
						
						
						
						
						
						
					 | 
					
						2021-05-31 21:16:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8f1091b8a3
					 | 
					
						
						
							
							Merge branch '50-ajout-problematique-sociale-modele' into 'master'
						
						
						
						
						
						
						
						Add many2many relation between socialIssue and accompanying period + api endpoint
See merge request Chill-Projet/chill-bundles!53 
						
						
					 | 
					
						2021-05-31 19:11:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c269bfe278
					 | 
					
						
						
							
							fix type-hinting for person repository
						
						
						
						
						
						
					 | 
					
						2021-05-31 21:09:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						041b1dfc51
					 | 
					
						
						
							
							Controller action to move members of an household
						
						
						
						
						
						
					 | 
					
						2021-05-31 20:42:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						718d6c2375
					 | 
					
						
						
							
							add basic on-the-fly sub-components, to show/edit/create person/thirdparty
						
						
						
						
						
						
					 | 
					
						2021-05-31 19:25:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						158b572879
					 | 
					
						
						
							
							replace all links and buttons involved by OnTheFly component
						
						
						
						
						
						
					 | 
					
						2021-05-31 15:52:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						68059a9938
					 | 
					
						
						
							
							add new OnTheFly vue sub-component
						
						
						
						
						
						
					 | 
					
						2021-05-31 12:59:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						543f6b20dd
					 | 
					
						
						
							
							firstname and lastname in same column
						
						
						
						
						
						
					 | 
					
						2021-05-31 11:39:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ace3b1969e
					 | 
					
						
						
							
							Rename membership edition and add more fixtures
						
						
						
						
						
						
					 | 
					
						2021-05-28 18:26:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						edc86af659
					 | 
					
						
						
							
							add tests for moving houshold
						
						
						
						
						
						
					 | 
					
						2021-05-28 18:01:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						87ba68971c
					 | 
					
						
						
							
							first impl of person Mover + add fixtures
						
						
						
						
						
						
					 | 
					
						2021-05-28 16:41:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						94bcbac06a
					 | 
					
						
						
							
							add extension btree_gist to postgres
						
						
						
						
						
						
					 | 
					
						2021-05-28 13:55:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						74520330b1
					 | 
					
						
						
							
							add position for household and prefix tables names
						
						
						
						
						
						
					 | 
					
						2021-05-28 13:25:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						935006eae3
					 | 
					
						
						
							
							addresses form: add default country value
						
						
						
						
						
						
					 | 
					
						2021-05-28 12:31:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |