3271 Commits

Author SHA1 Message Date
5f8be9e0c0 Merge remote-tracking branch 'origin/stable' 2019-01-11 13:28:06 +01:00
a316604fe1 Merge remote-tracking branch 'origin/master' 2019-01-11 13:26:53 +01:00
4c7673f3fd fix bug when extracting activities without filter / aggregators
introducing persons
2019-01-11 12:33:05 +01:00
3e786f2e18 Add aggregator by user for activities 2019-01-11 12:30:57 +01:00
e1b5ec49f5 font-awesome pictos are now managed in css 2019-01-10 15:52:19 +01:00
7b8f2d1206 add time to field date, prepare and run migration script 2019-01-10 15:31:40 +01:00
d123e4137f fix event_participation depreciations 2018-12-20 16:41:25 +01:00
bc30998164 fix edit events depreciations 2018-12-20 15:55:17 +01:00
403d1749e3 fix admin_event_role depreciations 2018-12-20 12:50:54 +01:00
7de5cf03b6 fix admin_eventtype depreciations 2018-12-20 12:40:12 +01:00
cf93fc10fd fix admin_event_status depreciations 2018-12-20 12:38:42 +01:00
9f168a3a3c fix new events page depreciations 2018-12-20 11:36:39 +01:00
49aeb075a4 fix fatal errors 2018-12-20 11:25:46 +01:00
d85a661253 prepare composer.json before migrate to symfony 3 2018-12-19 14:54:35 +01:00
2f12020ba7 Merge branch 'master' of https://framagit.org/Chill-project/Chill-Main 2018-12-18 17:49:09 +01:00
472eda01e4 add sass/scratch.scss and associated sass files 2018-12-18 17:46:30 +01:00
e31560f622 edit yarn grunt/bower config during chill installation 2018-12-18 17:41:37 +01:00
b2add2539c fix: error on warning interval was not shown 2018-11-21 14:25:44 +01:00
407effed39 merge branch master & adapt changelog 2018-11-21 12:27:12 +01:00
c7125f0866 layout of the task list 2018-11-21 12:26:11 +01:00
176ca90e39 fix error: the "see more" link was not showed 2018-11-20 21:38:03 +01:00
Mat
14ee8cad19 Merge branch 'master' into similarity 2018-11-15 10:29:28 +01:00
Mat
30a6baef24 hide advanced search button below similarity search results 2018-11-15 10:27:57 +01:00
5591a9cfcc bump to version 1.5.2 2018-11-13 21:56:33 +01:00
f4331f1756 bump changelog for 1.5.4 2018-11-13 21:54:27 +01:00
d1083e97cb adding indexes 2018-11-13 21:53:28 +01:00
1ecc13f8ca bump changelog from !9 2018-11-13 12:59:10 +01:00
5841016d50 Merge branch 'similarity' 2018-11-13 12:58:19 +01:00
6cd966d876 adding changelog 2018-11-13 12:55:24 +01:00
d2fb6e9300 Merge branch 'master' into HEAD 2018-11-13 12:36:16 +01:00
Mat
d118f60dc3 similaritySearch works, without duplicate personSearch results 2018-11-13 11:04:03 +01:00
Mat
387d3b53c1 wip.. dump() give a correct result, but have error !! 2018-11-08 16:17:11 +01:00
Mat
ecf3f541ef wip.. inject personSearch results in similaritySearch to avoid duplicates results
error message :
---------------
[Semantical Error] line 0, col 13 near 'p.id) FROM ChillPersonBundle:Person':
Error: 'p' is used outside the scope of its declaration.
2018-11-08 14:26:08 +01:00
f937e9d12c adding formatter for list in spreadsheet (ods, xlsx) 2018-11-07 13:23:11 +01:00
Mat
99ca79d86e do not display similar search results if null 2018-11-06 15:19:02 +01:00
Mat
7be2d408f9 add similarity results for persons search 2018-11-06 15:12:13 +01:00
Mat
9d8d330eb3 adapt personSearch query with fullnameCanonical 2018-11-06 15:10:57 +01:00
Mat
290a904991 add similarity test in search query when adding person 2018-10-30 14:28:05 +01:00
Mat
3599a94f94 Add fullnameCanonical column for trigram matching (fast searching) 2018-10-30 11:18:07 +01:00
c1b46b9cb0 add margin beyond buttons 2018-10-23 11:45:58 +02:00
Mat
9c51d673f0 add privacyEvent for edit and update singleTask 2018-10-23 10:42:23 +02:00
Mat
f0a0f46ff1 add privacyEvents for report edit and update 2018-10-23 10:31:20 +02:00
Mat
493cdca479 add PrivacyEvent for documents edit and update 2018-10-23 10:07:06 +02:00
Mat
e2cbd65775 Merge branch 'master' into privacyEvent 2018-10-23 09:56:49 +02:00
38c272f89e prepare changelog for 1.5.3 2018-10-19 14:35:26 +02:00
8bc1b5f769 prepare for 1.5.3 2018-10-19 14:33:56 +02:00
03ee738bee listen on collection events to allow usage of field on collection 2018-10-19 14:31:51 +02:00
0e84e8c5a2 update changelog to 1.5.4 2018-10-19 14:29:52 +02:00
015f776ac3 Merge branch 'master' into stable 2018-10-19 14:28:05 +02:00
62ee90f671 add repository for center 2018-10-19 14:27:46 +02:00