1503 Commits

Author SHA1 Message Date
Marc Ducobu
ab609a4ddb Merging 2016-03-24 10:47:03 +01:00
Marc Ducobu
9eed387285 Adding the js function categoryLinkParentChildSelect for center and scope 2016-03-24 10:45:03 +01:00
Marc Ducobu
6d0ffcf1bc Adding the js function categoryLinkParentChildSelect to chill-main (from chill-group) 2016-03-24 10:42:46 +01:00
Marc Ducobu
e6a47ddcbc Refactoring : tabulation with 4 spaces 2016-03-24 09:47:14 +01:00
Marc Ducobu
332ee277d3 Changing Scope to Circle : getReachableScopes -> getReachableCircles 2016-03-24 08:59:46 +01:00
627b9fb08f add the possibility to add a participation of a person to an event
ref #5
2016-03-24 01:44:32 +01:00
167a147f52 Merge remote-tracking branch 'origin/master' 2016-03-23 23:18:11 +01:00
e2decee8cb add a form to make a ling with 'add a participant' page 2016-03-23 21:57:42 +01:00
5c29e85e4e prevent test/fixtures to be registered 2016-03-23 21:57:25 +01:00
Marc Ducobu
2cb4ee8bb9 Merging 2016-03-23 18:22:17 +01:00
Marc Ducobu
4fe31185df Good Center - Circle suggested 2016-03-23 18:19:48 +01:00
0fa3a9b0ed Merge remote-tracking branch 'framagit/master' 2016-03-23 15:16:58 +01:00
4744014cf2 Merge remote-tracking branch 'origin/master' 2016-03-22 21:21:45 +01:00
90cbb78621 add a "view page" for event
ref #3
2016-03-22 21:19:16 +01:00
Marc Ducobu
888bcad81a Adding type to the creation event form 2016-03-22 20:34:34 +01:00
Marc Ducobu
041c43a936 Basic form to create an Event 2016-03-22 18:59:59 +01:00
Marc Ducobu
26fa6a2c56 Route for event is now {locale}/event/event 2016-03-22 18:26:34 +01:00
Marc Ducobu
4d02314770 Event CRUD generated 2016-03-22 17:16:19 +01:00
acd25fc57b Merge remote-tracking branch 'origin/master' 2016-03-22 17:04:00 +01:00
55a2c66793 adding a basic search page, which create event list
ref #10
ref #18
2016-03-22 17:01:25 +01:00
Marc Ducobu
6d2bb8ca1d Correction of the comment & H1 title 2016-03-22 15:35:21 +01:00
Marc Ducobu
1acf3a4685 Adding layout for event-vue 2016-03-22 14:49:19 +01:00
Marc Ducobu
e285603e18 Merge branch 'master' of https://git.framasoft.org/Chill-project/Chill-Main 2016-03-22 14:29:41 +01:00
Marc Ducobu
f205a1ccca Refactoring : adding the JS in the pabe bottom part 2016-03-22 14:29:00 +01:00
Marc Ducobu
8f91076c6b Code refactoring 2016-03-22 14:27:53 +01:00
b89ed5d534 add link to scope, center, type on Event 2016-03-22 14:00:48 +01:00
e66a855c0a adding a scope/circle to events
ref #1
2016-03-22 12:36:11 +01:00
d7fc04cdaa add fixtures for events
fix #17
2016-03-22 09:59:18 +01:00
b97a550e2b remove unused locale and request stack
The locale resolving is delegated to TranslatableStringHelper
2016-03-21 00:00:58 +01:00
386d4dd623 fix bug when postal code is null + add validation for address &postcode
fix #20
fix #18
2016-03-18 11:49:56 +01:00
9512528018 add basic crud for admin 2016-03-18 11:34:25 +01:00
cd7e9a9e2b add migration file 2016-03-18 11:33:59 +01:00
11d58a457a initialize entities 2016-03-18 11:22:09 +01:00
f3b00ac69b add license and readme 2016-03-18 10:31:17 +01:00
c43e7daefe initial commit 2016-03-18 10:28:26 +01:00
4a77d7617a add script to add postal code 2016-03-15 16:01:27 +01:00
5c67a9098e allow delegation of block rendering
ref #12

In a template, you can now allow rendering of a block from other bundle.

The layout template must explicitly call the rendering of other block,
with the twig function

```
chill_delegated_block('block_name', { 'array' : 'with context' } )
```

This will launch an event
`Chill\MainBundle\Templating\Events\DelegatedBlockRenderingEvent` with
the event's name 'chill_block.block_name'.

You may add content to the page using the function
`DelegatedBlockRenderingEvent::addContent`.
2016-03-14 22:45:04 +01:00
42455b7d66 improve address rendering macro 2016-03-14 14:58:35 +01:00
d8efc93be0 add form to update/create address and pick postal code 2016-03-10 21:44:13 +01:00
a9e04e56be make the form compliant with sf 3.0 2016-03-10 21:43:40 +01:00
7679786288 add address and postal code 2016-03-10 17:57:30 +01:00
1ab0b95e74 order the type alphabetically
Improve also the form "TranslatableActivityType" to use the
TranslatableStringHelper.
2016-03-09 20:54:38 +01:00
97df048dfb add a placeholder in form. Force to choose a type
fix #5
2016-03-09 15:17:54 +01:00
3acea7967c fix the layout of the forms
The layout is now consistent with the view page
2016-03-09 14:42:42 +01:00
77b7333fea Allow encoding of an activity with configuration preset durations
fix #11

The activity form allow to receive pre-configured activity durations.

Those duration can be configured through the option
chill_activity.form.time_duration :

```yaml

chill_activity:
   form:
      time_duration:
         - { label: '12 minutes', seconds: 720 }
         # - ...

```

If a pre-existing activity receives a different time, the time is added
to the list of pre-configured duration time.
2016-03-09 14:31:42 +01:00
f28a6e9fa0 Merge remote-tracking branch 'framagit/master' 2016-02-25 20:03:30 +01:00
6ae1b8334e Remove the admin menu from the section user's menu. 2016-02-25 13:08:10 +01:00
1b851e8f09 upgrade dependency on doctrine-migration-bundle to ~1.1 2016-02-23 15:37:54 +01:00
9bf7b4ac60 set deps on doctrine-migration to ~1.1 2016-02-23 15:09:54 +01:00
737d0f4c52 Add license 2016-02-23 14:49:42 +01:00