d30e376354
// Remove "no name" error on new product
2013-11-25 14:42:21 +01:00
611cfd90a0
[-] BO : FixBug #PSCSX-40 categories unchanged after select a new home category
2013-11-25 12:08:34 +01:00
dec1555b32
// Fixed dashboard simulation mode switch
2013-11-25 11:30:30 +01:00
4044ba853e
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-22 18:57:15 +01:00
0572fc09e8
// tweaks list + customers
2013-11-22 18:56:52 +01:00
1337407131
Merge pull request #1019 from djfm/translations
...
Translations
2013-11-22 09:12:55 -08:00
b29a30f033
// small fix
2013-11-22 17:59:32 +01:00
a147806382
// Improved texts and UI in AdminImport
2013-11-22 15:44:49 +00:00
3fe6608a62
// Include datetime picker for all admin controllers
2013-11-22 16:41:52 +01:00
af4b258201
// js=1, not '1'
2013-11-22 14:22:26 +00:00
c095d8f1ca
[-] Core : fixed smarty escape htmlall > html
2013-11-22 09:47:15 +01:00
f7ad627b4d
// fix pagination Tax Rules Group
2013-11-21 18:28:25 +01:00
d89db6de45
// Fixed warning
2013-11-21 17:46:29 +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
6431f559d7
// tree header improvement WIP
2013-11-21 15:01:54 +01:00
9f1c39a7d6
[*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1]
2013-11-21 12:32:51 +01:00
794f729c5d
// Show more info content if <= 4
2013-11-21 12:23:54 +01:00
b10d50ef09
// fixs on horizontal nav + add icon on footer links
2013-11-21 12:15:21 +01:00
9229d6cb52
// Features and attributes title and buttons
2013-11-21 12:10:15 +01:00
d49f29f79d
// Remove subtitle from orders view
2013-11-21 11:06:08 +01:00
0b47dbca21
// Adding footer to customer requiered fields
2013-11-21 09:46:27 +01:00
2df142eb89
// Align actions button in customner view
2013-11-21 09:35:44 +01:00
d4afcec83f
Merge pull request #1005 from djfm/css
...
// adjust markup in AdminTranslationsController
2013-11-20 12:10:22 -08:00
104ae93936
// tweak nav sidebar
2013-11-20 19:25:11 +01:00
a5cc9efa76
// Languages boostraping
2013-11-20 18:20:19 +01:00
5bd2439e43
// css in AdminTranslationsController
2013-11-20 18:07:51 +01:00
fc5b3b1d29
// Localization bootstraping
2013-11-20 17:52:05 +01:00
5b6cfa3cdb
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-20 17:29:46 +01:00
12f3a150a7
// bootraping of import csv view
2013-11-20 17:29:35 +01:00
9e2dac8ece
//fix css login
2013-11-20 17:24:52 +01:00
dc29fae59d
// reorganize some css and stuff on backward compatibility
2013-11-20 16:24:01 +01:00
c61d1bc309
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-20 16:20:56 +01:00
e5d03f4e7c
// Csv import fix hide checkbox
2013-11-20 16:11:37 +01:00
0b3c08acbe
// Add language iso code to language select
2013-11-20 15:37:25 +01:00
8148d5696d
[-] BO : fixed bug #PSCSX-25 - carrier wizard summary design and missing infos
2013-11-20 15:20:44 +01:00
62a149ebe6
[-] BO : FixBug #PSCSX-33 Misplaced save button
2013-11-20 14:50:31 +01:00
dbf98d3722
// Put suffix after input field
2013-11-20 12:02:15 +01:00
896d8ce494
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-20 11:57:44 +01:00
7ab256d28f
// Small fix in customer order private note
2013-11-20 11:04:39 +01:00
e02b5d5c11
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
...
Conflicts:
admin-dev/themes/default/template/helpers/list/list_header.tpl
2013-11-18 18:39:25 +01:00
6be883217e
[-] BO : FixBug #PNM-1594 - Double selected option value
2013-11-18 18:36:30 +01:00
369ac0f664
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/modules/configure.tpl
2013-11-18 15:13:04 +01:00
6633efd27d
[-] BO : Fix bug #PNM-1594, selected value error in helper list
2013-11-18 15:11:49 +01:00
2ba5dc18fd
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
46dc93fd7e
// Adding update button on to page header toolbar on module
2013-11-18 14:41:49 +01:00
239604b70c
// Missing isset on cols and rows
2013-11-18 14:35:15 +01:00
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
8166bb662c
Merge pull request #984 from soware/development
...
Update form.tpl
2013-11-18 01:01:00 -08:00
cd58c0968b
Fixed admin toolbar save button javascript actions, problem occurred when there were multiple toolbars on one page
2013-11-16 14:59:37 +01:00
e5f0bcb916
Update form.tpl
...
I removed the line 109 because the price tab problem and because this line is redundant. The first show (line 95) always is executed.
If the price is saved twice, the second the div #product-tab-content-wait never is hided and show the loading forever.
It is because the line 109 show this tab again, in the sequence: show (line 95), hide (line 213), show (line 109).
This happening just for price tab.
2013-11-16 00:37:47 -02:00
Jerome Nadaud