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
29e7169a92
// Change logo size
2013-11-19 08:43:17 +01:00
54786a6f75
// Install
2013-11-19 00:10:46 +01:00
e2c930a165
// Install
2013-11-18 23:55:29 +01:00
dec5ef7469
// Install
2013-11-18 23:26:41 +01:00
f4560d0899
// Install
2013-11-18 20:35:42 +01:00
e4fcb31836
// Install
2013-11-18 20:02:14 +01:00
89c65536d7
// Added missing configuration vars in the installer
2013-11-18 12:23:50 +01:00
b62952accf
[*] BO : Added simulation mode to the dashboard
2013-11-15 18:07:23 +01:00
29f65da5ca
// Add wish list button to blockwishlist module
2013-11-14 19:54:28 +01:00
b51b388eaa
// Blockcategories thumnail uploader fix
2013-11-07 16:44:55 +01:00
cf44f8d0b4
// Uploader helper small fix
2013-11-04 19:50:04 +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
8670db2316
// Image sizes
2013-10-31 17:41:02 +01:00
fe78dceede
// Fixed image sizes
2013-10-31 17:08:22 +01:00
c98b5e0c78
[*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski
2013-10-29 19:05:21 +01:00
9c54dcce66
// Fixed default stats graph engine
2013-10-28 12:15:35 +01:00
a1df97776a
// Set default values
2013-10-24 13:54:55 +02:00
a34784a15d
// Fixed chart for period before the store creation
2013-10-24 11:17:33 +02:00
e17dd1fdde
// theme installation
2013-10-24 09:49:46 +02:00
9e0125d0b6
// theme installation
2013-10-23 19:09:14 +02:00
758b5f7241
// Started to adapt the install to the new template
2013-10-23 17:29:59 +02:00
69d5cb4ccd
[+] FO : New Responsive, Bootstrap template
2013-10-23 16:56:02 +02:00
67fc91e2c9
// Categories thumbnails
2013-10-22 17:43:10 +02:00
a85b931765
// Adding compare options
2013-10-16 19:07:23 +02:00
62aaf16d60
[*] FO : New hooks for home tabs
2013-10-16 11:44:55 +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
e47f0a7c68
// Adding stats compare date to employee table
2013-10-11 18:34:20 +02:00
c68101653d
// Fixed tabs
2013-10-11 12:10:24 +02:00
f80b348d86
// Default vertical menu in BO
2013-10-11 11:02:35 +02:00
3b677092bf
[*] FO: You can now choose the anchor separator for attributes
2013-10-09 11:01:18 +02:00
ae7d33effe
[*] CORE: Add phone_mobile to address format
...
I honestly do not know why you decided by default to show only the first field of the phone :)
Users often ask me why they don't see their mobile phone on orders in BO.
2013-10-08 11:11:24 +02:00
77b2b4b6ca
// Manual merge PS 1.5.6.0
2013-10-07 18:22:55 +02:00
c51fe5b22d
// Changelog 1.5.6.0
2013-10-07 18:07:25 +02:00
b6bba0c787
[*] LO : Removed 'Miss' from the default genders because too country specific
2013-10-07 07:53:19 +00:00
eb7655e318
[+] Added hook in maintenance page
2013-10-02 11:58:35 +02:00
a6d8ffa293
// More breadcrumbs improvements
2013-09-30 15:38:22 +02:00
ae8c8218fd
// Fixed ISO code of japanese todōfuken
2013-09-25 15:30:16 +02:00
39fdc8c926
[+] BO : Added new class ConfigurationKPI for KPI cache storage
2013-09-18 15:09:04 +02:00
c7ec33f062
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/css/admin.css
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/home/content.tpl
admin-dev/themes/default/template/controllers/localization/content.tpl
admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
admin-dev/themes/default/template/controllers/orders/_new_product.tpl
admin-dev/themes/default/template/controllers/orders/_product_line.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
admin-dev/themes/default/template/footer.tpl
controllers/admin/AdminCarrierWizardController.php
controllers/admin/AdminCarriersController.php
controllers/admin/AdminCmsController.php
controllers/admin/AdminLocalizationController.php
controllers/admin/AdminManufacturersController.php
controllers/admin/AdminSuppliersController.php
css/admin.css
js/admin-products.js
js/admin_carrier_wizard.js
translations/fr.gzip
2013-09-13 11:41:14 +02:00
06a178b8fe
// Replaced screencast option by menu option
2013-09-12 18:24:18 +02:00
1481dc0f5f
//added PS_DASHBOARD_USE_PUSH in install
2013-09-05 16:03:14 +02:00
22d636f93a
// Colored switch, removed "required field" legend, removed duplicate links quick access
2013-09-04 18:14:11 +02:00
da353c884d
[-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT
2013-09-04 10:45:48 +02:00
0019426e81
//added dashboard controller
2013-08-28 10:04:28 +02:00
7a429cd3ea
// Version number
2013-08-28 10:00:29 +02:00
bae9df61dc
//revert reorganization of shipping menus & options
2013-08-12 15:15:17 +02:00
6befd831c9
//small install fix
2013-08-12 11:10:12 +02:00
3664f4c394
//reorganization of shipping menus & options
2013-08-12 11:02:28 +02:00
a69d1c6d05
Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug
...
Conflicts:
controllers/admin/AdminPerformanceController.php
install-dev/data/xml/configuration.xml
2013-08-06 10:42:44 +02:00
Damien Metzger