Commit Graph

  • 48ab9afa69 add external requirements for readthedocs Julien Fastré 2015-07-12 11:16:38 +02:00
  • 294fc49df7 Merge branch 'master' of git://github.com/Chill-project/Main Marc Ducobu 2015-07-06 09:51:20 +02:00
  • f67bea64ce Better style for login Marc Ducobu 2015-07-06 09:51:02 +02:00
  • 0f9f0d52e1 Refactoring LoadScopes.php : removing useless variable Marc Ducobu 2015-07-06 09:50:44 +02:00
  • c7962c8afd Display only the activities of a person Marc Ducobu 2015-07-06 09:10:58 +02:00
  • b26c8ee239 sort timeline by date *DESC* Julien Fastré 2015-07-06 01:01:39 +02:00
  • 7675f0e250 add grouping and fix localization of trans. string in ActivityReason Julien Fastré 2015-07-06 00:55:39 +02:00
  • 1f58e60c09 Refactoring LoadReports : removing useless line return Marc Ducobu 2015-07-06 00:31:30 +02:00
  • 7e688d8573 Merge branch 'master' of git://github.com/Chill-project/Activity Marc Ducobu 2015-07-06 00:27:44 +02:00
  • e1eeb1bdab Adding activity fixtures Marc Ducobu 2015-07-06 00:27:16 +02:00
  • e36c195ecf add flashbag message for activity Julien Fastré 2015-07-06 00:10:13 +02:00
  • e0561340a5 add layout for form, consistency with reports Julien Fastré 2015-07-05 23:58:15 +02:00
  • 7f367a857e layout of show and list Julien Fastré 2015-07-05 23:45:49 +02:00
  • 943032a918 layout of time widget Julien Fastré 2015-07-05 23:23:29 +02:00
  • 0dd3dd2a1e add special layout for time field Julien Fastré 2015-07-05 23:14:44 +02:00
  • f7ab4824db add translation in update form Julien Fastré 2015-07-05 11:48:53 +02:00
  • afdac5390d add translations Julien Fastré 2015-07-05 11:45:45 +02:00
  • bc2b89db03 updating edit template Marc Ducobu 2015-07-05 11:45:15 +02:00
  • a4e3089150 Debuging updating form Marc Ducobu 2015-07-05 11:42:33 +02:00
  • 6f9015ac08 mark test as skipped for now Julien Fastré 2015-07-05 11:19:46 +02:00
  • c4b2bfa8ff add fixtures into timeline Julien Fastré 2015-07-05 11:17:01 +02:00
  • 9927be9e2f forget parameters.yml Julien Fastré 2015-07-05 11:08:00 +02:00
  • a637d8ad21 updating the activity show Marc Ducobu 2015-07-05 11:20:21 +02:00
  • d937b80038 Error in label : report -> activity Marc Ducobu 2015-07-05 11:19:48 +02:00
  • 2c9cddcecc Better list of activities Marc Ducobu 2015-07-05 11:07:32 +02:00
  • 33461d90ce Good format for date & durationTIme Marc Ducobu 2015-07-05 10:41:26 +02:00
  • 40a99a521e Good format for duration time Marc Ducobu 2015-07-05 10:35:54 +02:00
  • 4788a2dc53 Fixing file name error : LoadReportACL -> LoadActivitytACL Marc Ducobu 2015-07-05 10:29:09 +02:00
  • 7d4f865f10 remark & attendee can be null Marc Ducobu 2015-07-04 21:23:19 +02:00
  • 5af14b2307 time type for durationTime in form Marc Ducobu 2015-07-04 21:22:56 +02:00
  • e65f78ab31 Debug : enable creation of an acitivy Marc Ducobu 2015-07-04 20:38:13 +02:00
  • 2f1386c230 set activity show inside chillpersonbundle layout Julien Fastré 2015-07-03 22:36:14 +02:00
  • ab52528f71 handle case when HasScopeInterface has a null scope Julien Fastré 2015-07-03 22:34:04 +02:00
  • 402ce86330 improve activity controller & rendering Julien Fastré 2015-07-03 22:33:29 +02:00
  • 9ca47ada83 add fixtures to gitignore Julien Fastré 2015-07-03 21:35:49 +02:00
  • eb11570541 add acl to activity + bootstrap php Julien Fastré 2015-07-03 21:34:48 +02:00
  • 508bf02dba move fixture to test directory Julien Fastré 2015-07-03 09:44:54 +02:00
  • eb91b8af48 fix trait declaration in new PreparePersonTrait Julien Fastré 2015-07-03 21:31:14 +02:00
  • 1a875793c9 add PreparePersonTrait as helper in tests Julien Fastré 2015-07-03 21:01:38 +02:00
  • fba95263eb Adding better fixtures activity reason & activity reason category Marc Ducobu 2015-07-03 19:03:03 +02:00
  • 44e2445013 small changes in install Jean Pierre Huart 2015-07-03 17:39:21 +02:00
  • f1ff5e3c38 Adding data fixtures Marc Ducobu 2015-07-03 12:11:27 +02:00
  • f4b99e2e8e Adding license to DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php Marc Ducobu 2015-07-03 10:26:00 +02:00
  • 9c565063af Displaying ActivtyReason & ActivityType into activity creation form Marc Ducobu 2015-07-03 10:15:50 +02:00
  • a0798c014e mergin conflict Marc Ducobu 2015-07-03 09:48:39 +02:00
  • faffdee1ab Integration code generated Marc Ducobu 2015-07-03 09:40:30 +02:00
  • be78c25091 improve activity form Julien Fastré 2015-07-02 23:36:43 +02:00
  • 1f408ce758 Merge pull request 2 Julien Fastré 2015-07-02 23:29:48 +02:00
  • 23b669b731 fix some installation steps Julien Fastré 2015-07-02 23:28:25 +02:00
  • bf48f22bd9 Install reviewed + update chill + install additional bundles Jean Pierre Huart 2015-07-02 17:39:09 +02:00
  • 86b24f58ac First step of integration code generated Marc Ducobu 2015-07-02 15:41:11 +02:00
  • 24bd8c9a1d Removing DefaultController Marc Ducobu 2015-07-02 14:38:48 +02:00
  • 77b59958ec Adding license Marc Ducobu 2015-07-02 11:33:35 +02:00
  • 5bd8b22569 Activity Reasons, Activity Reasons Category, Activity Types in Translatable strings Marc Ducobu 2015-07-02 11:33:16 +02:00
  • e9fdfb341d Adding composer.lock in .gitignore Marc Ducobu 2015-07-02 10:55:08 +02:00
  • f4fb039289 Adding route into the admin menu Marc Ducobu 2015-07-01 18:26:38 +02:00
  • b430ac30b0 Adding admin template Marc Ducobu 2015-07-01 18:22:06 +02:00
  • b07c6ee6fb Removing default view Marc Ducobu 2015-07-01 18:21:31 +02:00
  • c2a36ef928 Renaming route + in admin Marc Ducobu 2015-07-01 18:12:25 +02:00
  • 6d53ab6cb7 loading activity routes automaticaly Marc Ducobu 2015-07-01 16:34:03 +02:00
  • 5738de5033 Adding generated files Marc Ducobu 2015-07-01 13:34:14 +02:00
  • cfc7b725d8 Enabling console Marc Ducobu 2015-07-01 11:14:41 +02:00
  • 5bc7bdab2d Initialisation of the bundle Marc Ducobu 2015-07-01 09:53:36 +02:00
  • 5c4cfc45e6 Improving composer.json Marc Ducobu 2015-06-30 22:48:16 +02:00
  • 4dd1efa57f Generation of composer.json Marc Ducobu 2015-06-30 22:16:43 +02:00
  • 452f3fba86 skeleton of the bundle Marc Ducobu 2015-06-30 22:07:55 +02:00
  • 221698d102 Initial commit Ducobu Marc 2015-06-30 22:01:35 +02:00
  • 737254e8b3 Only one icon for menu person Marc Ducobu 2015-06-30 21:44:23 +02:00
  • 135691f0fc Improving menu integration Marc Ducobu 2015-06-30 21:43:31 +02:00
  • 54f4814953 propose reorganisation of installation doc Jean Pierre Huart 2015-06-30 17:16:49 +02:00
  • ea1d8d04af add a default behaviour on adding scope column Julien Fastré 2015-06-30 15:46:46 +02:00
  • cd9cfa86a3 Add css files Marc Ducobu 2015-06-30 15:11:06 +02:00
  • f9af542c59 Merge branch 'master' of git://github.com/Chill-project/Main Marc Ducobu 2015-06-30 15:08:21 +02:00
  • 54430f8714 Better section menu Marc Ducobu 2015-06-30 15:08:10 +02:00
  • add762e9f5 set chill deps to master branch Julien Fastré 2015-06-30 14:46:01 +02:00
  • 408c774e53 move to symfony 2.7 + implements acl Julien Fastré 2015-06-30 14:43:27 +02:00
  • 822297e729 set composer.json chill deps to master Julien Fastré 2015-06-30 14:42:46 +02:00
  • 513d9aefbc Implement user right refs #263 Julien Fastré 2015-06-30 14:41:31 +02:00
  • 8ac41a15b6 Merge branch add_acl ref #263 Julien Fastré 2015-06-30 14:38:08 +02:00
  • 03f1243cf7 set composer.json to master branches Julien Fastré 2015-06-30 14:34:55 +02:00
  • 1fe361a927 Search button position in menu at the good place Marc Ducobu 2015-06-30 13:48:28 +02:00
  • 4d5dd2a70d Footer at bottom Marc Ducobu 2015-06-30 13:27:19 +02:00
  • d6f9402128 Navigation search improvement Marc Ducobu 2015-06-30 10:54:02 +02:00
  • baa9262962 Merge remote-tracking branch 'origin/master' into add_acl Julien Fastré 2015-06-30 09:55:35 +02:00
  • a16a097550 add acl on report search Julien Fastré 2015-06-30 00:19:10 +02:00
  • f14255c0fc add scope to search results Julien Fastré 2015-06-29 23:42:14 +02:00
  • acb3e8bc3d add acl on timeline report Julien Fastré 2015-06-29 23:38:21 +02:00
  • 4fc2d1d0a0 Design of the user menu Marc Ducobu 2015-06-29 14:29:09 +02:00
  • 4c04416fd5 add Scope to report's fixture² Julien Fastré 2015-06-28 11:37:16 +02:00
  • 4947db1c7f fix username in test timeline Julien Fastré 2015-06-28 11:24:48 +02:00
  • 0be232e202 Merge pull request #1 from jphuart/master Julien Fastré 2015-06-28 01:16:15 +02:00
  • 799b612a72 add access control model documentation Julien Fastré 2015-06-28 01:14:31 +02:00
  • 17b8c69bca fix tests + test about report ACL Julien Fastré 2015-06-27 02:03:09 +02:00
  • 4408eea3b3 Changes to optional css install Jean Pierre Huart 2015-06-26 18:13:58 +02:00
  • 1f11924be3 Merge remote-tracking branch 'upstream/master' Jean Pierre Huart 2015-06-26 18:08:02 +02:00
  • 2b0872ab7d Update installation.rst Jean Pierre Huart 2015-06-26 17:30:23 +02:00
  • 859e115de7 Update installation.rst Jean Pierre Huart 2015-06-26 17:28:22 +02:00
  • c10445c8a4 allow report edit w/ scope + add deny statements [ci skip] Julien Fastré 2015-06-25 22:42:19 +02:00
  • 8445e81d44 refactor: move scope field to trait Julien Fastré 2015-06-24 22:32:28 +02:00
  • 7cf41d9c9d add newline (\n) at the end of file Julien Fastré 2015-06-24 00:30:20 +02:00