Commit Graph

17 Commits

Author SHA1 Message Date
Nicolas Le Goff
5da553756c Simpler deps 2015-02-05 18:56:24 +01:00
Nicolas Le Goff
bd1e4516bd Merge branch '3.8'
Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig
2014-02-03 19:02:22 +01:00
Nicolas Le Goff
dd8c4cb75f Fix #1660 video scale preview on ipad in lightbox 2014-01-31 16:39:01 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +01:00
Romain Neutron
a805c94524 Merge branch '3.8'
Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
2013-10-21 19:05:37 +02:00
Nicolas Le Goff
f9cd105e51 Fix #1497 Resizing images is not working on tablet in paysage mode 2013-10-18 16:11:54 +02:00
Romain Neutron
6c29fc88e9 Merge branch '3.8'
Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
2013-09-05 13:57:42 +02:00
Nicolas Le Goff
66bcf32d81 Fix #1419 Fix resize issue on mobile view 2013-09-03 17:26:40 +02:00
Nicolas Le Goff
4a8e1c13ab Add jquery mobile 2013-08-17 17:12:58 +02:00
Nicolas Le Goff
4eb702de93 Fix js path
Remove real path
2013-06-19 16:14:04 +02:00
Nicolas Le Goff
09a4fb52e0 Fix #993 Add send basket validation report in mobile view 2013-06-18 17:50:00 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
3638385b58 Move minify to dedicated controller, www directory cleanup 2013-05-24 14:37:55 +02:00
Romain Neutron
4677f0e9a2 Remove providers instanciation in Twig setup 2012-10-04 15:44:48 +02:00
Romain Neutron
ec11550eab Update templates 2012-10-04 15:42:53 +02:00
Romain Neutron
be3b098747 Rename twig templates 2012-07-24 13:12:22 +02:00