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

141 Commits

Author SHA1 Message Date
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
Jerome Nadaud 00e1b7c0eb [-] BO : FixBug language in label for 2013-08-20 09:36:00 +02:00
Jerome Nadaud 0e353fe655 [-] BO : Fix bug to check filter values 2013-08-13 15:42:00 +02:00
Jerome Nadaud a0d870c4eb [+] BO : Button action list improvements 2013-08-13 10:10:24 +02:00
Jerome Nadaud ecfe61972b [+] BO : Change action link for button 2013-08-09 16:07:07 +02:00
jeromenadaud b81c021144 [-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist 2013-08-05 16:11:48 +02:00
jeromenadaud 174dfa9a6b [+] BO : Filter button default css class style 2013-08-01 17:13:02 +02:00
jeromenadaud a29fa2dd09 [+] BO Better filters display 2013-08-01 16:59:08 +02:00
jeromenadaud 017e5ccbc8 [+] BO Pagination, filter and display 2013-07-31 18:37:01 +02:00
jeromenadaud 683818ebd4 [+] BO : Remove advanced header on empty list 2013-07-31 18:04:28 +02:00
Kevin Granger 9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
Jérôme Nadaud f8ff755067 [+] BO : Product "For" 2013-07-25 14:50:10 +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
Damien Metzger 3556e75ce3 // Moved useless code into the block where it is useful 2013-07-22 10:49:41 +02:00
Jérôme Nadaud 3693349643 [-] BO : FixBug #PSCFV-5316 Translation problem in delete button link 2013-07-18 15:49:53 +02:00
Gregory Roussac 44debd682f Merge pull request #517 from axometeam/patch-4 
[*] BO : AdminControllers Keep "active" filter on pagination
 2013-07-12 02:07:51 -07:00
Kevin Granger f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
Damien Metzger 47d343df90 // Fixed module positions in tabs 2013-07-04 09:33:43 +02:00
Axome f4fc1d3cab [*] BO : AdminControllers : Keep active filter on pagination 2013-06-24 10:57:05 +02:00
vAugagneur 3328c7a653 [-] BO : remove deprecated parameter when call Tools::displayDate() 2013-05-20 16:55:52 +02:00
Rémi Gaillard 20f8709940 [-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists 2013-04-22 10:50:41 +02:00
gRoussac 6e1f99f4b2 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +02:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
vAugagneur 947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
Rémi Gaillard 5cecff7251 // fix php warning 2013-01-14 14:12:14 +01:00
Rémi Gaillard ef904c9083 [-] BO: Fix #PSCFV-5930 #PSCFV-5939 the filters are handled as the same between tabs which can cause sql errors 2013-01-14 12:08:12 +01:00
vAugagneur 108dfb292c [-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories 2013-01-09 13:44:19 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +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
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
DamienMetzger edf3a3b10e [-] BO : fixed filters on statuses tab #PSCFV-5763 2012-11-22 19:49:20 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre ece74e27c2 // Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 10:13:43 +00:00
lLefevre 07ca3c5258 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:35:11 +00: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 f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
rGaillard bfb5f6058c // Fix #PSCFV-4512 2012-10-04 13:05:43 +00:00
dMetzger 84b0aa79b2 // Changed image system to new default + #PSCFV-4068 2012-09-24 09:08:57 +00:00
rGaillard ec0fd17bcd [-] BO: Fix display of filter listings PSCFV-3992 2012-09-11 13:12:02 +00:00
dMetzger ab6ae48023 // Opti 2012-08-23 16:16:16 +00:00
dMetzger bdc79aeb65 [*] BO : Changed the default list view for products and categories when multistore is activated 2012-08-23 14:36:52 +00:00
lLefevre 09aba262ab [-] TR : fix #PSCFV-3374 2012-07-27 14:14:07 +00:00
vAugagneur b18f9b179c //norme 2012-07-24 08:23:21 +00:00
dMetzger 1f54744397 [-] BO : fixed alt text for duplication #PSCFV-3180 2012-07-12 15:12:29 +00:00
lLefevre 12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
rGaillard 78bfe42a87 // Fix some bug on advanced stock management 2012-07-11 15:46:39 +00:00
dMetzger c6a1948341 [*] BO : Added an override capability for the admin templates 2012-07-09 14:12:37 +00:00
vAugagneur d4c728c4ff //small fix 2012-06-14 12:41:19 +00:00