| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						048161e300
					 | 
					
						
						
							
							accompanying course summary (WIP)
						
						
						
						
						
						
					 | 
					
						2021-06-28 22:00:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4fd43310c0
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into features/edit-accompanying-period-social-work
						
						
						
						
						
						
					 | 
					
						2021-06-25 21:26:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c85ca894b8
					 | 
					
						
						
							
							layout for list accompanying work
						
						
						
						
						
						
					 | 
					
						2021-06-25 21:25:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb67605bd2
					 | 
					
						
						
							
							list accompanying course work
						
						
						
						
						
						
					 | 
					
						2021-06-25 14:59:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						aa5c7f333e
					 | 
					
						
						
							
							fix conflict + error on CommentType
						
						
						
						
						
						
					 | 
					
						2021-06-25 13:57:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						981b9299ad
					 | 
					
						
						
							
							layout form
						
						
						
						
						
						
					 | 
					
						2021-06-24 16:21:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						40fcb09082
					 | 
					
						
						
							
							layout for form
						
						
						
						
						
						
					 | 
					
						2021-06-21 13:38:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						b3792f6714
					 | 
					
						
						
							
							person: update person view/show twig
						
						
						
						
						
						
					 | 
					
						2021-06-18 13:46:46 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d35e4efbb
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into features/household-validation
						
						
						
						
						
						
					 | 
					
						2021-06-18 12:02:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						3d14f00cac
					 | 
					
						
						
							
							person: add show hide on some fields + remove unknown genderType
						
						
						
						
						
						
					 | 
					
						2021-06-18 11:28:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						c8297b2230
					 | 
					
						
						
							
							fix conflict when merging _77_address_household into master
						
						
						
						
						
						
					 | 
					
						2021-06-17 16:59:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						8406c30c8e
					 | 
					
						
						
							
							person: Person FormType + edit twig
						
						
						
						
						
						
					 | 
					
						2021-06-17 12:27:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						951160982d
					 | 
					
						
						
							
							person: add more fields on Person + migration
						
						
						
						
						
						
					 | 
					
						2021-06-17 10:43:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						06daf35e96
					 | 
					
						
						
							
							addresses: edit address for person
						
						
						
						
						
						
					 | 
					
						2021-06-16 14:39:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c40019da8f
					 | 
					
						
						
							
							add alert for not-in-household and actions in page
						
						
						
						
						
						
						
						accompanyingCourse/summary
