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

157 Commits

Author SHA1 Message Date
Kevin Granger
edc2113330 // fix merge 2013-07-24 17:02:23 +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
PrestaEdit
679ee351df [-] BO: remove old icon into New Version block 2013-06-29 16:28:03 +02:00
Kevin Granger
aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
Kevin Granger
40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
Kevin Granger
993690801e // Small changes with layout an css 2013-06-17 18:49:45 +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
PrestaEdit
28af026c06 [-] BO: Ajax Confirmation / padding-left 2013-05-12 01:04:00 +03:00
Damien Metzger
459768d1ac [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Rémi Gaillard
b101bdca71 // Fix #PSCFV-8599 remove non existant image from css 2013-04-05 17:50:21 +02:00
sLorenzini
e7c15d5dfa [-] BO: fixed bug #PSCFV-8258 2013-04-03 11:34:41 +02:00
sLorenzini
6a2ec21ec9 [-] BO: fixed bug cart rules display 2013-03-01 14:45:26 +01:00
vAugagneur
ec7ca41c3e //fix small css bug 2013-02-05 15:44:02 +01:00
vAugagneur
d0d3180509 Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur
947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
gRoussac
39d7863eac [-] BO : fix css for iframe of custom products when creating order in BO 2013-01-23 18:38:00 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Milow
1375ca9590 Fix css errors 
In css/admin.css, cellpadding and cellspacing are not valid css, so
replace them with the correct css equivalent.

In css/product.css, simply remove an extra 6 on color.
 2012-11-23 20:37:20 -06:00
vAugagneur
1bd44e79a9 //fix from sarah 2012-11-22 16:48:21 +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
1429851fd1 [-] BO : fix #PSCFV-4596 : added an option for to force the id during CSV import 2012-10-02 12:08:41 +00:00
sLorenzini
819ad5d04d // warning message in BO modified and fixed 2012-09-28 07:52:21 +00:00
sLorenzini
4c157e9744 [-] FO : fixed bug #PSCFV-4341 2012-09-27 14:32:59 +00:00
sLorenzini
357eca6afb [-] FO : fixed bug #PSCFV-4341 2012-09-27 14:32:29 +00:00
dMetzger
0e39dc4bd0 // Fixed CSS display #PSCFV-3673 2012-08-20 15:23:13 +00:00
dMetzger
e1840e9fb8 // Remove doubled semi-colons #PSCFV-3185 2012-07-13 07:14:58 +00:00
lLefevre
8a72964cb8 [-] BO : fix #PSCFV-3145 2012-07-12 16:07:53 +00:00
mDeflotte
eb7a4bc796 // Avoid line break on prices 2012-07-06 12:35:36 +00:00
mDeflotte
3a89f8c522 [-] BO : #PSCFV-3086 - Improve visibility of some elements on return details 2012-07-06 12:25:03 +00:00
mMarinetti
da4c1dd664 [-] BO : Fixed #PSCFV-2759 2012-06-20 14:18:27 +00:00
vAugagneur
f007796090 [-] BO : fixed bug #PSCFV-2731 2012-06-19 12:41:20 +00:00
lLefevre
0e8dd769a9 [-] BO : Fix gradient in ie 2012-06-07 11:51:57 +00:00
lLefevre
97992aac2d [-] BO : Fix gradient in ie 2012-06-07 10:58:35 +00:00
mDeflotte
c060909bd1 [-] Project : #PSCFV-2633 #PSCFV-2622 - Fix problems with multishipping and order payment & invoice 2012-06-01 15:40:32 +00:00
mDeflotte
5d42074ae3 [-] BO : #PSCFV-2606 - Fix bug with FastCGI/CGI and url multishopping (we cannot be sure the mod_rewrite is enable or disable) 2012-05-30 07:54:12 +00:00
rMalie
d849e49cf4 // Fix CSS for multishop #PSCFV-2507 2012-05-22 12:43:15 +00:00
lLefevre
8f5e56b571 // fix css 2012-05-21 18:07:43 +00:00
lLefevre
94e35ac483 [-] BO : fix #PSCFV-2366 : check if an sentence use an specific syntax 2012-05-21 17:31:48 +00:00
tDidierjean
5b9c0522e4 [-] BO : fix bug #PSCFV-2387 - z-index fixes 2012-05-18 09:20:53 +00:00
vSchoener
9e42e47f8d // Delete Accounting #2 2012-05-10 10:36:05 +00:00
lLefevre
26794885d4 [-] BO : #PSCFV-2289 : fix CSS for hint messages 2012-05-10 09:06:54 +00:00
rMalie
522d7cc950 // Multishop interface reworked 2012-05-09 15:05:39 +00:00