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

218 Commits

Author SHA1 Message Date
Jerome Nadaud
1af9fdd1b2 [-] BO : Module list new action buttons 2013-08-13 12:28:07 +02:00
Sarah Lorenzini
d744b9dbf2 // update localization and modules tabs 2013-07-31 14:47:21 +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
gRoussac
a805941c1f // typo in EN string 2013-07-23 10:34:05 +02:00
Damien Metzger
9169995adc // Small fixes and code cleaning 2013-07-23 09:50:26 +02:00
François Gaillard
899dc30097 [-] Class : AdminController - Object id fixed 2013-07-17 11:33:33 +02:00
Damien Metzger
3d283000a0 // Fixed misplaced comma 2013-07-16 10:27:52 +02:00
Rémi Gaillard
4b492046c0 // add another logs information 2013-07-12 10:55:37 +02:00
sLorenzini
40967e6525 // update modules list tab 2013-07-11 17:27:11 +02:00
Rémi Gaillard
004e833b24 [+] BO: Addition, deletion and edition are now logged 2013-07-11 14:50:23 +02: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
Damien Metzger
ae03669541 // Added the possibility to sort the modules in the tabs 2013-07-03 17:50:24 +02:00
Kevin Granger
d583cf25d2 // Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch 2013-06-28 19:35:32 +02:00
Vincent Augagneur
c5e65e1360 [-] BO - fixed bug #PSCFV-9435 - AdminController - processUpdateOptions does not manage required field correctly in a non-mutltishop context 2013-06-26 11:38:08 +02:00
Kevin Granger
aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
Kevin Granger
3bdf86e634 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-06-17 19:19:28 +02:00
gRoussac
aea53e034a [*] BO : Enable current subtab active class 2013-06-17 18:27:07 +02:00
Kevin Granger
6648fd3e97 // Reset Bootstrap for backward compatibility 2013-06-14 19:25:18 +02:00
Kevin Granger
b0eaf8124c [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:19:50 +02:00
Kevin Granger
86ef69c9ba [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:03:34 +02:00
Vincent Augagneur
518998ded2 //added bootstrap in BO 2013-06-13 16:35:14 +02:00
Rémi Gaillard
8d0e28291b [-] BO: Fix listing exports with image or other empty fields 2013-05-15 15:49:42 +02:00
Damien Metzger
45b1c864a5 [-] BO : catch prestashop exception and display smart error messages #PSCFV-9147 2013-05-15 15:39:58 +02:00
gRoussac
9b615244b1 [-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable 2013-05-15 11:31:55 +02:00
Gregory Roussac
2051b925a1 //norms 2013-04-29 21:55:30 +02:00
Gregory Roussac
93d5016848 [-] Bo : Admin login loop under Firefox 2013-04-29 21:54:26 +02:00
gRoussac
7081e6d0d0 [-] BO : Fix bug for csv export 2013-04-24 17:29:36 +02:00
Rémi Gaillard
419ed00e58 [-] BO: Fix #PSCFV-8683 order_way collusion on listing between 2 tabs 2013-04-08 14:58:29 +02:00
Damien Metzger
d1e776c62f [-] BO : fixed field value saving when value is equal to 0 #PSCFV-8530 2013-03-29 14:16:49 +01:00
vAugagneur
98b186a8c6 //fixed bug when install module from specific tab 2013-03-26 11:21:50 +01:00
Damien Metzger
35da9f6c00 // Fixed button order 2013-03-22 17:51:09 +01:00
Rémi Gaillard
b2d1270433 // Fix htmlentities on csv export 2013-03-21 10:08:24 +01:00
vAugagneur
b95b5861ef [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
vAugagneur
7bcc1ff651 [-] BO : fixed bug #PSCFV-8285 - module tab listing permission 2013-03-18 14:54:04 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Damien Metzger
7bd2bb9cb6 // This reverts commit 9ebe9e1894. "Changed modules list button" 2013-03-11 14:05:38 +01:00
Rémi Gaillard
f9e61ef442 // delete duplicates conf/error messages on admin 2013-03-04 17:36:25 +01:00
Damien Metzger
d4a6a56d1b // Changed modules list button (Sarah needed here!) 2013-02-25 12:16:58 +01:00
Rémi Gaillard
0a8abd087a [-] BO: Fix PHP notice on ob_clean if no buffer to delete 2013-02-22 10:47:00 +01:00
vAugagneur
15f8b1a19f //small fix 2013-02-15 17:06:16 +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
Rémi Gaillard
ba3f3b88b5 // php notice 2013-02-12 12:06:09 +01:00
Rémi Gaillard
d6f21bd9f9 // small fix for change position 2013-02-12 10:46:48 +01:00
Rémi Gaillard
5154585bb2 [-] BO: Fix #PSCFV-7462 bad sql request for ordering by price in adminproducts 2013-02-11 15:54:53 +01:00
vAugagneur
e46aa10991 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-07 10:46:37 +01:00
vAugagneur
6d18f2e7f4 //small fix 2013-02-07 10:46:31 +01:00
gRoussac
c6c27548f4 [-] CORE : file_put_contents() returns the number of bytes that were written to the file, or FALSE on failure. 2013-02-06 19:21:23 +01:00
Rémi Gaillard
c80e0f48be [-] BO: Don't display delete icon for order carts 2013-02-05 15:28:09 +01:00
vAugagneur
606b3eedd5 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00