Romain Neutron 212b09afa2 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Permalink.php

2013-10-25 18:50:15 +02:00

..

actions

Merge branch '3.8'

2013-10-25 18:50:15 +02:00

Baskets

Fix #1338 : Fix notices display in admin

2013-07-17 13:38:30 +02:00

feeds

Renamed and fixed entry update/delete bindings

2013-09-05 13:44:08 +02:00

orders

Merge branch '3.8'

2013-09-05 14:38:55 +02:00

preview

Rebased, fixed minor bugs

2013-09-05 13:44:04 +02:00

results

Fix answer rollover URL

2013-06-25 11:27:27 +02:00

Share

Fix #1218 & 1219 Enhance sharing window

2013-06-28 17:15:48 +02:00

Story

Fix #1338 : Fix notices display in admin

2013-07-17 13:38:30 +02:00

templates

Fix templates

2013-07-10 19:44:49 +02:00

Tooltip

Update templates to display databox fields labels

2013-05-30 18:12:31 +02:00

upload

Fix translation issues

2013-09-05 14:29:42 +02:00

User

adressed comment's

2013-07-04 02:49:11 +02:00

WorkZone

Fix #1304 : Workzone elastic behavior is not working

2013-07-12 11:01:13 +02:00

index.html.twig

Merge branch '3.8'

2013-09-18 12:09:20 +02:00

notifications.html.twig

Update templates filepaths

2012-07-24 13:12:24 +02:00

thesaurus.js

Fix #1456 : Thesaurus queries don't work

2013-09-09 19:30:38 +02:00

TOU_ajax.html.twig

Fix CS

2012-10-26 12:20:16 +02:00

TOU_base.html.twig

Fix CS

2012-10-26 12:20:16 +02:00

TOU.html.twig

Merge branch '3.7'

2012-12-17 15:30:05 +01:00