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

117 Commits

Author SHA1 Message Date
Damien Metzger
27273334e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:47:16 +01:00
Damien Metzger
e7e4376307 // Changed "gender image" to social title in the customer (BO) 2013-11-04 14:45:36 +01:00
Kevin Granger
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
gRoussac
025b62f995 // norms 2013-10-25 17:33:44 +02:00
Damien Metzger
087d0d8206 // Fields resizing 2013-10-25 11:25:13 +02:00
gRoussac
56693da6e0 // remove warning Notice: Undefined variable: connections in AdminCustomersController.php on line 702 2013-10-23 19:02:13 +02:00
gRoussac
3e33a259ef [-] BO : FIx bug #PSCFV-10736 again, fixing query when product is not in base 2013-10-23 18:33:37 +02:00
gRoussac
8e506ddff2 [-] BO : FIx bug #PSCFV-10736, could not load a product given from getBoughtProducts 2013-10-23 18:16:45 +02:00
Rémi Gaillard
8a682081de // typo 2013-10-18 12:17:51 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Damien Metzger
e82f0feacf // Fixed customer tab 2013-10-03 09:52:25 +02:00
Damien Metzger
a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	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/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.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/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Damien Metzger
d1ead319ef // Fixed exception on the customer 2013-09-25 20:06:23 +02:00
Damien Metzger
b80b363a2e [*] BO : Added Customer Service KPIs 2013-09-25 15:24:30 +02:00
Damien Metzger
d05ab45543 // KPIs improvments 2013-09-24 18:08:06 +02:00
Damien Metzger
799efcba3f [*] BO : Customers KPIs 2013-09-24 15:32:05 +02:00
Jerome Nadaud
4413d04525 // Customer fix 2013-09-18 17:05:16 +02:00
gRoussac
f293562ea4 [-] BO : Fix bug #PSCFV-8214 import entity pre selected 2013-09-18 15:03:16 +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
Jerome Nadaud
039955e6a1 // Fix bug customer list in multistore 2013-09-12 16:59:25 +02:00
Rémi Gaillard
ddc16a2f65 [-] BO: Fix fatal error on customer edition when email is not valid 2013-08-28 17:46:05 +02:00
Jerome Nadaud
967fc98693 [+] BO : Page header toolbar 2013-08-28 09:37:49 +02:00
Kevin Granger
a1cc4d14d0 [+] BO Customers > Customers / Customers > Groups 2013-07-30 18:47:13 +02:00
Kevin Granger
ae225dce4c // WIP customer 2013-07-29 16:16:10 +02:00
vAugagneur
4f8b73ef9d //small fix 2013-05-22 14:38:39 +02:00
vAugagneur
3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
gRoussac
101ded7090 [-] BO : Rename genders images when upgrading from 1.5.0.1 to 1.5.3.1 2013-03-07 11:24:53 +01:00
gRoussac
a54f1f58fc [-] BO : Bug with genders icons 2013-03-06 18:56:24 +01:00
gRoussac
046fbf52b8 [-] BO : Fix bug #PSCFV-7657 all groups checked when creating customers 2013-03-01 15:46:39 +01:00
Rémi Gaillard
e3e38b19e1 [*] BO: you can now export listing of some tabs in CSV 2013-02-13 16:15:37 +01:00
Damien Metzger
886f6d864b [+] BO : Added customer language on the customer page 2013-01-14 16:45:21 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
fff026ca7d //display import button only on listing 2012-12-17 09:55:31 +01:00
vAugagneur
ae7569bde3 [-] BO : added import button on listing 2012-12-10 10:14:03 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
7e196f5418 // Fix #PSCFV-4390 2012-10-01 17:21:49 +00:00
rGaillard
aa4d6d6cc6 // fix customer listing 2012-09-28 13:23:20 +00:00
dMetzger
204e7891e8 // Back office optimization begun (memory & SQL) and will resume tomorrow 2012-09-26 17:52:27 +00:00
dMetzger
2f48635db5 // A few deprecated methods still in use 2012-09-26 13:10:21 +00:00
lLefevre
831fa08687 [-] TR : change string "gender" by "titles"... 2012-09-14 14:22:45 +00:00
lLefevre
f0765d10b5 [*] BO : #PSCFV-3831 : check each field which are required in databases 2012-08-30 16:06:09 +00:00
dMetzger
841db7a805 // Clean AdminController methods did not return the appropriate value #PSCFV-3645 2012-08-17 07:03:54 +00:00
mDeflotte
6157bc5ec3 // Normalization 2012-07-18 14:33:14 +00:00
vAugagneur
67c5bc41b9 [-] BO : fixed bug on customer edit when context is in "all shop" or "group shop" 2012-06-19 13:53:43 +00:00
rGaillard
4491986f65 // ajax.php clean and bug fixes 2012-06-15 13:22:07 +00:00