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

162 Commits

Author SHA1 Message Date
Vincent Augagneur
5564b342f4 //wizard boostrap and title fix 2013-10-04 17:07:10 +02: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
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
Damien Metzger
36acfc1227 // Updated russian translation of the installer 2013-05-23 14:29:57 +02:00
Damien Metzger
affca31558 [-] IN : updated support phone number and website in the installer 2013-05-23 14:11:13 +02:00
Damien Metzger
9edf97ee52 // Fixed installer translation 2013-04-26 14:09:23 +02:00
François Gaillard
6106066ef1 // Release branch merged 2013-04-25 17:00:56 +02:00
djfm
8f406fcd1d [*] TR : Improved English text of installer 2013-04-25 10:24:13 +02:00
Damien Metzger
bec335441e // Change link to the documentation in the installer 2013-04-23 14:57:24 +02:00
djfm
da1f92b85b [*] TR : added russian installer tabs 2013-04-22 18:37:28 +02:00
djfm
7912aba499 [*] TR : Added tab translations for installer languages 2013-04-22 15:40:25 +02:00
Damien Metzger
65c1198480 // Changed link to documentation in the installer 2013-04-18 16:57:05 -03:00
Rémi Gaillard
fdd4b50bf6 [-] Installer: fix installer in PT languahe 2013-04-03 11:36:44 +02:00
Rémi Gaillard
b8ecaa8528 // Fix installer in russian 2013-03-26 18:50:37 +01:00
Damien Metzger
ce6b7eacba // missing translation ES 2013-03-22 18:45:51 +01:00
Damien Metzger
c862d69a3c // Fixed russian translation 2013-03-22 11:53:54 +01:00
Damien Metzger
552d43607e // Fixed translations 2013-03-22 11:38:47 +01:00
Damien Metzger
554d740e2b // Fixed translations (installer) 2013-03-22 11:28:56 +01:00
Damien Metzger
f7ab983fe9 // Missing translation in German installer 2013-03-22 11:24:11 +01:00
Damien Metzger
f215a69e10 // Fixed installer translations 2013-03-21 14:04:44 +01:00
djfm
cb84c1cbe4 //some changes after review from Magdalena 2013-03-21 09:49:24 +01:00
kpodemski
2c3d0e7657 another utf-8 fix :( 2013-03-21 09:49:23 +01:00
kpodemski
3d7a303046 fix utf-8 2013-03-21 09:49:23 +01:00
kpodemski
1acc4439cc fix 2013-03-21 09:49:23 +01:00