210 Commits

Author SHA1 Message Date
90d74c609e fix css classes in tests 2017-07-04 21:43:01 +02:00
4d884c2d3e remove tests for export 2017-07-04 21:32:36 +02:00
2145bd2be9 use downloaded phpunit 2017-06-22 23:06:07 +02:00
332bec6e83 fix gitlab tests 2017-06-22 23:05:19 +02:00
5a3f360822 allow dev packages but prefer stable 2017-04-19 21:50:32 +02:00
07b2a0994d allow hierarchy in roles 2017-04-19 21:50:23 +02:00
cf823ef45b remove memory_limit during the installation of deps 2016-12-19 12:01:22 +01:00
12cef8609f publishing doc to public api 2016-12-14 16:13:13 +01:00
7d19b4d8b7 improve layout of list when no report 2016-12-09 18:19:17 +01:00
8ebacb22ac adding step to deploy to packagist 2016-11-20 22:39:00 +01:00
b396826d8e removing testdox for a better understanding of failure message 2016-11-17 21:59:12 +01:00
Marc Ducobu
c522659f4e Improving the timeline UI 2016-05-06 16:37:33 +02:00
dc3a078923 Merge remote-tracking branch 'framagit/master' 2016-02-25 20:06:04 +01:00
0a4b875055 upgrade dependency on doctrine-migration-bundle to ~1.1 2016-02-23 15:30:43 +01:00
e6cacb8554 fix tranlsation in tests 2016-01-20 17:42:34 +01:00
e939a809b1 fix show empty values in timeline 2016-01-05 13:15:35 +01:00
b672074823 improve report view 2015-12-18 01:45:25 +01:00
ef718fe93a adapt text language in test 2015-12-16 13:19:00 +01:00
ec838755e1 set scope to the up of the form in report edit 2015-12-14 23:06:33 +01:00
f2cdaaa1a3 fix order in report form 2015-12-14 23:04:22 +01:00
2c89aa4812 improve ACL on report creation + various UI improvements
- show button to update report only to users with correct permissions;
- show new page only to users with correct permissions ;
- rename scope => circle in column, + translations
2015-12-14 22:55:13 +01:00
119b3c0bc1 change config to switch to symfony 2.8 2015-12-14 22:21:18 +01:00
be50a0bcd7 Merge branch 'fix_#3' into 'master'
minimal improvement

refs Chill-project/Chill-Report#3

See merge request !1
2015-12-10 15:49:55 +01:00
Marc Ducobu
49339d78fa Amelioration UI 2015-12-04 19:39:47 +01:00
e9ef6718a0 minimal improvement
ref Chill-project/Chill-Report#3
2015-12-01 22:20:29 +01:00
Marc Ducobu
58cd4be383 debug flash danger -> error 2015-10-30 17:12:19 +01:00
Marc Ducobu
301f35893c Removing travis config files 2015-10-30 16:05:00 +01:00
Marc Ducobu
ff16ed9b2c Adding refs to the doc & removeing refs to travis in README 2015-10-30 16:04:29 +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
Marc Ducobu
426849f169 Only display custom fields that are active 2015-09-30 14:56:06 +02:00
6acba49f38 translation in messages
refs #573 0h05
2015-09-20 21:50:10 +02:00
6b3b176849 Merge add_ui_permission into master
+ set deps to chill-project/main dev-master

Squashed commit of the following:

commit c120c9347606358daec042b0e1e3da83cc260f12
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Sep 14 00:50:50 2015 +0200

    switch to role declaration in code

commit 7fba35356ea9266c43a6f104290103071e1c1755
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Aug 31 23:57:59 2015 +0200

    declare role in chill.available_roles parameter
2015-09-20 21:47:52 +02:00
Marc Ducobu
f301dbdd17 Correction of tests 2015-08-26 15:04:12 +02:00
Marc Ducobu
02a48c32c1 Adding colors for table header of Report/list 2015-08-26 13:36:04 +02:00
Marc Ducobu
1f58e60c09 Refactoring LoadReports : removing useless line return 2015-07-06 00:31:30 +02:00
ea1d8d04af add a default behaviour on adding scope column
To ensure backward-compatibility, add a default scope during schema modification, if reports are already present in database.
2015-06-30 15:46:46 +02:00
03f1243cf7 set composer.json to master branches 2015-06-30 14:34:55 +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
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
17b8c69bca fix tests + test about report ACL 2015-06-27 02:03:09 +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