|  | 7ce86ab15f | use github token for auth | 2015-10-26 22:26:41 +01:00 |  | 
			
				
					|  | d21595d306 | add gitlab-ci to project Squashed commit of the following:
commit 7baa7bddc3Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 26 21:13:47 2015 +0100
    fix auth and database url
commitc47ad68586Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 26 20:59:33 2015 +0100
    add gitlab-ci | 2015-10-26 22:01:57 +01:00 |  | 
			
				
					|  | 8a7503ce38 | add gitlab ci Squashed commit of the following:
commit ff63a334213c4965e06d33aedb72a03cb79fcc57
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 26 21:19:57 2015 +0100
    add gitlab-ci files | 2015-10-26 21:57:49 +01:00 |  | 
			
				
					|  | 7baa7bddc3 | fix auth and database url | 2015-10-26 21:13:47 +01:00 |  | 
			
				
					|  | c47ad68586 | add gitlab-ci | 2015-10-26 20:59:33 +01:00 |  | 
			
				
					|  | 8e75f0b4ac | adding gitlab-ci to project Squashed commit of the following:
commit 7de95e8e1e829f2ebeeb0bcea750e9fd2cdfa4b4
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 19 23:40:01 2015 +0200
    adapting config for build
commit c554816956ee1d0f0144824392a5f5984b389d1a
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 19 22:42:39 2015 +0200
    add gitlab-ci to project | 2015-10-26 20:46:59 +01:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 69a970cd14 | Improving the templates refs closed #628 #627 | 2015-10-23 13:21:52 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 4e4c1a8f68 | Debug doctrine migration down | 2015-10-23 12:04:11 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | f068ac288f | Debug JS - close refs #626 | 2015-10-22 15:09:43 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 6af61f71dc | Refactoring   Resources/views/CustomFieldsRendering/choice.html.twig : indentation | 2015-10-22 15:07:38 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | bfca9baaeb | Refactoring   Form/Type/ChoicesType.php : removing useless spaces | 2015-10-22 15:06:57 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 46bba56776 | Refacotring Form/Type/ChoicesListType.php : indenation | 2015-10-22 15:06:14 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 98088e5f7a | Refactoring  Form/CustomFieldType.php : indentation | 2015-10-22 15:05:02 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 23438926b1 | Refactoring CustomFields/CustomFieldChoice.php : indentation | 2015-10-22 15:02:49 +02:00 |  | 
			
				
					|  | 903c115aa2 | adding gitlab-ci Squashed commit of the following:
commit 5a7195e4beb496c641b9bdb13ade5cf864d59eff
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 19 22:15:15 2015 +0200
    correct files paths
commit 346ac3eaaf9e1da1915d08d525c7a488d75099af
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 19 22:13:12 2015 +0200
    correct paths
