4219 Commits

Author SHA1 Message Date
Marc Ducobu
31e734f2c7 Renaming genre into gender & dateOfBirth into birthdate 2015-08-11 17:47:11 +02:00
Marc Ducobu
02193505be Refactoring Entity/Person.php : better documentation 2015-08-11 15:44:48 +02:00
Marc Ducobu
03059c669b Merge branch 'master' of git://github.com/Chill-project/Person 2015-08-10 16:50:49 +02:00
Marc Ducobu
71afed7dc1 Better submenu for person 2015-08-10 16:50:20 +02:00
Marc Ducobu
140b7430cb Person quick info - thibaut design 2015-08-10 15:53:54 +02:00
Marc Ducobu
dd24cbe5bc Better menu 2015-08-10 15:53:30 +02:00
Marc Ducobu
fac21cfc8f Integration of Thibaut design 2015-08-10 14:45:15 +02:00
Marc Ducobu
a29671f738 Better menu 2015-08-07 19:08:01 +02:00
Marc Ducobu
b27cf3593d Logo without slogan 2015-08-04 11:45:33 +02:00
Marc Ducobu
bf80106bd4 Refactorig (indentation) views/Login/login.html.twig 2015-08-03 18:01:51 +02:00
Marc Ducobu
687f950ab4 Comments Thibaut : form 1px + footer text in white - 2 2015-08-03 18:01:28 +02:00
Marc Ducobu
e5adce5409 Comments Thibaut : form 1px + footer text in white 2015-08-03 18:00:06 +02:00
Julien Fastré
1c7c7217cb Merge pull request #3 from jphuart/master
small changes in install
2015-07-21 14:02:45 +02:00
Jean Pierre Huart
70bc025ade Changes proposed accepted and implemented 2015-07-14 10:53:52 +02:00
Jean Pierre Huart
42b2c8ad61 Merge remote-tracking branch 'upstream/master' 2015-07-14 10:42:54 +02:00
7dcb457050 remove -e option for requirements.txt 2015-07-12 11:27:21 +02:00
48ab9afa69 add external requirements for readthedocs 2015-07-12 11:16:38 +02:00
Marc Ducobu
294fc49df7 Merge branch 'master' of git://github.com/Chill-project/Main 2015-07-06 09:51:20 +02:00
Marc Ducobu
f67bea64ce Better style for login 2015-07-06 09:51:02 +02:00
Marc Ducobu
0f9f0d52e1 Refactoring LoadScopes.php : removing useless variable 2015-07-06 09:50:44 +02:00
Marc Ducobu
c7962c8afd Display only the activities of a person 2015-07-06 09:10:58 +02:00
b26c8ee239 sort timeline by date *DESC*
fix #446
2015-07-06 01:01:39 +02:00
7675f0e250 add grouping and fix localization of trans. string in ActivityReason
the label of activity type is now handled by translatableStringHelper.

Reasons are also grouped by categories.

This is thanks to PR https://github.com/symfony/symfony/pull/14050
2015-07-06 00:57:53 +02:00
Marc Ducobu
1f58e60c09 Refactoring LoadReports : removing useless line return 2015-07-06 00:31:30 +02:00
Marc Ducobu
7e688d8573 Merge branch 'master' of git://github.com/Chill-project/Activity 2015-07-06 00:27:44 +02:00
Marc Ducobu
e1eeb1bdab Adding activity fixtures 2015-07-06 00:27:16 +02:00
e36c195ecf add flashbag message for activity 2015-07-06 00:10:13 +02:00
e0561340a5 add layout for form, consistency with reports
- add buttons at the bottom
2015-07-05 23:58:15 +02:00
7f367a857e layout of show and list
- remove attendee from list
- multiple case in show + layout
2015-07-05 23:45:49 +02:00
943032a918 layout of time widget 2015-07-05 23:23:29 +02:00
0dd3dd2a1e add special layout for time field 2015-07-05 23:14:44 +02:00
f7ab4824db add translation in update form 2015-07-05 11:48:53 +02:00
afdac5390d add translations
I rewrote some messages to be more consistent and avoid multiplication
of messages
2015-07-05 11:46:42 +02:00
Marc Ducobu
bc2b89db03 updating edit template 2015-07-05 11:45:15 +02:00
Marc Ducobu
a4e3089150 Debuging updating form 2015-07-05 11:42:33 +02:00
6f9015ac08 mark test as skipped for now 2015-07-05 11:20:43 +02:00
c4b2bfa8ff add fixtures into timeline 2015-07-05 11:20:43 +02:00
9927be9e2f forget parameters.yml 2015-07-05 11:20:43 +02:00
Marc Ducobu
a637d8ad21 updating the activity show 2015-07-05 11:20:21 +02:00
Marc Ducobu
d937b80038 Error in label : report -> activity 2015-07-05 11:19:48 +02:00
Marc Ducobu
2c9cddcecc Better list of activities 2015-07-05 11:07:32 +02:00
Marc Ducobu
33461d90ce Good format for date & durationTIme 2015-07-05 10:41:26 +02:00
Marc Ducobu
40a99a521e Good format for duration time 2015-07-05 10:35:54 +02:00
Marc Ducobu
4788a2dc53 Fixing file name error : LoadReportACL -> LoadActivitytACL 2015-07-05 10:29:09 +02:00
Marc Ducobu
7d4f865f10 remark & attendee can be null 2015-07-04 21:23:19 +02:00
Marc Ducobu
5af14b2307 time type for durationTime in form 2015-07-04 21:22:56 +02:00
Marc Ducobu
e65f78ab31 Debug : enable creation of an acitivy 2015-07-04 20:38:13 +02:00
2f1386c230 set activity show inside chillpersonbundle layout 2015-07-03 22:36:14 +02:00
ab52528f71 handle case when HasScopeInterface has a null scope 2015-07-03 22:34:04 +02:00
402ce86330 improve activity controller & rendering 2015-07-03 22:33:29 +02:00