dc90bb6227
// Force clearstatcache on product image upload
2013-11-26 15:46:21 +01:00
0d6bc850de
// Update datepicker button with period buttons select
2013-11-25 18:24:06 +01:00
a81ee41374
// Fix missing saving button in products
2013-11-25 18:01:01 +01:00
4c8c48f441
// admin import
2013-11-25 17:55:59 +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
b2cee0426a
// Default category was not selected
2013-11-25 16:05:18 +01:00
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
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
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
2df142eb89
// Align actions button in customner view
2013-11-21 09:35:44 +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
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
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
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
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
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
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
8c3eb9b9a4
// typo
2013-11-15 21:03:17 +01:00
b62952accf
[*] BO : Added simulation mode to the dashboard
2013-11-15 18:07:23 +01:00
96def5033f
// typo
2013-11-15 17:19:12 +01:00
9fa2299c6b
// Open prestashop.com link in new window
2013-11-15 11:56:23 +01:00
152960639f
[-] BO : Product final price can not be hidden on loading tab, report of https://github.com/PrestaShop/PrestaShop/commit/6c6c3b240ee2249b7f99be1a112905cd0edbee46
2013-11-15 11:36:07 +01:00
7526fe4766
// missing trailing semi-column
2013-11-15 11:16:48 +01:00
80957666cf
// Hide collapse and expand button when not necessary
2013-11-14 19:21:31 +01:00
Jerome Nadaud