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

183 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
djfm 819dac6622 // fixed name of gender 2 in English 2013-10-10 09:36:05 +00:00
Francois Gaillard 77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
PrestanceDesign f9f5a4b090 Italian translation of the country instead of English 2013-10-07 16:45:22 +02:00
djfm 2969a7f74c // updated Russian installer 2013-10-07 10:14:43 +00:00
Tomasz Slominski 4254ae6edc typo fixed in polish installer translation (line 85) 2013-10-07 10:05:43 +02:00
djfm b6bba0c787 [*] LO : Removed 'Miss' from the default genders because too country specific 2013-10-07 07:53:19 +00:00
Vincent Augagneur 5564b342f4 //wizard boostrap and title fix 2013-10-04 17:07:10 +02:00
djfm 8580dd0b39 // remove backup files 2013-10-03 15:02:16 +00:00
djfm b92c9869a4 // added tab translations to Bengali installer 2013-10-03 14:20:08 +00:00
djfm 711f5b0bdf [+] LO : Completed Traditional Chinese Installer 2013-10-03 06:57:53 +00:00
djfm 4668d8ffa2 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into pstw 2013-10-03 06:56:08 +00:00
djfm 23df6cb875 // updated German installer translations 2013-10-01 14:52:04 +00:00
djfm e706b531bc // updated br, es, fr, ru installer translations 2013-10-01 08:41:03 +00:00
Damien Metzger a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
Kevin Granger 8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	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/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Gregory Roussac 6b30cc5084 Merge pull request #750 from djfm/psindonesia 
[+] TR : Psindonesia
 2013-09-27 00:57:20 -07:00
djfm 4e472fae50 // updated Indonesian installer 2013-09-27 07:16:23 +00:00
smartdatasoft 9109708944 // small improvements to Bengali installer 2013-09-26 11:44:28 +00:00
smartdatasoft e21eef3a87 // updated Bengali installer 2013-09-26 11:44:12 +00:00
smartdatasoft 3ded9549cf // Bengali installer translations 2013-09-26 11:43:58 +00:00
smartdatasoft 37170c74b3 [+] LO : Added Bengali installer 2013-09-26 11:39:58 +00:00
djfm 78c1dce528 [+] LO: Added Traditional Chinese installer 2013-09-26 08:23:16 +00:00
djfm 54b3ac5a32 [+] TR : Added Indonesian installer 2013-09-25 09:41:59 +00:00
djfm 65559c5cf4 // small improvement to Brazilian translations 2013-09-18 16:08:23 +00: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
Vincent Augagneur 0019426e81 //added dashboard controller 2013-08-28 10:04:28 +02:00
Damien Metzger 17618efb8b // Fixed details 2013-08-27 15:27:51 +02:00
djfm 1e1aff517f // fixed link in russian installer 2013-08-23 14:37:01 +00:00
djfm fad94047ff // small fixes in installer translations 2013-08-23 14:33:51 +00:00
djfm fb4a9cdb36 // added missing IT installer strings 2013-08-22 14:06:38 +00:00
djfm 73515f6401 // added missing PL installer strings 2013-08-22 13:57:01 +00:00
djfm e06b01699b // added missing BR installer strings 2013-08-22 13:44:33 +00:00
djfm 2082e2ad19 // added missing ES installer strings 2013-08-22 13:43:53 +00:00
djfm 29cb603804 // added missing RU installer strings 2013-08-22 13:30:12 +00:00
Damien Metzger 4de8013b5e // Fixed phone number in installer 2013-08-22 12:19:32 +02:00
Damien Metzger c5f635f967 // Updated some meta and translations 2013-08-20 10:31:03 +02:00
Vincent Augagneur 0cd6c5b200 //new tab name for carrier option 2013-08-12 17:32:55 +02:00
Damien Metzger d783160af0 // Updated installer 2013-08-06 15:53:59 +02:00
Damien Metzger 85e15c00f1 // Added missing french translation in the installer 2013-08-06 14:30:43 +02:00
Damien Metzger d9ce51f38c Merge pull request #613 from djfm/nl_installer 
[*] LO : Added Dutch Installer
 2013-07-30 06:14:40 -07:00
djfm 28c0ef2b7d // added a few translations to NL installer 2013-07-30 13:07:14 +00:00
Rémi Gaillard c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
djfm 939f7d7770 //most of the translation of the NL installer is done 2013-07-22 17:09:26 +00:00
djfm 2f6a53f971 [+] TR: Created file structure for Dutch installer 2013-07-19 15:34:10 +00:00
gRoussac 01bad90b29 // Welcome 2013 2013-07-15 16:36:54 +02:00
Damien Metzger c6878bc06d // Installer improvements 2013-06-18 14:46:45 +02:00
Damien Metzger babfbaa2d2 // Added missing space in installer 2013-06-13 11:00:01 +02:00
emily-d 2b82287459 [ - ] TR : wrong translation, Ireland is the english name, it should be Irlande in french. 2013-06-01 23:29:09 +02:00
fram e667e80280 // small changes in russian installer translation 2013-05-27 11:58:09 +00:00