660 Commits

Author SHA1 Message Date
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
0fa3a9b0ed Merge remote-tracking branch 'framagit/master' 2016-03-23 15:16:58 +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
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
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
6ae1b8334e Remove the admin menu from the section user's menu. 2016-02-25 13:08:10 +01:00
c5cf3ab467 [UI] add improvement to display entities with boxes 2016-02-22 14:53:38 +01:00
0801db979b Merge remote-tracking branch 'framagit/master' 2016-02-21 22:54:51 +01:00
53fef9b083 allow cache for the most used entities 2016-02-21 22:54:09 +01:00
68b358aa22 update support data 2016-01-20 17:09:33 +01:00
09099b0566 Merge branch 'master' into 1.0
Conflicts:
	Resources/public/css/scratch.css.map
2016-01-05 14:17:58 +01:00
c8077ac575 allow php 7 a force symfony 2.8 2016-01-05 14:04:45 +01:00
23ec2a1a16 fix issue with translations in tests 2016-01-05 14:02:07 +01:00
dabd58ed89 fix issue with password change + tests user lifecycle 2016-01-05 13:47:17 +01:00
9fe445ed20 layout of post-text extension 2015-12-30 16:58:01 +01:00
daf7d1f71f improve layout of report + flash message 2015-12-18 01:44:11 +01:00
d77f85dbd0 greater textarea 2015-12-17 21:53:15 +01:00
9aa686fac6 select radio button with empty value
if multiple radio button doesn't have a value, the default one is
checked.

This is done using javascript, currently.
2015-12-17 21:46:53 +01:00
06cc78c5cb mark test skipped as the hack is not working 2015-12-16 12:56:03 +01:00
9f9bc8ab4d adapt to symfony 2.8 2015-12-16 12:55:41 +01:00
590762889b Merge branch 'master' into '1.0'
Select2js allow clear



See merge request !3
2015-12-15 11:01:04 +01:00
Marc Ducobu
9f4286d297 Select2js allow clear 2015-12-15 10:08:37 +01:00
c1e7bc0013 Merge branch 'master' into '1.0'
CF #16 - Improve the layout



See merge request !2
2015-12-11 15:03:49 +01:00
Marc Ducobu
9a957a9704 CF #16 - Improve the layout 2015-12-11 13:51:46 +01:00
69da4ce4c9 Merge branch 'master' into 1.0 2015-12-11 12:04:01 +01:00
25626a6a45 Merge branch 'master' into 'master'
Choice widget expanded use the .inline_choice class & choice_with_other_widget d…

…isplay the label and the input on the same line

See merge request !1
2015-12-10 15:49:23 +01:00
Marc Ducobu
0f632be80b Choice widget expanded use the .inline_choice class & choice_with_other_widget display the label and the input on the same line 2015-12-08 11:40:16 +01:00
Marc Ducobu
4674369ce9 Improving UI 2015-12-04 19:35:25 +01:00
Marc Ducobu
113fa1facc Starting solving - #4 2015-11-25 15:57:05 +01:00
Marc Ducobu
fcbd985e4e Chill more responsible (Ok >= 500 px) 2015-11-25 15:36:26 +01:00
Marc Ducobu
5b78cad8d6 More responsibe design 2015-11-25 15:17:05 +01:00
Marc Ducobu
3cda5cd14a Updating the dependencies 2015-11-25 15:16:12 +01:00
Marc Ducobu
24f79d1acb chill_menu("admin") config from Admin/layoutWithVerticalMenu.html.twig 2015-11-25 11:56:29 +01:00
Marc Ducobu
e76f553a6d Removing useless images 2015-11-25 11:44:53 +01:00
Marc Ducobu
bd61bbfdae Slongan : accompagnement -> l'accompagnement 2015-11-25 11:40:19 +01:00
6886f5f943 remove dev from migration deps 2015-11-11 21:36:37 +01:00
Marc Ducobu
c0d5bd90e8 Removing travis config files 2015-10-30 16:01:22 +01:00
Marc Ducobu
cd84a34f10 debug flash message error -> danger 2015-10-30 14:16:58 +01:00
Marc Ducobu
7d7942f9d3 Update README : removing travis ref + issue on redmine 2015-10-30 10:19:08 +01:00
Marc Ducobu
5fb2279d38 Layout for the admin section 2015-10-30 10:14:52 +01:00
a7d4bf4162 fix database host for test with gitlab-ci 2015-10-26 22:29:22 +01:00
06ab5834ea use token for auth with github + use chill/database [ci-skip] 2015-10-26 22:28:25 +01:00