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

93 Commits

Author SHA1 Message Date
Damien Metzger 01e5cec634 [*] BO : improved performances (cache systems) and countries tabs 2013-09-25 19:41:46 +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
Sarah Lorenzini 635076a7ad // update localization tab 2013-07-30 17:45:50 +02:00
Sarah Lorenzini 816153687c // update localization tab 2013-07-30 12:25:20 +02:00
Gregory Roussac 56aa91a3fa Merge pull request #296 from samy-r/dev-address-update 
[*] CORE : Add mobile phone in default adress layout update
 2013-07-25 03:05:36 -07:00
gRoussac d99a1eba24 [-] BO : Bad return value for AdminCountries::processStatus() 2013-07-18 12:12:05 +02:00
gRoussac b421d469d2 [-] Fix bug #PSCFV-8109 country creation/activation regarding payment modules restrictions 2013-06-24 16:45:10 +02:00
gRoussac ea5405a917 [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ec8deb289185daa03cd11d239797bbe5bdbaecd0 2013-05-27 19:06:59 +02:00
gRoussac b95e8e0bc9 [-] BO : Remove typo in address formating fields links 2013-04-16 12:15:31 +02:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Samy Rabih f9f673d78f Default adresse layout update 
As many countries use mobile phones in an extensive way, it should be
useful to update the default address layout
 2013-03-02 17:40:54 +01:00
gRoussac c83a0fda3f // small fix on displayError in Admincountries 2013-02-07 18:40:20 +01:00
gRoussac 1127dc35b4 // small fix on displayError in Admincountries 2013-02-07 18:40:20 +01:00
vAugagneur 94a45b0572 [-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format 2013-01-16 18:24:11 +01:00
vAugagneur 6d46644cc4 [-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format 2013-01-16 18:24:11 +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
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 2b917ed3c3 //add payment module restriction when enable country 2012-10-01 15:40:11 +00:00
vAugagneur 9f1b834d20 //add payment module restriction when enable country 2012-10-01 15:40:11 +00:00
dMetzger 773c73c20f [-] BO : fixed country listing #PSCFV-4438 2012-09-27 07:36:41 +00:00
dMetzger 6d7e162256 [-] BO : fixed country listing #PSCFV-4438 2012-09-27 07:36:41 +00:00
dMetzger eee9e6f40d // Back office optimization begun (memory & SQL) and will resume tomorrow 2012-09-26 17:52:27 +00:00
dMetzger 204e7891e8 // Back office optimization begun (memory & SQL) and will resume tomorrow 2012-09-26 17:52:27 +00:00
dMetzger e89363ca7d // Translation #PSCFV-3604 2012-08-13 13:11:25 +00:00
dMetzger 9954e3fa2d // Translation #PSCFV-3604 2012-08-13 13:11:25 +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
vAugagneur 7661ea3869 //remove unused variable 2012-06-05 09:24:15 +00:00
vAugagneur 85a3e89dd8 //remove unused variable 2012-06-05 09:24:15 +00:00
vAugagneur f65dd294db //added bulk action for enable or disable item 2012-06-04 12:00:09 +00:00
vAugagneur b9e27705df //added bulk action for enable or disable item 2012-06-04 12:00:09 +00:00
vChabot 9984380758 [-] BO : BugFix : #PSCFV-2373 : Problem on country creation 2012-05-16 13:17:07 +00:00
vChabot c70b3449f0 [-] BO : BugFix : #PSCFV-2373 : Problem on country creation 2012-05-16 13:17: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
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