* alert for people not in household for each accompanying course;
* style for action in alert
* form to members editor 
						
						
					 | 
					
						2021-06-14 11:34:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						f3a7556bca
					 | 
					
						
						
							
							household address: update twig for household address
						
						
						
						
						
						
					 | 
					
						2021-06-11 15:44:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						30668ca67f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into features/household-members-list
						
						
						
						
						
						
					 | 
					
						2021-06-10 10:29:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c126f680ae
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into features/activity-form
						
						
						
						
						
						
					 | 
					
						2021-06-08 17:24:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						76d945f2a7
					 | 
					
						
						
							
							household address: address history : add button
						
						
						
						
						
						
					 | 
					
						2021-06-08 11:51:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eeffa3191e
					 | 
					
						
						
							
							page list members of an household: born date + collpse old members
						
						
						
						
						
						
					 | 
					
						2021-06-07 15:14:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						160c7f2c31
					 | 
					
						
						
							
							Adding fr translation for social issues
						
						
						
						
						
						
					 | 
					
						2021-06-04 15:47:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nobohan
							
						 
					 | 
					
						
						
							
						
						0ce814cf52
					 | 
					
						
						
							
							hotfix: delete duplicate key in ChillPersonBundle messages translation
						
						
						
						
						
						
					 | 
					
						2021-06-04 09:34:36 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1410213258
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into fix-person-tests
						
						
						
						
						
						
					 | 
					
						2021-05-31 21:17:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						df00ac66f5
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into fix-person-tests
						
						
						
						
						
						
					 | 
					
						2021-05-26 22:44:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						acbe93f9cf
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dune-risky' into fix-person-tests
						
						
						
						
						
						
					 | 
					
						2021-05-26 21:57:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6c8f1f77ff
					 | 
					
						
						
							
							improve flex-table and flex-box
						
						
						
						
						
						
					 | 
					
						2021-05-26 18:03:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						37996651c4
					 | 
					
						
						
							
							Search list with periods, html/scss refactoring
						
						
						
						
						
						
					 | 
					
						2021-05-26 00:09:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6264171c0c
					 | 
					
						
						
							
							Merge branch 'period-in-list-result' into 59_parcours_resu_2
						
						
						
						
						
						
					 | 
					
						2021-05-25 22:00:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ae113c872
					 | 
					
						
						
							
							person search rendering more reponsive
						
						
						
						
						
						
					 | 
					
						2021-05-20 19:20:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9f1f7ad3f7
					 | 
					
						
						
							
							skeleton for page "index accompanying course"
						
						
						
						
						
						
					 | 
					
						2021-05-19 22:36:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9b7a52064a
					 | 
					
						
						
							
							page 'create a course' for draft accompanying course
						
						
						
						
						
						
					 | 
					
						2021-05-19 22:15:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						faad3f5f47
					 | 
					
						
						
							
							add menu for creating an accompanying period
						
						
						
						
						
						
					 | 
					
						2021-05-19 21:48:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ea477a9842
					 | 
					
						
						
							
							add accompanying period opening/closing to global timeline
						
						
						
						
						
						
					 | 
					
						2021-05-17 13:24:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f02e33fda7
					 | 
					
						
						
							
							first impl for api
						
						
						
						
						
						
					 | 
					
						2021-05-05 20:33:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						16b155d449
					 | 
					
						
						
							
							init new AccompanyingCourse (parcours) section
						
						
						
						
						
						
					 | 
					
						2021-04-15 17:04:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8a83e8ed22
					 | 
					
						
						
							
							Merge branch '_8_entity_parcours' into 'master'
						
						
						
						
						
						
						
						WIP issue8 : entity parcours
See merge request Chill-Projet/chill-bundles!8 
						
						
					 | 
					
						2021-04-13 20:48:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aa05223a4e
					 | 
					
						
						
							
							fix translation
						
						
						
						
						
						
					 | 
					
						2021-04-02 19:22:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jean-Francois Monfort
							
						 
					 | 
					
						
						
							
						
						27c680bb03
					 | 
					
						
						
							
							Features/new phones
						
						
						
						
						
						
					 | 
					
						2021-04-02 12:11:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03ef68dc36
					 | 
					
						
						
							
							improve duplicate ux
						
						
						
						
						
						
					 | 
					
						2021-03-21 14:40:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a86feafa53
					 | 
					
						
						
							
							improve duplicates templates
						
						
						
						
						
						
					 | 
					
						2021-03-21 14:38:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aa40716898
					 | 
					
						
						
							
							design UX for duplicate person feature
						
						
						
						
						
						
					 | 
					
						2021-03-21 14:36:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3bcb5fb3dd
					 | 
					
						
						
							
							New screen to find duplicate person manually
						
						
						
						
						
						
						
						Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop> 
						
						
					 | 
					
						2021-03-21 14:19:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0149457fba
					 | 
					
						
						
							
							Duplicate module
						
						
						
						
						
						
						
						Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop> 
						
						
					 | 
					
						2021-03-21 14:08:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						728ea73bdf
					 | 
					
						
						
							
							List duplicate persons
						
						
						
						
						
						
						
						Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Signed-off-by: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop> 
						
						
					 | 
					
						2021-03-21 14:03:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eaa0ad925f
					 | 
					
						
						
							
							fix folder name
						
						
						
						
						
						
					 | 
					
						2021-03-18 13:37:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |