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

89 Commits

Author SHA1 Message Date
Jerome Nadaud 964f546b0b // Update image when updated 2013-10-18 17:41:36 +02:00
Jerome Nadaud d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Kevin Granger bb7dd876af // orders WIP 2013-10-03 21:04:35 +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 fa2f10ffc6 // Add row break to color element 2013-09-26 16:43:57 +02:00
gRoussac 73dd524de8 [-] BO : Could not order in AdminStatuses by ID or template 2013-09-14 00:05:45 +02:00
Jerome Nadaud 068da6f87c [+] BO : Page header toolbar 2013-08-28 09:24:16 +02:00
Kevin Granger 3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
gRoussac 19918dea8e [-] BO : Fix bug #PSCFV-8139 bad renderform on errors in AdminStatuses 2013-08-05 10:47:04 +02:00
Kevin Granger 9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
sLorenzini 3c035324f4 // update order tab 2013-07-26 12:15:23 +02:00
Rémi Gaillard 868926f24a // delete multishop toolbar on adminstatuses 2013-03-15 12:07:53 +01:00
Rémi Gaillard 4c0a7ca161 // delete multishop toolbar on adminstatuses 2013-03-15 12:07:53 +01:00
fram ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard 4fe6006e20 [-] BO: Forbid to delete the defaults return statuses 2013-02-05 17:04:17 +01:00
Rémi Gaillard 9c816410c0 [-] BO: Forbid to delete the defaults return statuses 2013-02-05 17:04:17 +01:00
Vincent Augagneur fdf5a4c3e1 Merge pull request #129 from PrestaEdit/Forum-#213412 
[-] BO: don't have the delivery PDF - User can define which statuses sho...
 2013-02-05 00:59:48 -08:00
Vincent Augagneur 2aa0f3e93c Merge pull request #129 from PrestaEdit/Forum-#213412 
[-] BO: don't have the delivery PDF - User can define which statuses sho...
 2013-02-05 00:59:48 -08: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
Jonathan Danse 96c6f36b69 [-] BO: don't have the delivery PDF - User can define which statuses show the delivery PDF 2012-12-31 10:45:46 +01:00
Jonathan Danse 04ad0a5e4a [-] BO: don't have the delivery PDF - User can define which statuses show the delivery PDF 2012-12-31 10:45:46 +01:00
DamienMetzger 6171d1af59 [-] BO : fixed filters on statuses tab #PSCFV-5763 2012-11-22 19:49:20 +01:00
DamienMetzger edf3a3b10e [-] BO : fixed filters on statuses tab #PSCFV-5763 2012-11-22 19:49:20 +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 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
vAugagneur 7f130e3c4b [-] BO : fixed bug #PSCFV-4750 2012-10-09 16:36:13 +00:00
vAugagneur c50a1b7530 [-] BO : fixed bug #PSCFV-4750 2012-10-09 16:36:13 +00:00
dMetzger d8a453edbc [-] BO : status image was not saved #PSCFV-3654 2012-08-17 12:42:29 +00:00
dMetzger d8aa7324d6 [-] BO : status image was not saved #PSCFV-3654 2012-08-17 12:42:29 +00:00
dMetzger 58fe8a66ea // Added color management of the return states in the UI #PSCFV-3606 2012-08-13 14:07:48 +00:00
dMetzger ce771dae7a // Added color management of the return states in the UI #PSCFV-3606 2012-08-13 14:07:48 +00:00
dMetzger fa148c5d8d [-] BO : you can now delete multiple order statuses at one #PSCFV-3585 2012-08-10 16:00:07 +00:00
dMetzger f88c1135fe [-] BO : you can now delete multiple order statuses at one #PSCFV-3585 2012-08-10 16:00:07 +00:00
vAugagneur 0c9776d799 //small thing 2012-06-06 06:40:44 +00:00
vAugagneur 36aac222b6 //small thing 2012-06-06 06:40:44 +00:00
vAugagneur 7703db1fd6 //AdminStatusesController.php refacto 2012-06-05 14:07:57 +00:00
vAugagneur 5ec8694fb5 //AdminStatusesController.php refacto 2012-06-05 14:07:57 +00:00
vAugagneur fba31c4599 //remove duplicate code 2012-06-05 09:28:42 +00:00
vAugagneur aa060fe798 //remove duplicate code 2012-06-05 09:28:42 +00:00
vAugagneur 7661ea3869 //remove unused variable 2012-06-05 09:24:15 +00:00
vAugagneur 85a3e89dd8 //remove unused variable 2012-06-05 09:24:15 +00:00
tDidierjean 24c326e2bc // Rename fieldsDisplay to fields_list part3 (timeout) 2012-03-29 16:31:01 +00:00