Kevin Granger 8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php

2013-09-30 11:01:23 +02:00

..

classes

//MERGE branche release

2013-08-26 10:59:36 +02:00

controllers

[*] Installer : added file check in order to check if everyhting has been successfuly uploaded

2013-09-20 11:09:22 +02:00

data

[+] BO : Added new class ConfigurationKPI for KPI cache storage

2013-09-18 15:09:04 +02:00

dev

// Installer can be translated at /install-dev/dev/translate.php

2013-02-27 14:53:51 +01:00

fixtures

[+] TR: Created file structure for Dutch installer

2013-07-19 15:34:10 +00:00

langs

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-09-30 11:01:23 +02:00

models

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-09-30 11:01:23 +02:00

theme

// Updated installer

2013-08-06 15:53:59 +02:00

upgrade

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-09-30 11:01:23 +02:00

index_cli.php

// small changes on php cli installer

2013-04-02 17:28:45 +02:00

index.php

[-] Installer : added ob_start() (required with the cookie mode when debug mode is activated)

2013-08-19 10:04:23 +02:00

init.php

[-] Installer : added ob_start() (required with the cookie mode when debug mode is activated)

2013-08-19 10:04:23 +02:00

install_version.php

//new install version for gamification & bootstrap compatibility

2013-09-04 23:16:56 +02:00