Commit Graph

10 Commits

Author SHA1 Message Date
Kevin Granger
dc29fae59d // reorganize some css and stuff on backward compatibility 2013-11-20 16:24:01 +01:00
Kevin Granger
369ac0f664 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl
2013-11-18 15:13:04 +01:00
Jerome Nadaud
2ba5dc18fd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
Jerome Nadaud
46dc93fd7e // Adding update button on to page header toolbar on module 2013-11-18 14:41:49 +01:00
Kevin Granger
73ec191fb0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl
2013-11-18 10:23:23 +01:00
rGaillard
8c3eb9b9a4 // typo 2013-11-15 21:03:17 +01:00
Jerome Nadaud
18a2e026ef // Adding more buttons to module configuration 2013-11-14 15:49:17 +01:00
Kevin Granger
a0f73d20e5 // backward compatibility remix WIP 2013-11-13 20:11:22 +01:00
Jerome Nadaud
97824b2335 // License 2013-10-07 12:02:51 +02:00
Kevin Granger
4c92db8912 // Modules position 2013-08-27 19:08:53 +02:00