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

70 Commits

Author SHA1 Message Date
Damien Metzger 161c701ecf // Groups review 2013-11-05 16:30:34 +01:00
Damien Metzger 0e4a900d3d // Fixed group display 2013-11-05 16:13:52 +01:00
Kevin Granger 0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +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
Jerome Nadaud 9c40dbb222 // Fix group view for bootstrap - removing limit restriction 'cause is now fixed 2013-10-01 17:00:56 +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
djfm 66435cbf4a // grammar 2013-09-27 08:35:48 +00:00
Jerome Nadaud a93ce00af8 // Groups view bootstrap design 2013-09-26 15:59:28 +02:00
Jerome Nadaud f04126c436 // Customers groups - Add special tree handle for categories tree 2013-09-23 18:16:47 +02:00
Jerome Nadaud 5206496f64 [-] BO : Fix Bug For new Fancy Box events 2013-09-23 11:22:51 +02:00
Jerome Nadaud 3b465111b9 // Customer group 2013-09-19 15:57:28 +02:00
Jerome Nadaud 15622fbf45 // Customers group 2013-09-19 14:25:17 +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
Kevin Granger f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +02:00
Kevin Granger b95478d529 [+] BO Customers Groups WIP 2013-07-29 20:39:52 +02:00
Kevin Granger 77f80b1774 // Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	.gitignore
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/page.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/orders/_documents.tpl
	admin-dev/themes/default/template/controllers/orders/_shipping.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/payment/restrictions.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/modules_list/list.tpl
	classes/Tools.php
	controllers/admin/AdminCartRulesController.php
	controllers/admin/AdminProductsController.php
	css/admin.css
 2013-07-24 17:01:23 +02:00
djfm 3c59c5e779 //replaced all js='1' with js=1 so that the translation regexes don't fail 2013-07-22 09:34:18 +00:00
Damien Metzger 57dd992c28 [-] FO : fixed entities issue in javascript alerts #PSCFV-9001 2013-06-26 16:22:57 +02:00
Damien Metzger 7427efdb6f // Added addlashes for some js messages 2013-06-26 15:52:40 +02:00
Kevin Granger 40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
djfm 385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm 714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur 768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre 946dd2caf7 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre ece74e27c2 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre 04fc63c2b6 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre 07ca3c5258 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00:00
lLefevre 779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre 6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre 046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre 398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre 9239de5dac [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
lLefevre f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
lLefevre 1da5ce07d4 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
lLefevre 12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
lLefevre 856c8719eb [-] BO : #PSCFV-2729 : delete translations of this character : "?" in AdminGroups 2012-06-07 14:03:52 +00:00
lLefevre 3500b9d771 [-] BO : #PSCFV-2729 : delete translations of this character : "?" in AdminGroups 2012-06-07 14:03:52 +00:00
lLefevre 1be3f4f248 [-] BO : fix #PSCFV-2345 2012-05-15 16:14:36 +00:00
lLefevre 158a19ad65 [-] BO : fix #PSCFV-2345 2012-05-15 16:14:36 +00:00
lLefevre 3ddf7259a2 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
lLefevre 9925bf30ad [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
rMalie d0b4e96ab3 // Fix attr('checked'), attr('disabled') and attr('selected') with jquery update #PSCFV-2142 2012-05-02 08:29:30 +00:00
rMalie beb95276bd // Fix attr('checked'), attr('disabled') and attr('selected') with jquery update #PSCFV-2142 2012-05-02 08:29:30 +00:00