10075 Commits

Author SHA1 Message Date
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
9ca47ada83 add fixtures to gitignore 2015-07-03 21:36:05 +02:00
eb11570541 add acl to activity + bootstrap php 2015-07-03 21:36:05 +02:00
508bf02dba move fixture to test directory
refs #561
2015-07-03 21:36:05 +02:00
eb91b8af48 fix trait declaration in new PreparePersonTrait 2015-07-03 21:31:25 +02:00
1a875793c9 add PreparePersonTrait as helper in tests
[ci skip]
2015-07-03 21:17:12 +02:00
Marc Ducobu
fba95263eb Adding better fixtures activity reason & activity reason category 2015-07-03 19:03:03 +02:00
Jean Pierre Huart
44e2445013 small changes in install 2015-07-03 17:39:21 +02:00
Marc Ducobu
f1ff5e3c38 Adding data fixtures 2015-07-03 12:11:27 +02:00
Marc Ducobu
f4b99e2e8e Adding license to DataFixtures/ORM/LoadAccompanyingPeriodClosingMotive.php 2015-07-03 10:26:00 +02:00
Marc Ducobu
9c565063af Displaying ActivtyReason & ActivityType into activity creation form 2015-07-03 10:15:50 +02:00
Marc Ducobu
a0798c014e mergin conflict 2015-07-03 09:48:39 +02:00
Marc Ducobu
faffdee1ab Integration code generated 2015-07-03 09:40:30 +02:00
be78c25091 improve activity form
- create as a service with required depedencies (required for scope)
- add scope
- fix date show
- adapt controller accordingly
2015-07-02 23:36:43 +02:00
1f408ce758 Merge pull request 2 2015-07-02 23:29:48 +02:00
23b669b731 fix some installation steps 2015-07-02 23:28:25 +02:00
Jean Pierre Huart
bf48f22bd9 Install reviewed + update chill + install additional bundles 2015-07-02 17:39:09 +02:00
Marc Ducobu
86b24f58ac First step of integration code generated 2015-07-02 15:41:11 +02:00
Marc Ducobu
24bd8c9a1d Removing DefaultController 2015-07-02 14:38:48 +02:00
Marc Ducobu
77b59958ec Adding license 2015-07-02 11:33:35 +02:00
Marc Ducobu
5bd8b22569 Activity Reasons, Activity Reasons Category, Activity Types in Translatable strings 2015-07-02 11:33:16 +02:00
Marc Ducobu
e9fdfb341d Adding composer.lock in .gitignore 2015-07-02 10:55:08 +02:00
Marc Ducobu
f4fb039289 Adding route into the admin menu 2015-07-01 18:26:38 +02:00
Marc Ducobu
b430ac30b0 Adding admin template 2015-07-01 18:22:06 +02:00
Marc Ducobu
b07c6ee6fb Removing default view 2015-07-01 18:21:31 +02:00
Marc Ducobu
c2a36ef928 Renaming route + in admin 2015-07-01 18:12:25 +02:00
Marc Ducobu
6d53ab6cb7 loading activity routes automaticaly 2015-07-01 16:34:03 +02:00
Marc Ducobu
5738de5033 Adding generated files 2015-07-01 13:34:14 +02:00
Marc Ducobu
cfc7b725d8 Enabling console 2015-07-01 11:14:41 +02:00
Marc Ducobu
5bc7bdab2d Initialisation of the bundle 2015-07-01 09:53:36 +02:00
Marc Ducobu
5c4cfc45e6 Improving composer.json 2015-06-30 22:48:16 +02:00
Marc Ducobu
4dd1efa57f Generation of composer.json 2015-06-30 22:16:43 +02:00
Marc Ducobu
452f3fba86 skeleton of the bundle 2015-06-30 22:07:55 +02:00
Ducobu Marc
221698d102 Initial commit 2015-06-30 22:01:35 +02:00
Marc Ducobu
737254e8b3 Only one icon for menu person 2015-06-30 21:44:23 +02:00
Marc Ducobu
135691f0fc Improving menu integration 2015-06-30 21:43:31 +02:00
Jean Pierre Huart
54f4814953 propose reorganisation of installation doc 2015-06-30 17:16:49 +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
Marc Ducobu
cd9cfa86a3 Add css files 2015-06-30 15:11:06 +02:00
Marc Ducobu
f9af542c59 Merge branch 'master' of git://github.com/Chill-project/Main 2015-06-30 15:08:21 +02:00
Marc Ducobu
54430f8714 Better section menu 2015-06-30 15:08:10 +02:00
add762e9f5 set chill deps to master branch 2015-06-30 14:46:01 +02:00
408c774e53 move to symfony 2.7 + implements acl
merge of branch add_acl

Squashed commit of the following:

commit b112df16e568ad4a305e290b4cca9eb696bcf5d7
Merge: f8c44ca 11324cb
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Tue Jun 30 09:59:03 2015 +0200

    Merge remote-tracking branch 'origin/master' into add_acl

commit f8c44ca20b5a53fb18da00ab265d626dd8c770b2
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 5 22:47:50 2015 +0200

    fix Form signature to match abstractForm

    OptionsResolverInterface => OptionsResolver

commit 586155ecfa85240d683aa8bd37493e948f89cd67
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 5 22:47:25 2015 +0200

    remove deprecation warnings from phpunit

commit 6ada3ddef336b958a886215fcdb040a29f5a411f
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 5 22:30:30 2015 +0200

    replace deprecated setDefaultOptions

    setdefaultsOptions => configureOptions

commit 28b0e258d52b08ecd3799e19b15bd4b1f1e58f83
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 5 11:20:30 2015 +0200

    fix twig.form.resources deprecations

