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

79 Commits

Author SHA1 Message Date
Damien Metzger
26b90d5670 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 2] 2013-11-21 14:44:00 +01:00
Damien Metzger
ec528fff93 // one more groups improvement 2013-11-05 16:34:03 +01:00
Damien Metzger
161c701ecf // Groups review 2013-11-05 16:30:34 +01:00
Rémi Gaillard
3997543e7f // notice 2013-10-25 11:35:01 +02:00
Damien Metzger
087d0d8206 // Fields resizing 2013-10-25 11:25:13 +02:00
Rémi Gaillard
9a7c3dd88f // small fix 2013-10-24 10:14:44 +02:00
Jerome Nadaud
f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02:00
Jerome Nadaud
088d23f8f9 // Add edit button to customer groups view list 2013-10-17 18:27:00 +02:00
Kevin Granger
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
Damien Metzger
1849995291 // Code cleaning 2013-10-11 15:35:45 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud
887b68d3f2 // Customers Groups View list resize 2013-10-04 14:24:33 +02:00
Jerome Nadaud
759a3e191a // Groups and language bootsrapify 2013-10-01 15:14:46 +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
Jerome Nadaud
e040c096d1 [-] BO : Remove customers group view list link 2013-09-30 10:34:54 +02:00
Jerome Nadaud
c2b9ff40ef [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list 2013-09-27 19:20:46 +02:00
Jerome Nadaud
a93ce00af8 // Groups view bootstrap design 2013-09-26 15:59:28 +02:00
Damien Metzger
fd1cfe0c8c // Fixed group information label and a customer KPI 2013-09-25 20:16:34 +02:00
Jerome Nadaud
15622fbf45 // Customers group 2013-09-19 14:25:17 +02:00
Jerome Nadaud
4413d04525 // Customer fix 2013-09-18 17:05:16 +02:00
Damien Metzger
0e3d53321a [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error 2013-09-16 09:56:22 +02:00
Damien Metzger
533003faa0 [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error 2013-09-16 09:37:58 +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
b95478d529 [+] BO Customers Groups WIP 2013-07-29 20:39:52 +02:00
Damien Metzger
3e4ef99214 [-] BO : fixed issue with reduction in the category for groups #PSCFV-9101 2013-05-15 15:23:13 +02:00
Rémi Gaillard
09e5037ebd [-] BO: it is now possible to change the default customer/guest/visitor group per shop 2013-03-26 11:45:23 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard
88340319dd [-] BO: Filter customers listing by shop context on AdminGroups 2013-02-25 20:08:33 +01:00
Rémi Gaillard
d10daeedbb [-] BO: Fix possible PHP notice on AdminGroups #PSCFV-7412 2013-01-25 15:27:37 +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
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
lLefevre
831fa08687 [-] TR : change string "gender" by "titles"... 2012-09-14 14:22:45 +00:00
dMetzger
841db7a805 // Clean AdminController methods did not return the appropriate value #PSCFV-3645 2012-08-17 07:03:54 +00:00
lLefevre
3500b9d771 [-] BO : #PSCFV-2729 : delete translations of this character : "?" in AdminGroups 2012-06-07 14:03:52 +00:00
vChabot
4634d30547 [-] BO : BugFix : #PSCFV-2343 : Group discount does not show associated categories properly 2012-05-16 14:11:20 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
tDidierjean
ba2abcd990 // Rename fieldsDisplay to fields_list part2 (timeout) 2012-03-29 16:29:31 +00:00
tDidierjean
365248d632 // Refactoring: remove $token arg from process functions 2012-03-26 15:25:36 +00:00
vChabot
03ce9eed02 [-] BO : BugFix : #PSTEST-1058 : Adding Save And Stay button to the customer group interface 2012-03-22 10:45:59 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
vChabot
8b7ea20a5c [-] BO : BugFix : #PSTEST-1020 : category reduction are now deletable 2012-03-14 09:15:31 +00:00
vChabot
0a4a5036a9 [-] BO : BugFix : #PSFV-1020 : category reduction can be deleted now 2012-03-13 17:06:20 +00:00
rMalie
51cae793fd // Fix shop association with groups in BO #PSTEST-820 2012-02-24 09:14:28 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
aFolletete
19b38eaffc [-] BO : fixed bug #PSFV-501 - Unable to edit a customer in AdminGroups controller 2012-02-20 15:32:11 +00:00