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 |
|
djfm
|
b6bba0c787
|
[*] LO : Removed 'Miss' from the default genders because too country specific
|
2013-10-07 07:53:19 +00:00 |
|
Vincent Augagneur
|
5564b342f4
|
//wizard boostrap and title fix
|
2013-10-04 17:07:10 +02:00 |
|
Damien Metzger
|
a6d8ffa293
|
// More breadcrumbs improvements
|
2013-09-30 15:38:22 +02:00 |
|
Damien Metzger
|
17618efb8b
|
// Fixed details
|
2013-08-27 15:27:51 +02:00 |
|
Vincent Augagneur
|
0cd6c5b200
|
//new tab name for carrier option
|
2013-08-12 17:32:55 +02:00 |
|
djfm
|
2f6a53f971
|
[+] TR: Created file structure for Dutch installer
|
2013-07-19 15:34:10 +00:00 |
|