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

338 Commits

Author SHA1 Message Date
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
Damien Metzger
3389cf8acb [-] FO : fixed pagination for p = 0 #PSCFV-9746 2013-07-19 14:08:24 +02:00
Damien Metzger
219ec6e8be [-] FO : Removed useless live edit query #PSCFV-9845 2013-07-19 09:50:30 +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
ba1c4b9f3a [-] FO: http page should be redirected to http when accessed with https #PSCFV-9212 2013-06-04 16:27:47 +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
be250c9ecc // Revert a93cfbec07 2013-04-18 11:36:55 +02:00
Vincent Augagneur
dc529264e0 Merge pull request #366 from kluevandrew/patch-2 
[FIX] Bug in Controller class
 2013-04-16 06:13:48 -07:00
Andrew
03eadb3d6a Remove spaces before and after dot 2013-04-16 13:39:42 +04: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
gRoussac
f00d0e8471 [*] FO : Check if grid_prestashop.css is available in theme before including 2013-04-04 12:48:22 +02:00
gRoussac
c3ce452405 [-] FO : Fix bug #PSCFV-7825 removing import of grid_prestashop.css and displaying errors in AdminPerformances 2013-04-03 15:20:15 +02:00
Andrew
e002124e57 [FIX] Critical bug in Cotroller class 2013-04-02 16:21:27 +04: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
gRoussac
2a3373eb1d [-] BO : Fix bug #PSCFV-8481 no live edit on index when one language is active only 2013-03-29 11:37:08 +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
Francois Gaillard
70d79c5983 Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler" 
This reverts commit da77ce1029.
 2013-03-14 17:01:16 +01:00
Francois Gaillard
505d3be5c3 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
gRoussac
2bb4c6c08a [-] FO : Do no try to add empty css or js file name 2013-03-14 11:15:49 +01:00
vAugagneur
ee53bc4aea //added russian installer and changed english strings 2013-03-13 16:28:19 +01:00
Francois Gaillard
9f2de77e36 [-] FO : Mobile theme updated, templates added/improved 2013-03-13 15:28:42 +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