Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						d6f9402128
					 | 
					
						
						
							
							Navigation search improvement
						
						
						
						
						
						
					 | 
					
						2015-06-30 10:54:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						baa9262962
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into add_acl
						
						
						
						
						
						
						
						in order to merge add_acl into master
Conflicts:
	Controller/ReportController.php
	Entity/Report.php 
						
						
					 | 
					
						2015-06-30 09:55:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a16a097550
					 | 
					
						
						
							
							add acl on report search
						
						
						
						
						
						
					 | 
					
						2015-06-30 00:19:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f14255c0fc
					 | 
					
						
						
							
							add scope to search results
						
						
						
						
						
						
					 | 
					
						2015-06-29 23:42:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						acb3e8bc3d
					 | 
					
						
						
							
							add acl on timeline report
						
						
						
						
						
						
					 | 
					
						2015-06-29 23:38:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						4fc2d1d0a0
					 | 
					
						
						
							
							Design of the user menu
						
						
						
						
						
						
					 | 
					
						2015-06-29 14:29:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c04416fd5
					 | 
					
						
						
							
							add Scope to report's fixture²
						
						
						
						
						
						
					 | 
					
						2015-06-28 11:37:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4947db1c7f
					 | 
					
						
						
							
							fix username in test timeline
						
						
						
						
						
						
					 | 
					
						2015-06-28 11:24:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Julien Fastré
							
						 
					 | 
					
						
						
							
						
						0be232e202
					 | 
					
						
						
							
							Merge pull request #1 from jphuart/master
						
						
						
						
						
						
						
						Revision of installation steps using docker database 
						
						
					 | 
					
						2015-06-28 01:16:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						799b612a72
					 | 
					
						
						
							
							add access control model documentation
						
						
						
						
						
						
					 | 
					
						2015-06-28 01:14:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						17b8c69bca
					 | 
					
						
						
							
							fix tests + test about report ACL
						
						
						
						
						
						
					 | 
					
						2015-06-27 02:03:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jean Pierre Huart
							
						 
					 | 
					
						
						
							
						
						4408eea3b3
					 | 
					
						
						
							
							Changes to optional css install
						
						
						
						
						
						
					 | 
					
						2015-06-26 18:13:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jean Pierre Huart
							
						 
					 | 
					
						
						
							
						
						1f11924be3
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'
						
						
						
						
						
						
						
						syncing for the first time 
						
						
					 | 
					
						2015-06-26 18:08:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jean Pierre Huart
							
						 
					 | 
					
						
						
							
						
						2b0872ab7d
					 | 
					
						
						
							
							Update installation.rst
						
						
						
						
						
						
						
						Details to be deleted 
						
						
					 | 
					
						2015-06-26 17:30:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jean Pierre Huart
							
						 
					 | 
					
						
						
							
						
						859e115de7
					 | 
					
						
						
							
							Update installation.rst
						
						
						
						
						
						
					 | 
					
						2015-06-26 17:28:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c10445c8a4
					 | 
					
						
						
							
							allow report edit w/ scope + add deny statements
						
						
						
						
						
						
						
						[ci skip] 
						
						
					 | 
					
						2015-06-25 22:42:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8445e81d44
					 | 
					
						
						
							
							refactor: move scope field to trait
						
						
						
						
						
						
						
						[ci skip] as we know tests are failing 
						
						
					 | 
					
						2015-06-24 22:32:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7cf41d9c9d
					 | 
					
						
						
							
							add newline (\n) at the end of file
						
						
						
						
						
						
					 | 
					
						2015-06-24 00:30:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a6dee763f
					 | 
					
						
						
							
							remove unused use statement
						
						
						
						
						
						
					 | 
					
						2015-06-24 00:18:35 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b264ceeaa8
					 | 
					
						
						
							
							improve php syntax
						
						
						
						
						
						
					 | 
					
						2015-06-24 00:17:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						adf1a5eb2c
					 | 
					
						
						
							
							fix syntax in Report class
						
						
						
						
						
						
					 | 
					
						2015-06-24 00:15:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ec70067429
					 | 
					
						
						
							
							add scope to form "new" report
						
						
						
						
						
						
						
						[ci skip] 
						
						
					 | 
					
						2015-06-24 00:01:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a938ce5090
					 | 
					
						
						
							
							add report ACL fixtures
						
						
						
						
						
						
					 | 
					
						2015-06-24 00:00:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c75ba202b4
					 | 
					
						
						
							
							add scope type to report [transfer]
						
						
						
						
						
						
						
						[ci skip] 
						
						
					 | 
					
						2015-06-23 21:36:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d2b3f2a61
					 | 
					
						
						
							
							add report voter + tests
						
						
						
						
						
						
					 | 
					
						2015-06-22 23:47:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b7a17af682
					 | 
					
						
						
							
							git status add role hierarchy
						
						
						
						
						
						
					 | 
					
						2015-06-22 23:46:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						eb066b86aa
					 | 
					
						
						
							
							add foreign key from report to scope
						
						
						
						
						
						
					 | 
					
						2015-06-22 23:45:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1c3c3b14ab
					 | 
					
						
						
							
							mark some tests as skipped
						
						
						
						
						
						
						
						Some tests raise an error which seems being a bug into symfony. Mark
