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

63 Commits

Author SHA1 Message Date
Kevin Granger
be8f728b2a // orders 2013-09-19 12:09:25 +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
Kevin Granger
a1cc4d14d0 [+] BO Customers > Customers / Customers > Groups 2013-07-30 18:47:13 +02:00
Kevin Granger
488cf0919a // BO attributes 2013-07-25 15:51:41 +02:00
ldecoker
624fed3710 Update form.tpl 2013-04-16 19:15:45 +03:00
ldecoker
a40f61e922 ";" in wrong place 
Should be after display but inside quotes
 2013-04-16 18:34:20 +03:00
ldecoker
4783cb17c5 ";" in wrong place 
Should be after display but inside quotes
 2013-04-16 18:34:20 +03:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
François Gaillard
064ba453e6 // 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
vAugagneur
768fcf8f84 Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
a1db83ef41 //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
946dd2caf7 // 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
04fc63c2b6 // #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
779cf350af // 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
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
f6297b081d [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
lLefevre
9239de5dac [-] BO : fix #PSCFV-4933 : add recursively index.php file 2012-10-12 12:17:04 +00:00
rMalie
0580bb4f44 // Fix bug with checkbox and multishop 2012-05-14 14:24:48 +00:00
rMalie
ef31252386 // Fix bug with checkbox and multishop 2012-05-14 14:24:48 +00:00
rMalie
97a37ff566 // Fix attribute values creation in multishop #PSCFV-2313 2012-05-14 10:22:51 +00:00
rMalie
fe6876a8d9 // Fix attribute values creation in multishop #PSCFV-2313 2012-05-14 10:22:51 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
tDidierjean
9024a89a1e [-] BO : fix #PSTEST-1117 - bad handling of UTF8 strings in templates 2012-03-30 14:50:33 +00:00
tDidierjean
718e907d5e [-] BO : fix #PSTEST-1117 - bad handling of UTF8 strings in templates 2012-03-30 14:50:33 +00:00
rMalie
fa5bb1c8c7 // Fix attributes values form page for multishop #PSTEST-780 2012-03-27 09:03:52 +00:00
rMalie
e717ac2bcb // Fix attributes values form page for multishop #PSTEST-780 2012-03-27 09:03:52 +00:00
rMalie
5eec985150 // Fix attributes values form page for multishop #PSTEST-780 2012-03-23 15:44:30 +00:00
rMalie
8e9b4e6ee6 // Fix attributes values form page for multishop #PSTEST-780 2012-03-23 15:44:30 +00:00
tDidierjean
eb8447eb2a [*] BO : #PSFV-481 - Refactor HelperList position management 2012-03-13 16:22:23 +00:00
tDidierjean
b2e056ec8b [*] BO : #PSFV-481 - Refactor HelperList position management 2012-03-13 16:22:23 +00:00
tDidierjean
f44d00edde // Rename tpl blocks 2012-03-12 16:33:59 +00:00
tDidierjean
0f468ac091 // Rename tpl blocks 2012-03-12 16:33:59 +00:00
rMalie
08526a9d79 // Improve attributes ergonomy with multishop #PSTEST-780 2012-03-08 14:06:21 +00:00
rMalie
1e65dadca1 // Improve attributes ergonomy with multishop #PSTEST-780 2012-03-08 14:06:21 +00:00
rMalie
bd042f1e0b // Improve attributes ergonomy with multishop #PSTEST-780 2012-03-07 17:34:47 +00:00
rMalie
6daa5eae2b // Improve attributes ergonomy with multishop #PSTEST-780 2012-03-07 17:34:47 +00:00
tDidierjean
420d60dad2 // Refactoring helper forms with new blocks 2012-03-07 16:34:25 +00:00
tDidierjean
65d051b5df // Refactoring helper forms with new blocks 2012-03-07 16:34:25 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
lLefevre
4edd26bc79 [-] BO : #PSTEST-778 : Bug in textures for attributes 2012-02-23 14:07:19 +00:00
lLefevre
79f0ba9bfc [-] BO : #PSTEST-778 : Bug in textures for attributes 2012-02-23 14:07:19 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00