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

Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	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/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php

2013-10-14 12:21:29 +02:00

..

classes

[*] Installer : replaced radio buttons by a select for the installer language list (too many languages)

2013-10-08 17:06:02 +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

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

2013-10-14 12:21:29 +02:00

dev

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

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

fixtures

// default perms profiles

2013-10-07 12:13:59 +02:00

langs

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

2013-10-14 12:21:29 +02:00

models

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

2013-10-14 12:21:29 +02:00

theme

// Updated languages in the installer

2013-10-10 09:47:10 +02:00

upgrade

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

2013-10-14 12:21:29 +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

// Changelog 1.5.6.0

2013-10-07 18:07:25 +02:00