test as skipped before further inquery. 
						
						
					 | 
					
						2015-06-22 22:38:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						efa2f001c7
					 | 
					
						
						
							
							add person.center to timeline tests
						
						
						
						
						
						
					 | 
					
						2015-06-19 22:36:00 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						fb15bd336c
					 | 
					
						
						
							
							Form style
						
						
						
						
						
						
					 | 
					
						2015-06-16 15:26:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						d3d572567e
					 | 
					
						
						
							
							Debug 1193
						
						
						
						
						
						
					 | 
					
						2015-06-16 15:06:37 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						cbfe447d8b
					 | 
					
						
						
							
							nav bar
						
						
						
						
						
						
					 | 
					
						2015-06-16 15:05:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						489fad38a6
					 | 
					
						
						
							
							Navigtion background
						
						
						
						
						
						
					 | 
					
						2015-06-16 14:00:59 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						113babe06d
					 | 
					
						
						
							
							First version
						
						
						
						
						
						
					 | 
					
						2015-06-16 13:43:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Julien Fastré
							
						 
					 | 
					
						
						
							
						
						11324cb834
					 | 
					
						
						
							
							update homepage link in composer.json
						
						
						
						
						
						
						
						fix #1 
						
						
					 | 
					
						2015-06-09 11:34:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						f60727fc5e
					 | 
					
						
						
							
							MAJ Scratch + custom colors
						
						
						
						
						
						
					 | 
					
						2015-06-08 15:32:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						2518f13e7c
					 | 
					
						
						
							
							Readding _custom.scss & _timeline.scss files
						
						
						
						
						
						
					 | 
					
						2015-06-08 14:15:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						323747dcf7
					 | 
					
						
						
							
							Adding custom sass into the git
						
						
						
						
						
						
					 | 
					
						2015-06-08 14:09:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						e7ceb805c6
					 | 
					
						
						
							
							Adding information about building the .css files - 2
						
						
						
						
						
						
					 | 
					
						2015-06-08 10:08:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						7ae12df918
					 | 
					
						
						
							
							Adding information about building the .css files
						
						
						
						
						
						
					 | 
					
						2015-06-08 10:04:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						064ccfba3f
					 | 
					
						
						
							
							adapt loadReport to new user refs
						
						
						
						
						
						
					 | 
					
						2015-06-08 00:31:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3d7069011d
					 | 
					
						
						
							
							remove deprecation warning from phpunit
						
						
						
						
						
						
					 | 
					
						2015-06-05 12:58:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						39197d2ae6
					 | 
					
						
						
							
							fix deprecation of pattern in routing
						
						
						
						
						
						
						
						pattern => path in routing 
						
						
					 | 
					
						2015-06-05 11:42:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6ac7482389
					 | 
					
						
						
							
							switch to symfony 2.7 [ci skip]
						
						
						
						
						
						
					 | 
					
						2015-06-05 10:59:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						66c33f7feb
					 | 
					
						
						
							
							remove php/sension extensions if building on rtd
						
						
						
						
						
						
					 | 
					
						2015-05-01 23:10:04 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dad59e3b04
					 | 
					
						
						
							
							add docker postgresql image in installation part
						
						
						
						
						
						
					 | 
					
						2015-05-01 22:59:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						9f253b6862
					 | 
					
						
						
							
							Adding build js & css
						
						
						
						
						
						
					 | 
					
						2015-04-09 18:34:32 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						266b4163a0
					 | 
					
						
						
							
							Debug : do not remove chill.js by grunt
						
						
						
						
						
						
					 | 
					
						2015-04-09 16:56:58 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						b231b14605
					 | 
					
						
						
							
							adding test for bug #478 - refs #478
						
						
						
						
						
						
					 | 
					
						2015-04-08 17:56:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marc Ducobu
							
						 
					 | 
					
						
						
							
						
						9be5757623
					 | 
					
						
						
							
							Solving bug #478 - cFData is null and not contains an empty array  - refs #478
						
						
						
						
						
						
					 | 
					
						2015-04-08 16:48:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |