| 
						
					 | 
					
						
						
							
						
						9387d37746
					 | 
					
						
						
							
							Resolve merge conflict
						
						
						
						
						
						
					 | 
					
						2021-12-09 13:49:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						24a404964b
					 | 
					
						
						
							
							docgen normalization for relation
						
						
						
						
						
						
					 | 
					
						2021-12-09 12:44:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						534a8bb3af
					 | 
					
						
						
							
							Using thirdparty renderbox to display intervening thirdparties
						
						
						
						
						
						
					 | 
					
						2021-12-09 12:35:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21e3da0266
					 | 
					
						
						
							
							minor adjustment to allow for action title banner with correct colors
						
						
						
						
						
						
					 | 
					
						2021-12-09 12:34:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						85a1fcca18
					 | 
					
						
						
							
							fix after rebase
						
						
						
						
						
						
					 | 
					
						2021-12-09 11:49:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						793f5116ab
					 | 
					
						
						
							
							first commit
						
						
						
						
						
						
					 | 
					
						2021-12-09 11:39:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						10f276e48c
					 | 
					
						
						
							
							list-suggest add-items hover effect
						
						
						
						
						
						
					 | 
					
						2021-12-09 11:18:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8a4748dc2d
					 | 
					
						
						
							
							position of toast changed to bottom-right
						
						
						
						
						
						
					 | 
					
						2021-12-09 10:38:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f5ae5443ab
					 | 
					
						
						
							
							badge-entity: mask 'tiers' when displayLong (??)
						
						
						
						
						
						
					 | 
					
						2021-12-09 09:40:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9272687ec4
					 | 
					
						
						
							
							adapt in twig thirdparty renderbox
						
						
						
						
						
						
					 | 
					
						2021-12-08 17:45:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6100176c9f
					 | 
					
						
						
							
							try badgeEntity with displayLong option
						
						
						
						
						
						
					 | 
					
						2021-12-08 17:29:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						56ab304af1
					 | 
					
						
						
							
							try badge with hover
						
						
						
						
						
						
					 | 
					
						2021-12-08 16:12:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						70ab232149
					 | 
					
						
						
							
							improve docgen, trnslations, admin
						
						
						
						
						
						
					 | 
					
						2021-12-08 13:58:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						027c01fc58
					 | 
					
						
						
							
							fix css block
						
						
						
						
						
						
					 | 
					
						2021-12-08 12:23:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b888211ef9
					 | 
					
						
						
							
							proposition for person/thirparty rounded-pill badge appearance
						
						
						
						
						
						
					 | 
					
						2021-12-08 12:19:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0617014e91
					 | 
					
						
						
							
							some small style improvements in thirdparty section
						
						
						
						
						
						
					 | 
					
						2021-12-08 12:19:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce171ec747
					 | 
					
						
						
							
							household-members-editor: lightly improve ux (TO CHECK)
						
						
						
						
						
						
					 | 
					
						2021-12-08 12:19:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fdc5127c74
					 | 
					
						
						
							
							fix some error in test (wip)
						
						
						
						
						
						
					 | 
					
						2021-12-08 11:57:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fa5001265f
					 | 
					
						
						
							
							fixes on tests
						
						
						
						
						
						
					 | 
					
						2021-12-08 10:56:39 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b8d48f04ae
					 | 
					
						
						
							
							fix tests (wip)
						
						
						
						
						
						
					 | 
					
						2021-12-08 11:47:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f1b1771d6b
					 | 
					
						
						
							
							fix tests (wip)
						
						
						
						
						
						
					 | 
					
						2021-12-08 11:35:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						62dabbe1e7
					 | 
					
						
						
							
							fix code style
						
						
						
						
						
						
					 | 
					
						2021-12-08 11:14:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4101392190
					 | 
					
						
						
							
							fix tests and type hinting
						
						
						
						
						
						
					 | 
					
						2021-12-08 11:13:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3f1bed0b1c
					 | 
					
						
						
							
							fix tests (wip)
						
						
						
						
						
						
					 | 
					
						2021-12-08 11:05:41 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						79fbdcdee4
					 | 
					
						
						
							
							type hint User class
						
						
						
						
						
						
					 | 
					
						2021-12-08 11:05:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						32178e22fe
					 | 
					
						
						
							
							fix tests (wip)
						
						
						
						
						
						
					 | 
					
						2021-12-08 10:51:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d8011da61
					 | 
					
						
						
							
							fix loading origin
						
						
						
						
						
						
					 | 
					
						2021-12-08 10:06:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						789eeadb40
					 | 
					
						
						
							
							fix loading fixtures for doc generator template
						
						
						
						
						
						
					 | 
					
						2021-12-08 09:52:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f206fdb08c
					 | 
					
						
						
							
							fix code style
						
						
						
						
						
						
					 | 
					
						2021-12-08 09:52:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d5409d8d9
					 | 
					
						
						
							
							fix casting
						
						
						
						
						
						
					 | 
					
						2021-12-08 09:52:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e297d82533
					 | 
					
						
						
							
							fixes on tests [WIP]
						
						
						
						
						
						
					 | 
					
						2021-12-08 09:26:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						56dd825f39
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2021-12-07 18:23:13 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4e4add3cc1
					 | 
					
						
						
							
							check for ancestors when validating the presence of accompanying
						
						
						
						
						
						
						
						period's social issues 
						
						
					 | 
					
						2021-12-07 18:17:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								juminet
							
						 
					 | 
					
						
						
							
						
						b683630136
					 | 
					
						
						
							
							accompanying period validation - on social issues suppression
						
						
						
						
						
						
					 | 
					
						2021-12-07 17:16:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6c60e66fc
					 | 
					
						
						
							
							fix validator for taking ancestors into account
						
						
						
						
						
						
					 | 
					
						2021-12-07 18:05:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b1b9acc686
					 | 
					
						
						
							
							Merge branch 'bugfix/activity-fix-location-visibility' into issue279_accompanying_period_validation
						
						
						
						
						
						
					 | 
					
						2021-12-07 17:57:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f6408af543
					 | 
					
						
						
							
							Merge branch 'master' into issue279_accompanying_period_validation
						
						
						
						
						
						
					 | 
					
						2021-12-07 17:55:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aa68ae0b25
					 | 
					
						
						
							
							[ActivityType] remove placeLabel/visible, replace by
						
						
						
						
						
						
						
						locationLabel/visible 
						
						
					 | 
					
						2021-12-07 16:38:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ebd817f61e
					 | 
					
						
						
							
							fix cs
						
						
						
						
						
						
					 | 
					
						2021-12-06 17:27:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						25147704ad
					 | 
					
						
						
							
							fix uppercase in person form with strict types
						
						
						
						
						
						
					 | 
					
						2021-12-06 17:24:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2788149db4
					 | 
					
						
						
							
							fix error when using twilio format
						
						
						
						
						
						
					 | 
					
						2021-12-06 17:24:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fabe32371f
					 | 
					
						
						
							
							fix menu doc generator
						
						
						
						
						
						
					 | 
					
						2021-12-06 17:19:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b120e47786
					 | 
					
						
						
							
							add translations
						
						
						
						
						
						
					 | 
					
						2021-12-06 16:17:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5a61f05faa
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into features/docgen-widget-generate-template
						
						
						
						
						
						
					 | 
					
						2021-12-06 15:46:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2d1e8b2acd
					 | 
					
						
						
							
							Cohérence graphique des listes d'activités et d'actions dans le contexte d'un parcours
						
						
						
						
						
						
					 | 
					
						2021-12-06 14:45:44 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						afb7d4a160
					 | 
					
						
						
							
							try to fix [wip]
						
						
						
						
						
						
					 | 
					
						2021-12-06 15:37:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						96e5e4a7b2
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into issue279_accompanying_period_validation
						
						
						
						
						
						
					 | 
					
						2021-12-06 15:08:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						07f53e6758
					 | 
					
						
						
							
							titulaire field removed from household edit form
						
						
						
						
						
						
					 | 
					
						2021-12-06 14:07:21 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bbc5e94033
					 | 
					
						
						
							
							306 fix visgraph issues
						
						
						
						
						
						
					 | 
					
						2021-12-06 14:01:50 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f10d762e59
					 | 
					
						
						
							
							Eventlistener to create accompanyingPeriodWork
						
						
						
						
						
						
					 | 
					
						2021-12-06 13:57:10 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |