dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,953 Commits 9 Branches 19 Tags
791481e1494dca7fc56944b458bcc67976112cc7
Commit Graph
53 Commits
Author SHA1 Message Date
Sarah Lorenzini 791481e149 // update login page 2013-10-02 16:00:54 +02:00
Sarah Lorenzini 1cb7f27a21 // update login page bootsrap 2013-10-02 14:38:13 +02:00
Sarah Lorenzini ba06b217cc // update javascript login page 2013-10-02 14:36:14 +02:00
Kevin Granger f8f2c99d28 // Modules page + Warning 2013-08-26 11:38: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
Jérôme Nadaud 0f7d59ad26 [-] BO : FixBug #PSCFV-9878 Wrong login tab order 2013-07-22 17:07:57 +02:00
Kevin Granger 40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
gRoussac a0db01db58 // removed slash 2013-04-09 17:47:34 +02:00
gRoussac 4ff8ca7696 // removed slash 2013-04-09 17:47:34 +02:00
gRoussac 1b01c7a602 [-] BO : Fix bug #PSCFV-8626 rename actual admin folder 2013-04-09 17:43:15 +02:00
gRoussac b623f50df7 [-] BO : Fix bug #PSCFV-8626 rename actual admin folder 2013-04-09 17:43:15 +02:00
gRoussac 98306be83f // admin folder name 2013-03-26 19:15:37 +01:00
gRoussac 033daeb7ff // admin folder name 2013-03-26 19:15:37 +01:00
gRoussac 135bd2cd42 [-] BO : Remove warning at login template 2013-03-26 18:58:03 +01:00
gRoussac e11f0e7ce9 [-] BO : Remove warning at login template 2013-03-26 18:58:03 +01: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
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
dMetzger 2a297990a0 // W3C 2012-08-20 08:48:53 +00:00
dMetzger c4d3116607 // W3C 2012-08-20 08:48:53 +00:00
lLefevre 3ddf7259a2 [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
lLefevre 9925bf30ad [-] FO : #PSCFV-2150 : Translations of back office are connected width sprintf() 2012-05-14 14:38:07 +00:00
aFolletete b52c762dee [-] BO : fixed bug #PSCFV-2180 - Not auto height with long name shop 
// Clean HTML, JS, CSS code
 2012-05-03 13:48:58 +00:00
aFolletete c63dfb8fe1 [-] BO : fixed bug #PSCFV-2180 - Not auto height with long name shop 
// Clean HTML, JS, CSS code
 2012-05-03 13:48:58 +00:00
lLefevre c4b477e13a [-] BO : fixed #PSFV-727 (issue #4) 2012-04-05 10:06:17 +00:00
lLefevre 336c0f4d7f [-] BO : fixed #PSFV-727 (issue #4) 2012-04-05 10:06:17 +00:00
tDidierjean 718e907d5e [-] BO : fix #PSTEST-1117 - bad handling of UTF8 strings in templates 2012-03-30 14:50:33 +00:00
tDidierjean 9024a89a1e [-] BO : fix #PSTEST-1117 - bad handling of UTF8 strings in templates 2012-03-30 14:50:33 +00:00
lLefevre 1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
lLefevre c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
vAugagneur ba52d26efc //small fix on BO login 2012-03-14 10:49:23 +00:00
vAugagneur d93eff8834 //small fix on BO login 2012-03-14 10:49:23 +00:00
rMalie 65fe2fe7c8 // Fix copyright in admin login page #PSTEST-1031 2012-03-14 09:05:56 +00:00
rMalie 17eb989aa9 // Fix copyright in admin login page #PSTEST-1031 2012-03-14 09:05:56 +00:00
vAugagneur 526301f67d [-] BO : #PSFV-608 - "Access denied" message in BO when login as Logistician 2012-03-12 14:15:31 +00:00
vAugagneur bdfa10fa42 [-] BO : #PSFV-608 - "Access denied" message in BO when login as Logistician 2012-03-12 14:15:31 +00:00
rMalie 82b50fcd20 // Fix javascript error in AdminLogin 2012-02-28 08:52:59 +00:00
rMalie 56913068a7 // Fix javascript error in AdminLogin 2012-02-28 08:52:59 +00:00
rMalie 14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie 1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti 1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
mMarinetti 677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
tDidierjean c4f2d0e202 [-] BO : fix bug #PSFV-421 - bug with redirection after login 2012-02-14 16:29:21 +00:00
tDidierjean e5c9477a08 [-] BO : fix bug #PSFV-421 - bug with redirection after login 2012-02-14 16:29:21 +00:00
lLefevre 7a36bc48d9 // fix htmlentities in .tpl 2012-02-01 18:00:32 +00:00
lLefevre e0d34a8746 // fix htmlentities in .tpl 2012-02-01 18:00:32 +00:00
mMarinetti 7d44848546 install-new renamed to install-dev in files 2012-01-26 17:29:50 +00:00