3270 Commits

Author SHA1 Message Date
144a5ee12e merge master and switch to version 1.5.1 2018-10-19 14:22:37 +02:00
7547f99063 Merge branch 'master' into bugFix 2018-10-19 14:20:02 +02:00
a2cc59a399 Merge branch 'bugFix' of framagit.org:Chill-project/Chill-Person into bugFix 2018-10-19 14:18:45 +02:00
76c9773508 handle multiple person in privacy logs 2018-10-19 14:18:32 +02:00
c392fad540 handle multiple person in privacy logs 2018-10-19 14:17:49 +02:00
Mat
d9148791bd fixBug, update changelog 2018-10-19 13:51:27 +02:00
Mat
508e8ae7fb privacyEvent, update changelog 2018-10-19 13:42:29 +02:00
Mat
d8a77b5fdf Merge branch 'master' into privacyEvent 2018-10-19 13:39:21 +02:00
Mat
a3a4d31f8b privacyEvent, update changelog 2018-10-19 13:36:21 +02:00
Mat
c1da0f712c privacyEvent, update changelog 2018-10-19 13:29:37 +02:00
c00233331b Merge branch 'master' into privacyEvent 2018-10-19 12:43:50 +02:00
adee1b67a2 add changelog for privacy events 2018-10-19 12:42:28 +02:00
5eff3f33d8 fix action description in privacy events logs 2018-10-19 12:40:12 +02:00
b6ab04f3e3 add privacy event to edit, update actions 2018-10-19 12:36:59 +02:00
Mat
943cd9f31e fix validation context and upgrade sf3
cfr commit 193460a9a649953c9222cccca7b64f14251de65e
2018-10-19 10:56:07 +02:00
Mat
7dfbe88ce6 fix sf3 depreciated addViolationAt() method
cfr vendor/symfony/symfony/UPGRADE-3.0.md:1719
2018-10-19 10:56:07 +02:00
42e33c020c Merge branch 'privacyEvent' into 'master'
Privacy event

See merge request Chill-project/Chill-Person!7
2018-10-18 21:59:11 +02:00
f7f678f0cb add persons only if not empty 2018-10-18 21:56:28 +02:00
4f78b8fb54 remove unused code and dum 2018-10-18 21:54:04 +02:00
fe45ce5447 add color to task status 2018-10-18 21:43:16 +02:00
fe5f63457b add a filtering of tasks by center 2018-10-18 20:51:49 +02:00
7c113e3478 add assignee in task list + fix some translation 2018-10-18 20:05:02 +02:00
c36778184d fix bug in listing users in form filtering tasks 2018-10-18 19:59:11 +02:00
25f5503030 Add overlaps date/time operator and similarity 2018-10-18 09:41:40 +02:00
Mat
13333ed54a privacyEvent, add event to activity list and show actions 2018-10-16 15:39:30 +02:00
Mat
43a2e4705f privacyEvent, add event on list and view actions 2018-10-16 15:39:04 +02:00
Mat
c9fddffd4b privacyEvent, add event to index and show Actions 2018-10-16 15:37:08 +02:00
Mat
32d5d448e0 privacyEvent, add event to show and list Actions 2018-10-16 15:28:59 +02:00
Mat
cdaf3af2d4 Merge branch 'master' into privacyEvent 2018-10-16 14:52:43 +02:00
Mat
6324eceb1b privacyEvent: remove element parameter 2018-10-16 14:47:19 +02:00
Mat
5f36a62379 privacyEvent, add event in accompanyingPeriod 2018-10-16 12:36:19 +02:00
Mat
4c8f170025 privacyEvent, add event in timeline 2018-10-16 12:03:54 +02:00
Mat
f5baeaa06c init PrivacyEvent logger service 2018-10-16 10:01:12 +02:00
2a9aff304a remove inexistant css file (person.css) 2018-10-08 22:07:47 +02:00
2ff30ae656 fix php typo 2018-10-08 21:27:10 +02:00
cf2408be1b improvement on import - person may have a null gender 2018-10-05 22:54:30 +02:00
6abf51be4b [export] layout of page "export list" 2018-10-05 11:45:46 +02:00
8847d31564 prepare for release 1.5.2 2018-10-05 11:22:58 +02:00
5959edb01a [export] add filter "filter activity by activity type" 2018-10-05 11:21:45 +02:00
fad1821c2f fix translation in exports / aggregator.
The activity type aggregator is shown.
2018-10-05 11:04:15 +02:00
80f41ac82f changelog to 1.5.3 2018-09-19 16:36:04 +02:00
7d7912a93e [minor] remove unused space 2018-09-19 16:35:05 +02:00
7d85321303 fix documentation 2018-09-19 16:34:38 +02:00
dba4ea1c36 fix error when interval is hours only 2018-09-19 16:34:12 +02:00
51d4c3bda0 prepare changelog for 1.5.2 2018-09-14 15:43:28 +02:00
b3d23bbed8 Filter user in user picker by flags, method to get/filter user by flag in UserRepository 2018-09-14 15:41:50 +02:00
28d903697c set changelog for 1.5.2 2018-09-14 14:02:37 +02:00
2d82e3114a update changelog 2018-09-13 21:04:35 +02:00
e55d654675 dropzone.js handle upload of document for a better UX 2018-09-13 21:03:59 +02:00
823aee2264 Allow Document to receive null object
Those null object will be checked later by validation
2018-09-13 20:55:38 +02:00