e3f3f8a58f
//oups
2013-11-26 10:25:03 +01:00
690b6b160a
//small js fix
2013-11-26 10:24:19 +01:00
d9e53486a0
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-25 17:56:11 +01:00
a0373eed7a
[-] MO : Dateofdelivery Fix bug #PNM-1773 when a product has an available date
2013-11-25 17:39:46 +01:00
0e3504f3b3
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-25 17:17:15 +01:00
fae1fd58a9
// tweak on switch + admin import
2013-11-25 17:16:59 +01:00
89f794ae5e
// Missing Typo
2013-11-25 17:09:08 +01:00
90d3dff381
[-] MO : Bug fix - Blockwishlist, Product image link in BO
2013-11-25 12:12:57 +01:00
5afde2163b
[+] MO : Add name value when hover color in blocklayered.tpl - Thanks @codeurWeb
2013-11-25 11:10:42 +01:00
d1c9ec8e09
// Changing Typo preserving backward compatibility
2013-11-25 11:02:40 +01:00
bc083ece83
// Manual merge from development branch
2013-11-25 10:25:32 +01:00
1337407131
Merge pull request #1019 from djfm/translations
...
Translations
2013-11-22 09:12:55 -08:00
0716ae1afc
Merge pull request #1018 from indesign47/patch-15
...
[-] MO : bankwire add translation for fields
2013-11-22 09:10:35 -08:00
94242412f2
[-] MO : cheque add translation for fields
2013-11-22 18:02:48 +01:00
01d6d7c279
// clearer message
2013-11-22 16:32:54 +00:00
dabc3d359a
[-] MO : bankwire add translation for fields
2013-11-22 17:30:37 +01:00
1c6a58c902
// English
2013-11-22 16:16:59 +00:00
a3e84a33f7
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-22 09:50:05 +01:00
c095d8f1ca
[-] Core : fixed smarty escape htmlall > html
2013-11-22 09:47:15 +01:00
ee98947e6b
// manual merg of https://github.com/PrestaShop/PrestaShop/commit/0bc1d214324b01606cf08df6a38a51949fc253b7 and
2013-11-21 18:59:28 +01:00
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
931f309b45
// removed superfluous mail files
2013-11-21 10:26:02 +01:00
033bf745cd
Merge pull request #1000 from studiokiwik/sk-ps15x-011
...
"---<br />" string is now removed correctly from the end of customization data text
2013-11-21 00:14:28 -08:00
a536833f52
// Some bootstrap changes in controllers
2013-11-20 18:44:20 +01:00
f58018b6e4
fixes for compatibility
2013-11-20 19:31:17 +02:00
01428f9a31
added all themes for themeconfigurator
2013-11-20 19:25:12 +02:00
a3282025cf
//referralprogram retro compat 1.5 when using helper form in module configuration
2013-11-20 18:05:56 +01:00
6ec8e4e70e
mailalerts retro compat 1.5 when using helper form in module configuration
2013-11-20 17:57:58 +01:00
64cfe559f1
//loyalty retro compat 1.5 when using helper form in module configuration
2013-11-20 17:56:11 +01:00
4cc99ed9b6
// more image fixes
2013-11-20 16:33:34 +01:00
2d60a95fc3
// Fixed slider image
2013-11-20 16:32:14 +01:00
0ff7163cba
Adding a position order by clause.
...
Adding a position order by clause. This way you can manage how the featured products will display on home page. You can manage the order from the PrestaShop backend, and thus you have full control on the display in the frontend.
2013-11-20 20:56:35 +05:30
0410378bd3
"---<br />" string is now removed correctly from the end of customization data text
2013-11-20 13:30:47 +01:00
61b1dd338e
// Update blockbestsellers
2013-11-20 10:28:39 +01:00
60be5a7989
// themeconfigurator fix
2013-11-18 23:56:19 +01:00
e99332c012
// Pics
2013-11-18 22:55:17 +01:00
b2c656e51a
// small font fix
2013-11-18 22:32:33 +01:00
639a56421a
// Themeconfigurator
2013-11-18 22:16:26 +01:00
fb0118e456
Merge pull request #996 from TMMeilleur/bootstrap
...
replace new css files location to modules/themeconfigurator/css
2013-11-18 11:53:22 -08:00
f2b5e6de51
// Themeconfigurator and homeslider
2013-11-18 20:49:52 +01:00
f4560d0899
// Install
2013-11-18 20:35:42 +01:00
a2e1d5ad90
// Fix blockcategory install with new fixtures
2013-11-18 19:29:13 +01:00
4f2ef4a638
// Update fixture in blockcms
2013-11-18 19:26:30 +01:00
a3e1fdb690
// Install
2013-11-18 19:22:10 +01:00
b6c5cd7c63
replace new css files location to modules/themeconfigurator/css
2013-11-18 20:07:24 +02:00
7755cd8d3e
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-18 17:46:20 +01:00
57b329ca74
// Remove other fonts
2013-11-18 17:46:05 +01:00
9197498c3c
// delete useless module
2013-11-18 17:45:53 +01:00
c14b9e619d
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
modules/themeconfigurator/themeconfigurator.php
2013-11-18 17:21:41 +01:00
938ef4fe39
// small fix
2013-11-18 17:12:35 +01:00
Vincent Augagneur