Nicolas Le Goff 6ba5ce6669 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Root.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	lib/classes/task/databoxAbstract.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/email-template.html.twig

2014-01-24 18:52:14 +01:00

..

account

Merge branch '3.8'

2013-11-12 13:26:15 +01:00

admin

Fix #1675 Display issue in registration template

2014-01-24 14:29:24 +01:00

client

Fix JS codestyle

2013-11-12 12:49:23 +01:00

common

Fix #1217 Broken tooltip

2013-06-28 13:12:40 +02:00

error-pages

Remove execution right on images

2013-09-04 15:36:06 +02:00

geonames

Fix #1387 CSS issue in city list

2013-08-05 14:53:26 +02:00

icons

Apply time limits on template application

2013-06-14 09:47:30 +02:00

lightbox

Fix JS codestyle

2013-11-12 12:49:23 +01:00

lng

Thesaurus refactor

2013-02-28 16:14:33 +01:00

login

Fix language bar display in mobile devices

2013-12-05 15:41:23 +01:00

oauth

graphic integration Oauth Pages (correction for devices)

2012-03-08 17:35:48 +01:00

prod

Fix #1625 : Append javascript autocompleter to edit dialog box

2013-12-17 15:56:27 +01:00

report

Merge branch '3.8'

2013-12-20 16:46:35 +01:00

setup

fix #486 Installeur n'aboutit pas sans APC

2012-02-29 15:16:20 +01:00

thesaurus

Fix JS codestyle

2013-11-12 12:49:23 +01:00

grey.gif

Replace grey by transparency

2012-10-01 15:15:50 +02:00