commit 8720941f9b0e8e381f24108b0f3357d89f2e9b44
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Oct 19 22:07:30 2015 +0200
    add gitlab-ci to project | 2015-10-19 22:36:35 +02:00 |  | 
			
				
					|  | aabcb85f37 | Merge branch 'test_gitlab_ci' Conflicts:
	.gitlab-ci.yml | 2015-10-19 00:09:19 +02:00 |  | 
			
				
					|  | 65d32de3ce | Merge branch 'master' of git.framasoft.org:Chill-project/Main Conflicts:
	.gitlab-ci.yml | 2015-10-17 00:42:49 +02:00 |  | 
			
				
					|  | 6caf89383e | Merging update from framagit (creating gitlab-ci) Conflicts:
	.gitlab-ci.yml | 2015-10-17 00:38:41 +02:00 |  | 
			
				
					|  | df2755a84d | adding gitlab-ci to repo | 2015-10-17 00:35:55 +02:00 |  | 
			
				
					|  | 675896b5df | fix phpunit command and github token | 2015-10-17 00:26:40 +02:00 |  | 
			
				
					|  | 45ad577e8b | adding auth to composer on build and add php-7 | 2015-10-17 00:15:46 +02:00 |  | 
			
				
					|  | ce5d09e79d | try another host | 2015-10-16 23:47:36 +02:00 |  | 
			
				
					|  | 7da0d9373e | add a parameter file for CI | 2015-10-16 23:34:46 +02:00 |  | 
			
				
					|  | 6eefd24ea4 | try to start gitlab | 2015-10-16 23:24:28 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 18a6c0ec10 | Menu on right | 2015-10-14 14:49:42 +02:00 |  | 
			
				
					|  | 53683cfd5f | add button messages to users refs #633 | 2015-10-12 22:00:06 +02:00 |  | 
			
				
					|  | ad8fe8c147 | throw an error on 404 | 2015-10-12 21:43:57 +02:00 |  | 
			
				
					|  | 772499ce89 | set correct layout to accompanying period crud | 2015-10-12 21:31:01 +02:00 |  | 
			
				
					|  | 4e00af3e48 | moving the memory_limit to phpunit.xml config file | 2015-10-12 21:30:31 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 06c15fdc34 | Adding info for macos & docker | 2015-10-09 15:17:37 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | a88e8cb6f7 | By convention store custom fields data in the parameter cFData -- close #639 | 2015-10-09 14:48:32 +02:00 |  | 
			
				
					|  | fee5b00e35 | use random activityType, activityReason, scope in test | 2015-10-08 22:36:08 +02:00 |  | 
			
				
					|  | e79ca23f2c | add test for complete activity crud (without errors) + fix some errors in controller (discovered with tests) | 2015-10-08 18:24:49 +02:00 |  | 
			
				
					|  | fa5da95bf1 | first impl on test on TranslatableActivityReasonType Currently skipped due to the amount of work required and the expectance
refs #651 | 2015-10-08 17:22:57 +02:00 |  | 
			
				
					|  | 2e1153d42b | add parameters for gitlab-ci | 2015-10-08 15:43:26 +02:00 |  | 
			
				
					|  | 8eccbea522 | fix address for storing doctrineMigrationsFile into correct directory for tests | 2015-10-08 15:42:11 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 4ede0e3db8 | Css class (bt-update, bt-create, bt-delete) for buttons - close #633 | 2015-10-06 12:22:10 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 51acda2d46 | Position relative for the header - close #634 | 2015-10-05 21:34:22 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 1274d1ff6d | Update of select2 | 2015-10-05 21:33:13 +02:00 |  | 
			
				
					|  | 8e9dfaac7f | try to fix docker image | 2015-10-03 01:19:41 +02:00 |  | 
			
				
					|  | 5d1efa13ea | install git on image | 2015-10-03 01:12:48 +02:00 |  | 
			
				
					|  | 22afd3b3fa | fix bug in redirection to admin index | 2015-10-02 23:47:39 +02:00 |  | 
			
				
					|  | 795c1a74ed | layout and clean activity type CRUD | 2015-10-02 23:47:39 +02:00 |  | 
			
				
					|  | 216d0c55be | remove delete actions & form in controller | 2015-10-02 23:47:39 +02:00 |  | 
			
				
					|  | bebee4fbeb | layout and clean activity reason crud | 2015-10-02 23:47:39 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 0bee5e46db | Only active reason are displayed in the activity encoding form | 2015-10-02 15:16:37 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | 4ef4a64ea6 | Template for ActivityReasonCategory with translation + better looking - refs #622 | 2015-10-02 14:55:58 +02:00 |  | 
			
				
					| 
							
							
								 Marc Ducobu | e8f8c8e52d | Admin form : only display active ActivityReasonCategory in the ActivityReason form | 2015-10-02 14:41:52 +02:00 |  | 
			
				
					|  | 799cd6132b | fix postgres version | 2015-10-01 21:28:45 +02:00 |  | 
			
				
					|  | 083cf35de2 | Fix gitlab-ci | 2015-10-01 21:13:40 +02:00 |  |