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

56 Commits

Author SHA1 Message Date
Kevin Granger
67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Jerome Nadaud
1a1f3de775 [-] BO: Fixbug #PSCFV-10671 - Double htmlentities. 2013-10-11 13:33:31 +02:00
Jerome Nadaud
e81c9490b0 // Advanced parameters bootstrap design 2013-09-25 15:15:28 +02:00
Sarah Lorenzini
142006e69a // update advanced parameters 2013-08-02 15:10:58 +02: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
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
fBrignoli
0545f30629 // toolbar 2012-06-01 07:32:03 +00:00
fBrignoli
c1ae5c38bc // toolbar 2012-06-01 07:32:03 +00:00
lLefevre
0d4ff05960 [-] FO : #PSCFV-67 : Translation english updated and english keys update in all languages 2012-05-15 10:04:43 +00:00
lLefevre
0129e7314a [-] FO : #PSCFV-67 : Translation english updated and english keys update in all languages 2012-05-15 10:04:43 +00:00
tDidierjean
c442f0365a // Rename fieldsDisplay to fields_list part1 (timeout) 2012-03-29 16:26:54 +00:00
tDidierjean
215ca93f95 // Rename fieldsDisplay to fields_list part1 (timeout) 2012-03-29 16:26:54 +00:00
tDidierjean
60ad46c3d1 // Renaming options to fields_options 2012-03-29 16:14:14 +00:00
tDidierjean
e0664df6f8 // Renaming options to fields_options 2012-03-29 16:14:14 +00:00
lLefevre
6301922ab9 // Fix replace //" by " in english keys and change french keys 2012-03-14 17:25:41 +00:00
lLefevre
74cd81a66c // Fix replace //" by " in english keys and change french keys 2012-03-14 17:25:41 +00:00
lLefevre
9f4e2698ee // revert to revision 14160 2012-03-14 15:05:13 +00:00
lLefevre
05c2b696ce // revert to revision 14160 2012-03-14 15:05:13 +00:00
lLefevre
7d71d0316c // Fix replace \\" by " in english keys 2012-03-14 14:58:48 +00:00
lLefevre
6608328a2a // Fix replace \\" by " in english keys 2012-03-14 14:58:48 +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
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
mMarinetti
4fe4962033 // minor fix in adminBackup : initContent now returns a value 2012-01-24 15:40:07 +00:00
mMarinetti
93b5286215 // minor fix in adminBackup : initContent now returns a value 2012-01-24 15:40:07 +00:00
tDidierjean
8a757aaa9c // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
tDidierjean
88b3c8f9e7 // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
lLefevre
ee4f5860f2 [-] BO : fix action add in AdminBackupController 2012-01-05 13:52:45 +00:00
lLefevre
aa27d044fd [-] BO : fix action add in AdminBackupController 2012-01-05 13:52:45 +00:00
lLefevre
3e503aa527 [-] BO : fix #PSFV-316 2012-01-05 13:22:46 +00:00
lLefevre
5cb7cdcdfd [-] BO : fix #PSFV-316 2012-01-05 13:22:46 +00:00
mMarinetti
fea708c43c // reported fix from 1.4.x 2011-12-21 20:36:17 +00:00
mMarinetti
ccad5bbab8 // reported fix from 1.4.x 2011-12-21 20:36:17 +00:00
lLefevre
c97ee6e2f9 // fix bug in bulk_actions of type "delete" in AdminController's 2011-11-30 15:24:50 +00:00
lLefevre
046f584884 // fix bug in bulk_actions of type "delete" in AdminController's 2011-11-30 15:24:50 +00:00
tDidierjean
aefa581603 // Rename AdminController methods initForm() initList() etc. to renderForm() renderList() 2011-11-30 11:06:38 +00:00
tDidierjean
885701b27a // Rename AdminController methods initForm() initList() etc. to renderForm() renderList() 2011-11-30 11:06:38 +00:00
lLefevre
752d85b6e1 // fix bug in AdminBackupController 2011-11-22 14:44:54 +00:00
lLefevre
e9d9f45290 // fix bug in AdminBackupController 2011-11-22 14:44:54 +00:00