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

80 Commits

Author SHA1 Message Date
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud
874e17aa6f // remove javascript include from tpl 2013-10-03 17:55:30 +02:00
Kevin Granger
c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
Francois Gaillard
e6abe1c5a0 // Release branch merged 2013-08-29 18:46:34 +02:00
Rémi Gaillard
c72fd867fe // git checkout controllers/ 2013-08-28 12:24:10 +02:00
Rémi Gaillard
63d9005a10 // liveedit 2013-08-28 12:21:01 +02:00
Vincent Augagneur
0a2d8175a7 //small fix 2013-08-28 10:03:50 +02:00
Vincent Augagneur
ad428dfb2b //MERGE branche release 2013-08-26 10:59:36 +02:00
Vincent Augagneur
d48df48a03 //small fux on live edit URL 2013-08-23 09:44:47 +02:00
Kevin Granger
3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Vincent Augagneur
8a0745e8de [-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore 2013-08-19 17:21:03 +02:00
Sarah Lorenzini
142006e69a // update advanced parameters 2013-08-02 15:10:58 +02:00
Sarah Lorenzini
d744b9dbf2 // update localization and modules tabs 2013-07-31 14:47:21 +02:00
gRoussac
024800d4f9 // w3c multiple 2013-07-30 20:04:45 +02:00
Captain-FLAM
be613fa008 fixup! [*] BO : Proposition : IMPROVEMENT Admin Modules Positions 2013-07-30 17:42:50 +01:00
Captain-FLAM
0de4642d09 [*] BO : Proposition : IMPROVEMENT Admin Modules Positions 
You can see in action over there :
http://www.youtube.com/watch?v=e7KXuCU3RIM
 2013-07-29 12:35:02 +01:00
sLorenzini
4919d6d81a // update positions module tab 2013-07-12 17:48:07 +02:00
vAugagneur
1280152db9 [-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404 2013-04-25 10:59:18 +02:00
vAugagneur
ac9a5c5a41 [-] CORE : fixed bug #PSCFV-8723 - PSCFV-8656 live edit 404 2013-04-25 10:59:18 +02:00
gRoussac
02e7a8ca00 [-] BO : Fix bug #PSCFV-8481 no live edit on index when one language is active only 2013-03-29 11:37:08 +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
gRoussac
182f8cdbaa [-] BO : Fix live edit link 2013-03-15 14:36:59 +01:00
gRoussac
9aada9f24b [-] BO : Fix live edit link 2013-03-15 14:36:59 +01: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
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
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
vAugagneur
d63de05282 [-] BO : fixed bug #PSCFV-4660 , #PSCFV-4124 2012-10-03 09:49:09 +00:00
vAugagneur
478e312a3d [-] BO : fixed bug #PSCFV-4660 , #PSCFV-4124 2012-10-03 09:49:09 +00:00
vAugagneur
8e87670a71 [-] BO : fixed bug #PSCFV-3226 2012-08-08 09:41:58 +00:00
vAugagneur
9d80094cbb [-] BO : fixed bug #PSCFV-3226 2012-08-08 09:41:58 +00:00
rGaillard
54675df666 // ajax.php clean and bug fixes 2012-06-15 13:22:07 +00:00
rGaillard
4491986f65 // ajax.php clean and bug fixes 2012-06-15 13:22:07 +00:00
vAugagneur
ec0c33a995 [-] BO : fixed bug #PSCFV-2779 - live edit not working + friendly URL 2012-06-14 13:06:52 +00:00
vAugagneur
fce19dbf21 [-] BO : fixed bug #PSCFV-2779 - live edit not working + friendly URL 2012-06-14 13:06:52 +00:00
rMalie
5b8e96602f // Use protected instead of private for classes we can override #PSCFV-1976 2012-04-26 08:55:55 +00:00
rMalie
e580832934 // Use protected instead of private for classes we can override #PSCFV-1976 2012-04-26 08:55:55 +00:00
vAugagneur
be23e93c6e //fixed bug #PSCFV-55 2012-04-26 08:00:06 +00:00
vAugagneur
33f73202f0 //fixed bug #PSCFV-55 2012-04-26 08:00:06 +00:00
tDidierjean
69bd98928e [-] BO : fix #PSTEST-1176 - Modules positions drag and drop - ajax process is broken, page JS too 2012-04-19 12:20:47 +00:00
tDidierjean
5a8481d718 [-] BO : fix #PSTEST-1176 - Modules positions drag and drop - ajax process is broken, page JS too 2012-04-19 12:20:47 +00:00
tDidierjean
c4ea27d4b0 [*] BO : #PSFV-865 - it is now possible to use drag and drop positions in custom controllers using HelperList 2012-04-18 15:48:38 +00:00
tDidierjean
45ea9fdaae [*] BO : #PSFV-865 - it is now possible to use drag and drop positions in custom controllers using HelperList 2012-04-18 15:48:38 +00:00
tDidierjean
6bf7fa6908 [*] BO : #PI-123 - toolbar and page title refactoring 2012-04-12 08:34:38 +00:00