fram
|
5f1efc6b63
|
// installer typography
|
2013-11-04 16:20:10 +01:00 |
|
Kevin Granger
|
889a2006ec
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/customer_threads/message.tpl
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/favorites.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/associations.tpl
admin-dev/themes/default/template/controllers/products/combinations.tpl
admin-dev/themes/default/template/controllers/products/images.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/referrers/helpers/view/view.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/ProductSale.php
classes/helper/HelperList.php
controllers/admin/AdminCmsController.php
controllers/admin/AdminCustomersController.php
controllers/admin/AdminMetaController.php
controllers/admin/AdminModulesController.php
controllers/admin/AdminPerformanceController.php
controllers/admin/AdminProductsController.php
controllers/front/ParentOrderController.php
install-dev/theme/views/welcome.phtml
modules/blocknewproducts/blocknewproducts.php
modules/blocktopmenu/blocktopmenu.php
modules/importerosc/importerosc.php
modules/mailalerts/mailalerts.php
modules/shopimporter/shopimporter.php
modules/statsstock/statsstock.php
themes/default/css/product_list.css
|
2013-11-04 14:43:01 +01:00 |
|
djfm
|
a8a204edf3
|
// small correction in English installer text
|
2013-10-31 08:25:57 +00:00 |
|
djfm
|
11f60492be
|
// removed unnecessary punctuation in English installer strings, both in source code and translations
|
2013-10-31 08:09:14 +00:00 |
|
djfm
|
c958436a76
|
// Dutch installer translations
|
2013-10-30 17:26:22 +00:00 |
|
djfm
|
16efe89bed
|
// improved installer translations: no colons in translations and filled some missing fields
|
2013-10-30 16:57:30 +00:00 |
|
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 |
|
Damien Metzger
|
d783160af0
|
// Updated installer
|
2013-08-06 15:53:59 +02:00 |
|
djfm
|
28c0ef2b7d
|
// added a few translations to NL installer
|
2013-07-30 13:07:14 +00:00 |
|
djfm
|
939f7d7770
|
//most of the translation of the NL installer is done
|
2013-07-22 17:09:26 +00:00 |
|
djfm
|
2f6a53f971
|
[+] TR: Created file structure for Dutch installer
|
2013-07-19 15:34:10 +00:00 |
|