gRoussac
|
620441997c
|
[-] CORE : No Exception when CONTENT_LENGTH is no set
|
2013-11-25 16:05:07 +01:00 |
|
ccauw
|
eb312455e5
|
[-] BO : Double separator in function createTemplate()
smarty->getTemplateDir() returns a result ending with a separator,
so no need to add DIRECTORY_SEPARATOR ?
|
2013-11-25 14:19:21 +01:00 |
|
Jerome Nadaud
|
3fe6608a62
|
// Include datetime picker for all admin controllers
|
2013-11-22 16:41:52 +01:00 |
|
Damien Metzger
|
db1c3c22fd
|
[-] BO : Cart rules optimization / Attempt to fix #PSCFV-8895 (need to be double-checked)
|
2013-11-22 15:59:52 +01:00 |
|
Damien Metzger
|
40d15416c5
|
[-] FO : exclude external css from CCC #PSCFV-10839
|
2013-11-22 14:37:27 +01:00 |
|
gRoussac
|
dd79348748
|
[-] BO : getCartsRuleByCode should be retrocompatible
|
2013-11-22 11:40:47 +01:00 |
|
Damien Metzger
|
3a02d6f281
|
[-] BO : Fixed potential errors with untranslated admin tabs #PSCFV-8104
|
2013-11-21 17:46:28 +01:00 |
|
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 |
|
Damien Metzger
|
9c5303df1d
|
// Deactivate customer groups in the install (automatically reactivated if you add a group or set a reduction)
|
2013-11-21 14:57:55 +01:00 |
|
Damien Metzger
|
26b90d5670
|
[*] FO : Added the possibility to deactivate customer groups management (for performances) [part 2]
|
2013-11-21 14:44:00 +01:00 |
|
gRoussac
|
d6e52bdecb
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-11-21 14:20:00 +01:00 |
|
gRoussac
|
3ab28374e6
|
[-] BO : Remove warning with open_basdir on module list
|
2013-11-21 14:17:55 +01:00 |
|
Damien Metzger
|
9f1c39a7d6
|
[*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1]
|
2013-11-21 12:32:51 +01:00 |
|
Fabio Chelly
|
5f47526ed2
|
[-] FO : Fixed bug #PSCFV-11076
|
2013-11-21 12:13:30 +01:00 |
|
fram
|
5a9bb5106f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-21 10:16:47 +01:00 |
|
fram
|
64e84ff296
|
// when adding a translation pack, do not install translations for modules that are not on the disk
|
2013-11-20 17:35:09 +01:00 |
|
Damien Metzger
|
63f2082da3
|
[-] FO : fixed tax rules cache
|
2013-11-20 16:49:48 +01:00 |
|
Damien Metzger
|
8d0b1e9602
|
[*] BO : Added combination ean13 in the backend search #PSCFV-10436
|
2013-11-20 16:30:25 +01:00 |
|
Quentin Montant
|
0410378bd3
|
"---<br />" string is now removed correctly from the end of customization data text
|
2013-11-20 13:30:47 +01:00 |
|
Quentin Montant
|
1508a8a5d7
|
"---<br />" string is now removed correctly from the end of customization data text
|
2013-11-20 11:31:02 +01:00 |
|
Kevin Granger
|
3580dc016a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-18 23:46:48 +01:00 |
|
Damien Metzger
|
f4560d0899
|
// Install
|
2013-11-18 20:35:42 +01:00 |
|
Rémi Gaillard
|
f4194bedd9
|
Merge pull request #978 from StanProg/bootstrap
// FO : Removed unused local variable, tabs added, phpdoc tags
|
2013-11-18 06:27:46 -08:00 |
|
TMMeilleur
|
95b9710eda
|
fixed add to wishlist/compare buttons and added product review
|
2013-11-18 15:52:39 +02:00 |
|
gRoussac
|
4771746959
|
[-) FO : Fix bug #PSCFV-10926, trailing question mark in pagination url
|
2013-11-18 12:26:08 +01:00 |
|
rGaillard
|
bd241a9c48
|
[-] BO: product price was changed on changing to advanced stock management #PSCFV-10996
|
2013-11-18 12:04:09 +01:00 |
|
Kevin Granger
|
73ec191fb0
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/modules/configure.tpl
|
2013-11-18 10:23:23 +01:00 |
|
Jerome Nadaud
|
11296fe464
|
// Small Fix in truncateString function
|
2013-11-18 09:55:21 +01:00 |
|
Gregory Roussac
|
21319ca32c
|
Merge pull request #988 from dlage/fix_jquery_ui_autocomplete
[-] Project : missing ui.menu in jquery_ui_dependencies.
|
2013-11-17 14:44:47 -08:00 |
|
gRoussac
|
cef406aef2
|
[*] FO : DNI can be not required
|
2013-11-17 23:35:56 +01:00 |
|
|
|
692643d7d6
|
[-] Project : missing ui.menu in jquery_ui_dependencies.
|
2013-11-16 17:42:54 +00:00 |
|
gRoussac
|
7f02c8ca58
|
[-] WS: Fix bug #PSCFV-10970 use configuration for uploaded images quality
|
2013-11-15 18:50:28 +01:00 |
|
Jerome Nadaud
|
8d90578cf7
|
// Add anchor to list
|
2013-11-15 16:04:27 +01:00 |
|
gRoussac
|
2962141d51
|
[-] BO : Fix warning when no memcached servers
|
2013-11-15 15:39:00 +01:00 |
|
Jerome Nadaud
|
44f89053e4
|
// Invoice search fix
|
2013-11-15 15:00:56 +01:00 |
|
gRoussac
|
6a690b255b
|
[-] BO : Model return html error messagae instead of json while image uploading
|
2013-11-15 12:20:10 +01:00 |
|
Jerome Nadaud
|
50eee795ed
|
// Add truncate category description preserving html tags
|
2013-11-15 11:03:06 +01:00 |
|
gRoussac
|
0b47ef1b3b
|
[-] BO : test on xml string follow up https://github.com/PrestaShop/PrestaShop/pull/690#issuecomment-28542506
|
2013-11-15 10:51:46 +01:00 |
|
Jerome Nadaud
|
80957666cf
|
// Hide collapse and expand button when not necessary
|
2013-11-14 19:21:31 +01:00 |
|
Stanislav Yordanov
|
c5b1834870
|
[*] FO : Removed unused local variable, phpdoc return tag added
|
2013-11-14 19:22:39 +02:00 |
|
gRoussac
|
d06bf10bbb
|
[-] FO : Fix bug #PSCFV-10911, doubles in cart rules highlight
|
2013-11-14 16:35:11 +01:00 |
|
gRoussac
|
d0d234f555
|
// typo, sorry about this
|
2013-11-14 15:58:42 +01:00 |
|
Jerome Nadaud
|
18a2e026ef
|
// Adding more buttons to module configuration
|
2013-11-14 15:49:17 +01:00 |
|
Stanislav Yordanov
|
e7e514dc77
|
Removed unused local variable, tab added, phpdoc tags fixed
|
2013-11-14 16:41:08 +02:00 |
|
Kevin Granger
|
a0f73d20e5
|
// backward compatibility remix WIP
|
2013-11-13 20:11:22 +01:00 |
|
Jerome Nadaud
|
afaeb15b7d
|
// Define default template dir on tree class
|
2013-11-13 20:10:13 +01:00 |
|
Francois Gaillard
|
c9a2410c57
|
[-] Classes : AdminController - Changed admin-theme.css position
|
2013-11-13 17:48:21 +01:00 |
|
Rémi Gaillard
|
fa3aa8c9d7
|
// strict standard
|
2013-11-13 15:46:06 +01:00 |
|
Rémi Gaillard
|
f4601d9680
|
// default form language
|
2013-11-13 15:37:58 +01:00 |
|
Rémi Gaillard
|
899dea47a1
|
// oups
|
2013-11-13 15:32:56 +01:00 |
|
