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
|
11f60492be
|
// removed unnecessary punctuation in English installer strings, both in source code and translations
|
2013-10-31 08:09:14 +00:00 |
|
Damien Metzger
|
79b0a571c0
|
// Updated languages in the installer
|
2013-10-10 09:47:10 +02:00 |
|
Damien Metzger
|
180a778e51
|
[*] Installer : replaced radio buttons by a select for the installer language list (too many languages)
|
2013-10-08 17:06:02 +02:00 |
|
Damien Metzger
|
d783160af0
|
// Updated installer
|
2013-08-06 15:53:59 +02:00 |
|
Damien Metzger
|
6a155d8762
|
[*] Installer : installer improvements - Step 1
|
2013-02-21 11:05:47 +01:00 |
|
Rémi Gaillard
|
a994efc0f1
|
// small fix
|
2013-02-13 11:32:02 +01:00 |
|
Damien Metzger
|
d0397b5cbe
|
// Fixed label in install
|
2013-02-01 18:47:25 +01:00 |
|
Damien Metzger
|
bed1e7c259
|
// Changed number of languages
|
2013-02-01 17:48:24 +01:00 |
|
Damien Metzger
|
fa92819038
|
// Installer / small fix
|
2013-02-01 17:47:52 +01:00 |
|
Damien Metzger
|
61b15f35be
|
// A few changes in the installation wizard
|
2013-02-01 17:47:51 +01:00 |
|
Rémi Gaillard
|
2652130ca4
|
// typo fix
|
2013-01-21 18:42:56 +01:00 |
|
vAugagneur
|
e13ddb6f90
|
[-] INSTALLER : fixed bug #PSCFV-2751 - Prestashop 1.5 needs more than 32MB for PHP memory_limit but it is not tested at setup
|
2012-06-11 07:28:44 +00:00 |
|
lLefevre
|
0b3df85bb8
|
// Fix the alert message in installer when updated
|
2012-06-06 17:23:21 +00:00 |
|
rMalie
|
55496b95b4
|
// Add a warning in welcome page for installer if use has already a previous version of PrestaShop installed #PSCFV-2161
|
2012-06-04 09:45:52 +00:00 |
|
vAugagneur
|
9a9a05b04c
|
//oups
|
2012-05-16 13:46:16 +00:00 |
|
vAugagneur
|
3dce026331
|
//no die if memory_limit is not detected or lower than 16M but display a big warn
|
2012-05-16 13:40:36 +00:00 |
|
bMancone
|
9091519827
|
// Installer: Fixed #PSFV-727 (Issues #1, #2, #3)
|
2012-04-05 08:13:42 +00:00 |
|
rMalie
|
b87dbce42b
|
// French translation of installer
|
2012-02-07 15:48:25 +00:00 |
|
rMalie
|
eedc04461b
|
// W3C compatibility on installer
|
2012-02-03 16:02:16 +00:00 |
|
jBreux
|
63e883e16f
|
// Fix scrolling
|
2012-01-26 18:00:03 +00:00 |
|
mMarinetti
|
d67186f592
|
// install-new renamed to install-dev
|
2012-01-26 17:35:54 +00:00 |
|