 indesign47
|
dabc3d359a
|
[-] MO : bankwire add translation for fields
|
2013-11-22 17:30:37 +01:00 |
|
|
Jerome Nadaud
|
a620c5044f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-22 16:42:09 +01:00 |
|
|
Jerome Nadaud
|
3fe6608a62
|
// Include datetime picker for all admin controllers
|
2013-11-22 16:41:52 +01:00 |
|
|
rGaillard
|
88ad2010d6
|
// add padding and margin to automplete width #PSCFV-5876
|
2013-11-22 16:41:25 +01:00 |
|
|
Damien Metzger
|
361450aab9
|
// Fixed entities on KPIs
|
2013-11-22 16:15:48 +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 |
|
|
Rémi Gaillard
|
45525dac71
|
Merge pull request #1017 from TMMeilleur/bootstrap
// fixes for cross-browser compability
|
2013-11-22 05:50:37 -08:00 |
|
|
Damien Metzger
|
40d15416c5
|
[-] FO : exclude external css from CCC #PSCFV-10839
|
2013-11-22 14:37:27 +01:00 |
|
|
TMMeilleur
|
2376dd404f
|
fixes for cross-browser compability
|
2013-11-22 14:55:48 +02:00 |
|
|
Jérôme Nadaud
|
0a7ea9b124
|
Merge pull request #1016 from wfpaisa/patch-1
Update AdminPPreferencesController.php
|
2013-11-22 04:28:59 -08:00 |
|
|
Felipe Uribe
|
5113125a0d
|
Update AdminPPreferencesController.php
Falta coma:
),
'PS_DISPLAY_DISCOUNT_PRICE' => array(
|
2013-11-22 07:23:09 -05:00 |
|
|
Rémi Gaillard
|
70180f10d4
|
Merge pull request #1014 from indesign47/patch-13
[-] FO : header add translation for fields
|
2013-11-22 03:08:04 -08:00 |
|
|
gRoussac
|
dd79348748
|
[-] BO : getCartsRuleByCode should be retrocompatible
|
2013-11-22 11:40:47 +01:00 |
|
|
indesign47
|
6164a0d42c
|
[-] FO : header add translation for fields
|
2013-11-22 11:37:30 +01:00 |
|
|
gRoussac
|
f7d4dc979f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-22 11:33:00 +01:00 |
|
|
Damien Metzger
|
a3e84a33f7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-22 09:50:05 +01:00 |
|
|
Damien Metzger
|
c095d8f1ca
|
[-] Core : fixed smarty escape htmlall > html
|
2013-11-22 09:47:15 +01:00 |
|
|
gRoussac
|
ee98947e6b
|
// manual merg of https://github.com/PrestaShop/PrestaShop/commit/0bc1d214324b01606cf08df6a38a51949fc253b7 and
|
2013-11-21 18:59:28 +01:00 |
|
|
Damien Metzger
|
47531534fc
|
// Updated Addons API call in the search
|
2013-11-21 18:34:42 +01:00 |
|
|
Kevin Granger
|
f7ad627b4d
|
// fix pagination Tax Rules Group
|
2013-11-21 18:28:25 +01:00 |
|
|
Damien Metzger
|
d89db6de45
|
// Fixed warning
|
2013-11-21 17:46:29 +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
|
5976a471a7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-21 17:43:59 +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
|
8bdc6c9a51
|
[*] FO : Added getCategory getter in ProductController #PSCFV-8408
|
2013-11-21 16:01:50 +01:00 |
|
|
Kevin Granger
|
6431f559d7
|
// tree header improvement WIP
|
2013-11-21 15:01:54 +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 |
|
|
Jerome Nadaud
|
794f729c5d
|
// Show more info content if <= 4
|
2013-11-21 12:23:54 +01:00 |
|
|
Kevin Granger
|
b10d50ef09
|
// fixs on horizontal nav + add icon on footer links
|
2013-11-21 12:15:21 +01:00 |
|
|
Fabio Chelly
|
5f47526ed2
|
[-] FO : Fixed bug #PSCFV-11076
|
2013-11-21 12:13:30 +01:00 |
|
|
Jerome Nadaud
|
9229d6cb52
|
// Features and attributes title and buttons
|
2013-11-21 12:10:15 +01:00 |
|
|
Jerome Nadaud
|
2e16a1e5d4
|
// Better products attributes list button handle
|
2013-11-21 11:25:09 +01:00 |
|
|
Jerome Nadaud
|
fbe7f236cb
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-21 11:06:21 +01:00 |
|
|
Jerome Nadaud
|
d49f29f79d
|
// Remove subtitle from orders view
|
2013-11-21 11:06:08 +01:00 |
|
|
Kevin Granger
|
a6e1309a33
|
Merge pull request #1008 from djfm/cleanup
// removed superfluous mail files
|
2013-11-21 01:41:15 -08:00 |
|
|
fram
|
931f309b45
|
// removed superfluous mail files
|
2013-11-21 10:26:02 +01:00 |
|
|
Jerome Nadaud
|
89f400d3fc
|
// Remove unnecessary button from shipping options
|
2013-11-21 10:12:53 +01:00 |
|
|
Jerome Nadaud
|
24daa6fa05
|
// Changing add new title button label
|
2013-11-21 10:04:03 +01:00 |
|
|
Vincent Augagneur
|
d2c600a5e3
|
//updated .gitignore
|
2013-11-21 09:51:22 +01:00 |
|
|
Jerome Nadaud
|
0b47dbca21
|
// Adding footer to customer requiered fields
|
2013-11-21 09:46:27 +01:00 |
|
|
Jerome Nadaud
|
2df142eb89
|
// Align actions button in customner view
|
2013-11-21 09:35:44 +01:00 |
|
|
Jérôme Nadaud
|
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 |
|
|
Kevin Granger
|
d4afcec83f
|
Merge pull request #1005 from djfm/css
// adjust markup in AdminTranslationsController
|
2013-11-20 12:10:22 -08:00 |
|
|
Kevin Granger
|
104ae93936
|
// tweak nav sidebar
|
2013-11-20 19:25:11 +01:00 |
|
|
Jerome Nadaud
|
a536833f52
|
// Some bootstrap changes in controllers
|
2013-11-20 18:44:20 +01:00 |
|
|
Rémi Gaillard
|
c2e3e1295c
|
Merge pull request #1006 from TMMeilleur/bootstrap
// Added all themes for themeconfigurator and fixed Rich Snipet (availability)
|
2013-11-20 09:37:56 -08:00 |
|