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 |
|
Rémi Gaillard
|
a0f4eab4c1
|
// typo
|
2013-10-30 15:40:40 +01:00 |
|
gRoussac
|
9ef10ee806
|
[-] IN : Handle RC PHP_VERSION
|
2013-10-30 15:03:07 +01:00 |
|
Damien Metzger
|
e9a802cf23
|
[*] BO : Added the number of associated products in the product attachments list
|
2013-10-25 18:04:27 +02:00 |
|
Damien Metzger
|
218ce59de6
|
[-] Installer : added ob_start() (required with the cookie mode when debug mode is activated)
|
2013-08-19 10:04:23 +02:00 |
|
Rémi Gaillard
|
de965867c8
|
[-] Installer: force magic_quote_runtime to 0
|
2013-02-01 10:50:29 +01:00 |
|
François Gaillard
|
064ba453e6
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
vAugagneur
|
a1db83ef41
|
//remove svn keyword @version Release: $
|
2012-11-22 11:57:40 +01:00 |
|
lLefevre
|
779cf350af
|
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 09:29:43 +00:00 |
|
lLefevre
|
046b51ab99
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 06:18:59 +00:00 |
|
dMetzger
|
7b4ddb6a4c
|
[-] Installer : removed calls to Tools in installer (replace by local function) #PSCFV-4113
|
2012-09-20 09:49:41 +00:00 |
|
vAugagneur
|
9c936ba2cc
|
//now PrestaShop need at least PHP 5.1.3 to run
|
2012-05-25 06:53:32 +00:00 |
|
vAugagneur
|
9a9a05b04c
|
//oups
|
2012-05-16 13:46:16 +00:00 |
|
rMalie
|
a90e8a9809
|
// Fix timezone issues in installer
|
2012-02-28 13:28:29 +00:00 |
|
rMalie
|
fb083bf912
|
// Fix base uri in installer
|
2012-02-28 12:17:06 +00:00 |
|
rMalie
|
14e6929565
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
mMarinetti
|
1c288bf01d
|
// Welcome 2012
|
2012-02-22 09:28:22 +00:00 |
|
dMetzger
|
b0711c3202
|
[-] Installer : set_time_limit is set to infinite then set to 300 seconds... Second one changed.
|
2012-02-14 08:25:38 +00:00 |
|
rMalie
|
1fa7d4691f
|
// Installer can work with 18MO (under 32MO sub ajax queries are triggered)
|
2012-02-09 15:37:48 +00:00 |
|
rMalie
|
1503bc49f6
|
// Change required version to php 5.1.2 in installer
|
2012-02-07 10:18:46 +00:00 |
|
rMalie
|
5aeb8d6e1e
|
// Remove reference to install-new
|
2012-01-27 09:40:53 +00:00 |
|
mMarinetti
|
d67186f592
|
// install-new renamed to install-dev
|
2012-01-26 17:35:54 +00:00 |
|