commit cb09035c8f0eb74192f7e3e68c93c6378f158f2f
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 5 10:58:19 2015 +0200

    switch to symfony 2.7 [ci skip]
2015-06-30 14:43:27 +02:00
822297e729 set composer.json chill deps to master 2015-06-30 14:42:46 +02:00
513d9aefbc Implement user right refs #263
Merge of branch add_acl

Squashed commit of the following:

commit a3265a71014fc74bcc456aa9436494fc4ed434ea
Merge: 2522634 b231b14
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Tue Jun 30 09:58:23 2015 +0200

    Merge remote-tracking branch 'origin/master' into add_acl

    in order to future merging of add_acl into master

    Conflicts:
    	Tests/Controller/PersonControllerCreateTest.php

commit 252263400b1fb54091a0cd36d9ab84812c3a9942
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Jun 29 23:00:25 2015 +0200

    check acl on timeline page

commit 5f08806585ce4ce1d58c6c507b191221b924d861
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 19 22:24:18 2015 +0200

    remove dead code

commit 860d62d9c0d9db2186eee725e7ef553ddf1f98f3
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 19 22:19:02 2015 +0200

    add access condition for link to person view in person view

commit e7b295000dd420309288e83920f6656679d36173
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 19 22:13:04 2015 +0200

    add ACL on person view

commit 7b1f90a2a28c1aec5ee0eb78206c75a9f1e09c60
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 19 21:47:49 2015 +0200

    add autorization for filtering person results in search

commit c6669164e2e36b555bed0745d5c7c12b53468b97
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 19 21:47:26 2015 +0200

    add fixtures for roles defined by person bundle

commit 8f30f5222efe531fb77a2e22b6af8069c5814d00
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 19 20:13:17 2015 +0200

    [transfer purpose][ci-skip]

commit e8ca4ce4842e619342a90d4343b725c2946f7d70
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 19 17:31:27 2015 +0200

    should fix reference problem

commit 8c32524a0fd61d504e9640705b97d10bd9b2b993
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 19 17:29:48 2015 +0200

    fix test about inheritance

commit d93cef2c596aba7fc977cc8db354241d6a77e6e2
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Thu Jun 18 21:38:59 2015 +0200

    add role hierarchy + test

commit 5066cc5318d67f20e3cff9f91f6d2b6a94d5f9c1
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Thu Jun 18 01:28:40 2015 +0200

    add tests for person voter

commit cf3359b11b16972db3c55102a3c8b2aae2c27789
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Thu Jun 18 01:07:30 2015 +0200

    fix "pass by reference" error

commit 94942eb34330813a10124ba58ec814ca685930c5
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Wed Jun 17 22:04:49 2015 +0200

    fix syntax error ($this->$is not correct)

commit 82d25df6b0e21b4032f4fc82dee203ccd1a067dd
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Wed Jun 17 21:51:41 2015 +0200

    add first test for person voter

commit 84e0d05be07477175db1ef95f3716a3c420291ce
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Wed Jun 17 21:50:06 2015 +0200

    define person voter as a service + CHILL_PERSON_SEE

commit bd55e505a179b0df4133903f766d9a8feb469900
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Tue Jun 16 20:57:25 2015 +0200

    add test for creating person with user multi center

commit d29147c8e70b2ae8313d973fe4b3d45d3f064d9b
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Jun 15 09:11:56 2015 +0200

    fix tests - add center to persons

    since a center is associated with center, people used in tests must be associated with a center.
    => associate a center to people used in tests

commit cfac1ea68aaf615b5f8e9e67388f5407e5095d72
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Jun 15 09:06:24 2015 +0200

    remove errors on deprecation

commit e1df87df87e831f3827721313603bcf41b3da891
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 12 22:31:03 2015 +0200

    fix migration error

commit 733fa96a2d874b84d2a0ece6664e4a64eed10b4d
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Wed Jun 10 21:17:15 2015 +0200

    add center type on creation forms

    tests are not adapted yet [ci skip]

commit c0d1d1b1c8fd58d9c15bf59d66de28a848df6d35
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Tue Jun 9 23:11:07 2015 +0200

    fix bug in migration

commit 693abfb7253dfe955beb63de3aebc05a15363cdb
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Tue Jun 9 22:41:21 2015 +0200

    add checks on migration

    check that there are data or not in database and, if there are data,
    create default center if required.

    If not required, the default center is the first in the list.

commit 8127ea8d49e094c81ce65e838416953bc8d47678
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Jun 8 00:33:39 2015 +0200

    add first impl of PersonVoter (not tested) [ci skip]

commit 2ea674dbcf8848603f0fefa109abf2412722013f
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Mon Jun 8 00:32:46 2015 +0200

    add center to person

commit 0b1e3f137ace9eeb959b80cdbdfa3636c75af715
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Sat Jun 6 11:02:49 2015 +0200

    add phpunit bridge to handle deprecation msg

commit 70a4fd16181badad8ac9b87fd24e1000c7b1a734
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 5 12:42:01 2015 +0200

    remove deprecdation warning in phpunit

commit b3b8d1deefbdc72505606df7ca217771277e3555
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 5 11:41:36 2015 +0200

    fix deprecation of pattern in routing

    pattern => path in routing.yml

commit eea1252d8517ee582c958dc6045f05c1438dd9d1
Author: Julien Fastré <julien.fastre@champs-libres.coop>
Date:   Fri Jun 5 10:56:02 2015 +0200

    switch to symfony 2.7 [ci-skip]
2015-06-30 14:41:31 +02:00