dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,089 Commits 9 Branches 19 Tags
bb35a5b00414bbca76569fa2b9d5df875f6b0140
Commit Graph

177 Commits

Author SHA1 Message Date
Rémi Gaillard
3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
Damien Metzger
a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
Damien Metzger
39fdc8c926 [+] BO : Added new class ConfigurationKPI for KPI cache storage 2013-09-18 15:09:04 +02:00
Kevin Granger
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
Damien Metzger
06a178b8fe // Replaced screencast option by menu option 2013-09-12 18:24:18 +02:00
Vincent Augagneur
1481dc0f5f //added PS_DASHBOARD_USE_PUSH in install 2013-09-05 16:03:14 +02:00
Kevin Granger
22d636f93a // Colored switch, removed "required field" legend, removed duplicate links quick access 2013-09-04 18:14:11 +02:00
gRoussac
da353c884d [-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT 2013-09-04 10:45:48 +02:00
Vincent Augagneur
0019426e81 //added dashboard controller 2013-08-28 10:04:28 +02:00
Damien Metzger
7a429cd3ea // Version number 2013-08-28 10:00:29 +02:00
Vincent Augagneur
bae9df61dc //revert reorganization of shipping menus & options 2013-08-12 15:15:17 +02:00
Vincent Augagneur
6befd831c9 //small install fix 2013-08-12 11:10:12 +02:00
Vincent Augagneur
3664f4c394 //reorganization of shipping menus & options 2013-08-12 11:02:28 +02:00
gRoussac
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
Rémi Gaillard
c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Damien Metzger
e6ecf0c177 // Added a more efficient index 2013-07-25 17:07:28 +02:00
Jérôme Nadaud
abf874d576 [-] BO : FixBug #PSCFV-9049 Bad actionOrderSlipAdd hook description 2013-07-19 16:30:04 +02:00
Rémi Gaillard
004e833b24 [+] BO: Addition, deletion and edition are now logged 2013-07-11 14:50:23 +02:00
Rémi Gaillard
63993a425b [-] BO: You can now disable the email sent after account creation 2013-05-03 17:01:12 +02:00
vAugagneur
21aa134774 [-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values 2013-04-26 12:19:20 +02:00
vAugagneur
2733cab592 [-] BO : fixed bug #PSCFV-8095 now maximum weigh for carrier is float 2013-03-28 12:06:32 +01:00
Francois Gaillard
9b74349f71 // Default carrier groups updated 2013-03-25 12:13:53 +01:00
vAugagneur
ecfb24dad4 [+] CORE : added new hook actionModuleInstallBefore and actionModuleInstallAfter 2013-03-20 17:28:51 +01:00
Gregory Roussac
d758801752 [-] INSTALLER : Fix crash from genders jpg copy 2013-03-06 21:16:24 +01:00
gRoussac
a54f1f58fc [-] BO : Bug with genders icons 2013-03-06 18:56:24 +01:00
Rémi Gaillard
c52f5a6a2b [-] Core: increase size of phone field 2013-03-01 16:01:26 +01:00
Damien Metzger
8885c3f642 [+] Core : added a boolean in the database (guest/cart/order) in order to know if the customer used the mobile theme for the order 2013-02-28 15:23:21 +01:00
Francois Gaillard
c8c218a6a6 // Order confirmation meta data installation fixed 2013-02-25 10:05:40 +01:00
Rémi Gaillard
9c293a992e [-] Installer: fix UNIQUE key on stock_available table #PSCFV-7886 2013-02-20 16:12:39 +01:00
vAugagneur
d6f5566e65 [+] BO : added new marketing tab 2013-02-13 09:57:30 +01:00
Damien Metzger
4eef24de19 // Changed default phone number 2013-02-06 14:13:50 +01:00
vAugagneur
973c8d8d4f [-] CORE : order state preparation now generate delivery slip 2013-02-05 10:15:53 +01:00
vAugagneur
606b3eedd5 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
Damien Metzger
2bf3df1c7d [-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325 2013-02-04 16:00:46 +01:00
Damien Metzger
bf9b1de873 // Fixed hook names 2013-01-30 16:03:37 +01:00
vAugagneur
517e90da43 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
Damien Metzger
886f6d864b [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
vAugagneur
b83ab4dc4b [-] CORE : fixed bug #PSCFV-4754 field name in image_type was too short 2013-01-07 14:08:08 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a4eb2cc7a9 //Merge branch release 2013-01-02 09:56:20 +01:00
Damien Metzger
0c6b1aaf77 // Missing part of a fix 2012-12-31 09:45:10 +01:00
Damien Metzger
7a8adaec25 [+] BO : you can now choose if a voucher is displayed under the cart in the frontend 2012-12-27 18:04:16 +01:00
Damien Metzger
9dd5bd4098 [-] MO : fixed bugs on RSS modules 2012-12-26 11:32:59 +01:00
Rémi Gaillard
1be7a98655 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35:20 +01:00
Rémi Gaillard
3a72d1676c [-] BO: Fix #PSCFV-6172 don't htmlentities the cart rule name && increase size of name order_cart_rule field 2012-12-17 14:42:24 +01:00
Rémi Gaillard
87798d1193 // small fix 2012-12-12 16:18:48 +01:00
Vincent Augagneur
ebff913250 Merge pull request #69 from PrestaEdit/mails 
[+] Project: add the possibility to change the default color (#db3484)
 2012-12-12 06:59:04 -08:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Rémi Gaillard
131f99eb69 [-] Core: send email when payment is remotly accepted #PSCFV-6064 2012-12-10 15:57:59 +01:00
Jonathan Danse
edd6bf7b7e [+] Project: add the possibility to change the default color (#db3484) 
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
 2012-12-03 16:11:43 +01:00