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

74 Commits

Author SHA1 Message Date
Kevin Granger
8b7c29dd18 [+] BO Scenes - Tags - Attachments 2013-07-26 11:12:50 +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
Kevin Granger
9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
gRoussac
50c88dc4de [-] BO : Fix bug #PSCFV-7353 can not see the thumb for a scene 2013-06-24 14:50:10 +02:00
sLorenzini
1ebd625563 [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image 2013-04-12 11:46:19 +02:00
sLorenzini
a7d61c551e [-] BO: fixed bug css - #PSCFV-8737 - AdminScenes.php ~~ remove inline css forcing a border to #large_scene_image 2013-04-12 11:46:19 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +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
Rémi Gaillard
a5e3bc711b // replace bad attribute name 2012-12-11 12:11:47 +01:00
Rémi Gaillard
a0041364a1 // replace bad attribute name 2012-12-11 12:11:47 +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
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
sLorenzini
6f743ef889 // FO image bug fixed 2012-09-24 09:12:44 +00:00
sLorenzini
a0a9fbb719 // FO image bug fixed 2012-09-24 09:12:44 +00:00
vAugagneur
9b826f8e6f [-] BO : fixed bug #PSCFV-4021 2012-09-17 08:59:33 +00:00
vAugagneur
0a1531b167 [-] BO : fixed bug #PSCFV-4021 2012-09-17 08:59:33 +00:00
lLefevre
1da5ce07d4 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
lLefevre
12c69a6dc6 [*] TR : update English translations key for Back Office 2012-07-12 10:04:56 +00:00
vChabot
d6b8f77b46 [-] BO : BugFix : #PSCFV-2481 : Scene creation needs to show categories from context 2012-05-21 12:57:32 +00:00
vChabot
3efe7d1a46 [-] BO : BugFix : #PSCFV-2481 : Scene creation needs to show categories from context 2012-05-21 12:57:32 +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
tDidierjean
c5bf3ab59a // Rename fieldsDisplay to fields_list part2 (timeout) 2012-03-29 16:29:31 +00:00
tDidierjean
ba2abcd990 // Rename fieldsDisplay to fields_list part2 (timeout) 2012-03-29 16:29:31 +00:00
lLefevre
13bc57517a [-] BO : #PSTEST-1061 : add button save and stay in AdminScenesController 2012-03-23 09:47:55 +00:00
lLefevre
3baff47d2f [-] BO : #PSTEST-1061 : add button save and stay in AdminScenesController 2012-03-23 09:47:55 +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
rMalie
5788d00d96 // Improve shop associations in BO 2012-02-24 09:11:18 +00:00
rMalie
7655ee2a3e // Improve shop associations in BO 2012-02-24 09:11:18 +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
lLefevre
9df3de917b [-] BO : #PSTEST-792 : Translation of scenes 2012-02-16 15:15:19 +00:00
lLefevre
efd6a5bec1 [-] BO : #PSTEST-792 : Translation of scenes 2012-02-16 15:15:19 +00:00
tDidierjean
a08dd8a8b9 [-] BO : #PSTEST-705 fix scene image upload 2012-02-13 17:36:34 +00:00
tDidierjean
0f40efc18b [-] BO : #PSTEST-705 fix scene image upload 2012-02-13 17:36:34 +00:00
tDidierjean
9310c81d50 // Finish removing the "id_theme in ImageType" code 2012-02-13 15:35:05 +00:00
tDidierjean
5946c9fe93 // Finish removing the "id_theme in ImageType" code 2012-02-13 15:35:05 +00:00
tDidierjean
fd0028cd60 // Replace public by protected in override methods 2012-02-06 13:41:51 +00:00
tDidierjean
fccb65f6d3 // Replace public by protected in override methods 2012-02-06 13:41:51 +00:00