0430d09753
// Better php def for Page header title edit and view
2013-11-12 11:36:26 +01:00
ec37efdf8b
// Add identifier name
2013-11-12 11:30:01 +01:00
94817a9371
// ooops
2013-11-12 11:16:31 +01:00
db0e1e41a9
// Small Fix
2013-11-12 11:10:55 +01:00
41196f3c5f
// General modification for view and edit title
2013-11-12 11:06:20 +01:00
3931914203
// Add Modernizr and Modernizr-loads check and loading for unsuported browsers
2013-11-12 09:54:20 +01:00
42af175d22
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-07 21:49:11 +01:00
402221ad0f
// load enquire.js
2013-11-07 21:48:17 +01:00
e3cfacb90e
// link to employee default tab and not index
2013-11-07 17:00:55 +01:00
54db0b705c
Merge pull request #923 from PrestaEdit/1.6.x-fancybox
...
//remove unnecessary addCSS (fancybox)
2013-11-06 00:31:57 -08:00
5ec5215919
// UI modules fixs
2013-11-05 18:17:39 +01:00
a31dbeb68e
// Fixed bootstrap mode for modules
2013-11-05 17:29:51 +01:00
e702af6a67
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/css/admin-theme.css
2013-11-05 16:42:09 +01:00
533ebc0f6d
// backward CSS
2013-11-05 16:40:21 +01:00
e4fe5f6df6
// Fixed htmlentities in KPIs
2013-11-05 16:01:48 +01:00
eb383e580e
// Organize css/sass + backward compatibility WIP
2013-11-05 12:32:41 +01:00
9f396ada83
//remove unnecessary addCSS (fancybox)
2013-11-05 10:13:13 +01:00
fbc93e5632
// moved admin css and backward compatibility css to admin theme css directory
2013-11-04 19:48:53 +01:00
27273334e3
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:47:16 +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
cfeeda7d9b
// Assigned compared products to smarty
2013-11-04 11:00:50 +01:00
8aa369531e
// employee avatar
2013-10-30 18:02:10 +01:00
64706075d5
// Fix default language on BO forms
2013-10-29 15:32:31 +01:00
38f034f4e0
// Remove header and footer display when ajax
2013-10-28 17:10:53 +01:00
c67e71ca59
// layout fix
2013-10-25 17:30:10 +02:00
e8f68441db
// Assigned shop phone to frontend smarty
2013-10-21 19:02:25 +02:00
b141975d57
// Fix fields_list check
2013-10-21 11:49:08 +02:00
6747d3bbac
[-] BO: Default country should be overriden in the context in multishop
2013-10-18 10:23:06 +02:00
b8273a13e6
//
2013-10-17 18:30:22 +02:00
eb14e25e2a
// small fix for some order by on listing
2013-10-17 11:33:05 +02:00
3ba5905042
[-] BO : Could not order by reserved words like 'key'
2013-10-16 16:25:40 +02:00
37712f0193
//when a module is disabled, first option is enable
2013-10-16 16:20:51 +02:00
6f4b85430c
// Fix listings and sort
2013-10-14 18:52:48 +02:00
fa6d09a756
// Fixed warning
2013-10-14 15:56:53 +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
9d5a9225e5
Correct some "bad query" in the admin products getList
...
Here the wrong Sql generated :
SELECT SQL_CALC_FOUND_ROWS a.`id_product`,b.name as name,`reference`,a.price as price,a.active as active , MAX(i.id_image) id_image,cl.name `name_category` , a.`price`, 0 AS price_final, sav.`quantity` as sav_quantity, a.`active` FROM `ps_product` a LEFT JOIN `ps_product_lang` b ON (b.`id_product` = a.`id_product` AND b.`id_lang` = 2 AND b.`id_shop` = 1) LEFT JOIN `ps_image` i ON (i.`id_product` = a.`id_product` AND i.cover=1)LEFT JOIN `ps_category_lang` cl ON (a.`id_category_default` = cl.`id_category` AND b.`id_lang` = cl.`id_lang` AND cl.id_shop = 1) LEFT JOIN `ps_stock_available` sav ON (sav.`id_product` = a.`id_product` AND sav.`id_product_attribute` = 0 AND sav.id_shop = 1 ) WHERE 1 AND a.`active` = 0 GROUP BY a.id_product ORDER BY quantity desc LIMIT 0,50
'quantity' is ambigus (for the ORDER BY)
2013-10-11 18:17:55 +02:00
1849995291
// Code cleaning
2013-10-11 15:35:45 +02:00
1316bd7e1f
// add check stock value for color list if needed
2013-10-11 14:11:12 +02:00
809eac6308
// Fix upgrade and dashboard
2013-10-11 14:07:03 +02:00
c68101653d
// Fixed tabs
2013-10-11 12:10:24 +02:00
77551c03f5
// Fixed potential warning
2013-10-10 18:49:27 +02:00
278dc32482
[*] BO: Add an option to autologout to the backoffice after 15 minutes
2013-10-10 12:20:10 +02:00
067c78f868
// Fix notifications
2013-10-10 11:02:33 +02:00
079534f039
// Fix header/footer override in admincontroller
2013-10-09 18:51:31 +02:00
c8347cbc59
// Restore save button on header toolbar
2013-10-09 15:24:19 +02:00
c982d08b68
// Removed useless link to the current page in the breadcrumb
2013-10-09 11:12:33 +02:00
3b677092bf
[*] FO: You can now choose the anchor separator for attributes
2013-10-09 11:01:18 +02:00
d9b40b8f35
// Added Modules KPIs
2013-10-08 19:39:52 +02:00
b9cfc24922
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-08 18:42:19 +02:00
d88857610d
// Toolbar modifs
2013-10-08 18:42:07 +02:00
Jerome Nadaud