Kevin Granger
|
9eefcfd058
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/modules.css
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/Autoload.php
classes/Carrier.php
classes/Product.php
classes/ProductSale.php
classes/Tools.php
classes/Validate.php
classes/tax/TaxRulesTaxManager.php
controllers/admin/AdminPPreferencesController.php
controllers/admin/AdminPerformanceController.php
install-dev/install_version.php
js/admin_carrier_wizard.js
modules/blockcategories/blockcategories.php
modules/blocklayered/blocklayered.php
modules/statsequipment/statsequipment.php
modules/statsproduct/statsproduct.php
modules/watermark/watermark.php
themes/default/address.tpl
themes/default/authentication.tpl
themes/default/category.tpl
themes/default/contact-form.tpl
themes/default/css/history.css
themes/default/header.tpl
themes/default/js/cart-summary.js
themes/default/js/product.js
themes/default/mobile/order-detail.tpl
themes/default/modules/blocksearch/blocksearch.tpl
themes/default/modules/productcomments/productcomments.tpl
themes/default/order-carrier.tpl
themes/default/order-detail.tpl
themes/default/order-opc-new-account.tpl
themes/default/product.tpl
|
2013-11-21 17:43:51 +01:00 |
|
Rémi Gaillard
|
b5eb7c5c28
|
// typo
|
2013-11-12 16:25:13 +01:00 |
|
fram
|
ab730dc3da
|
// do not use sprintf when it is useless
|
2013-11-12 09:21:05 +01: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
|
5bafd9c6be
|
[-] Installer : Fixed languages parsing
|
2013-02-27 17:56:47 +01:00 |
|
Damien Metzger
|
479e8dc17d
|
[-] Installer : Fixed languages parsing
|
2013-02-27 17:56:47 +01:00 |
|
François Gaillard
|
064ba453e6
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
Francois Gaillard
|
8baf87eef5
|
// 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 |
|
vAugagneur
|
be946319be
|
//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
|
6588f9514c
|
// 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 |
|
lLefevre
|
398d345362
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 06:18:59 +00:00 |
|
rMalie
|
fe451a0b6b
|
// Set a default country/timezone in installer, checking HTTP_ACCEPT_LANGUAGE #PSTEST-890
|
2012-02-29 09:02:36 +00:00 |
|
rMalie
|
c402fbc7e2
|
// Set a default country/timezone in installer, checking HTTP_ACCEPT_LANGUAGE #PSTEST-890
|
2012-02-29 09:02:36 +00:00 |
|
rMalie
|
14e6929565
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
rMalie
|
1dc629a949
|
// Welcome 2012²
|
2012-02-23 16:33:10 +00:00 |
|
mMarinetti
|
1c288bf01d
|
// Welcome 2012
|
2012-02-22 09:28:22 +00:00 |
|
mMarinetti
|
677a4e485c
|
// Welcome 2012
|
2012-02-22 09:28:22 +00:00 |
|
rMalie
|
0d721a87b1
|
// Remove useless code in installer
|
2012-02-21 13:29:05 +00:00 |
|
rMalie
|
f9713c3a3a
|
// Remove useless code in installer
|
2012-02-21 13:29:05 +00:00 |
|
rMalie
|
f4da55d46b
|
// Fix lanuage informations in installer
|
2012-02-03 15:41:40 +00:00 |
|
rMalie
|
43029b6e70
|
// Fix lanuage informations in installer
|
2012-02-03 15:41:40 +00:00 |
|
mMarinetti
|
d67186f592
|
// install-new renamed to install-dev
|
2012-01-26 17:35:54 +00:00 |
|
mMarinetti
|
c6376aa861
|
// install-new renamed to install-dev
|
2012-01-26 17:35:54 +00:00 |
|