855c8a8de4
// add 2 useful hooks
2013-11-07 18:33:49 +01:00
8cb761078b
// English
2013-11-07 12:26:55 +00:00
f83c50b264
// one is one
2013-11-07 11:08:15 +00:00
211c36c7a3
improved scss variables
2013-11-06 15:41:00 +02:00
1dd919addf
// no need mobile version with responsive :)
2013-11-05 19:15:24 +01:00
9f1911eeca
// Fixed shopping cart line reduction
2013-11-05 16:41:50 +01:00
4a6cb5075e
Merge pull request #924 from TMMeilleur/bootstrap
...
// Update default theme
2013-11-05 07:36:14 -08:00
0ffa6ab059
update 5.11.13
2013-11-05 17:27:57 +02:00
21209d799f
update 5.11.13
2013-11-05 17:17:26 +02:00
9bc5a52925
Merge pull request #916 from PrestaEdit/patch-58
...
[-] FO: use 4 images in thumbnails, not 3
2013-11-05 06:20:59 -08:00
55cd7c4c34
update 05.11.13
2013-11-05 11:35:24 +02:00
569455a7ff
// fix on front validators
2013-11-04 19:26:51 +01:00
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
c7323c2bfe
[-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities
2013-11-03 22:59:04 +01:00
930c9f3ff5
// validators
2013-11-02 10:50:02 +01:00
5db9c5cdd5
// small fix
2013-11-02 09:54:37 +01:00
d4075f1267
[-] FO: use 4 images in thumbnails, not 3
2013-10-31 23:06:19 +01:00
a1696efe63
// small fix
2013-10-31 18:40:29 +01:00
8670db2316
// Image sizes
2013-10-31 17:41:02 +01:00
343c9578da
// Better
2013-10-31 17:15:30 +01:00
23e4e1badb
// I forgot the link
2013-10-31 17:10:15 +01:00
6c8e70f780
[*] FO : added "back to search results" the the product page
2013-10-31 15:32:52 +01:00
f565b273d8
// Reverting the revert
2013-10-31 15:13:46 +01:00
68a98b29a6
tm theme
2013-10-31 15:51:25 +02:00
ff2954b1d2
[*] FO : Changed category block behavior inside categories
2013-10-31 12:20:59 +01:00
036fa7cba6
[-] FO : Fix bug #PSCFV-10889 wrong color when oos product
2013-10-31 10:18:28 +01:00
7c1623c7fa
[-] BO : Order-follow displayed order id instead of order reference
2013-10-29 14:53:50 +01:00
0ba8fbc39a
Update stores.js
...
Phone number is already in the address field
2013-10-28 13:46:42 -04:00
63141a9c4d
[-] FO: fixed bug #PSCFV-10654 - TinyMCE editor: List of products by manufacturer, products by supplier - Long description is not hidden.
2013-10-28 14:48:48 +01:00
e1d1479f22
[*] FO : Fix bug #PSCFV-10689 handle image legend
2013-10-27 23:31:36 +01:00
9a26cf02a8
Turned "true" and "false" strings to proper booleans
...
It's cleaner this way, and matches how it is done on similar templates.
2013-10-25 16:36:39 +02:00
6f57093f50
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
2013-10-24 18:36:36 +02:00
2ffc296279
FO : https://github.com/PrestaShop/PrestaShop/pull/878
2013-10-24 12:03:33 +02:00
81945cef71
[-] FO : Follow up https://github.com/PrestaShop/PrestaShop/pull/879
2013-10-24 10:00:19 +02:00
6d3640e895
Conditions to hide VAT fields fail if there are no company fields
...
"Company" fields may or may not be rendered on this form, whereas "VAT" fields are always rendered and depend on the former ones to be shown (or hidden) with CSS.
This fixes an edge case where there are no "Company" fields rendered and "VAT" fields still wrongly appear, which was caused by the fact that `$('#field').val() != ''` is truthy when `$('#field').length` is zero (since `'' != undefined`).
2013-10-24 09:43:50 +02:00
69d5cb4ccd
[+] FO : New Responsive, Bootstrap template
2013-10-23 16:56:02 +02:00
373604fc97
[-] FO: removed width on message product select
...
Limiting select could make the user think the select is not working if they click to much to the left on bigger screens
2013-10-23 11:52:35 +02:00
101b37b40a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-23 11:45:26 +02:00
ad4ecefcf9
[-] FO : Prevent fatal error on getUniqReference when order not loaded
2013-10-23 11:44:12 +02:00
5bb4d48ddd
Merge pull request #870 from djfm/development
...
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-22 10:17:11 -07:00
e857fb5978
[*] FO: Removed missplaced </li> on mobile theme
2013-10-22 13:34:52 +02:00
aefa821d7f
[*] MO : TM - Blockcart added Layer
2013-10-21 16:55:47 +02:00
c9d20f35b3
// norms
2013-10-21 00:00:17 +02:00
f2d70076bd
[-] : Fix bug #PSCFV-4859, could not register invoice address or invoice country in OPC as guest, and phone not required in standard registration
2013-10-20 23:52:48 +02:00
6b1d69dd7d
[-] FO : $back value twice escaped
2013-10-17 12:18:23 +02:00
62aaf16d60
[*] FO : New hooks for home tabs
2013-10-16 11:44:55 +02:00
80f6f4e223
[-] FO : Fix bug #PSCFV-10688, bad priceDisplay in order-carrier
2013-10-14 15:34:47 +02:00
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
5e407db21e
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-14 09:30:45 +00:00
9e3b82e8ed
[*] BO Module productcomments: JS variables are correctly escaped. Padding in error message has also been pushed to theme tpl
2013-10-11 16:37:26 +02:00
Rémi Gaillard