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

92 Commits

Author SHA1 Message Date
fram
5f1efc6b63 // installer typography 2013-11-04 16:20:10 +01:00
Kevin Granger
889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.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/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
 2013-11-04 14:43:01 +01:00
djfm
a8a204edf3 // small correction in English installer text 2013-10-31 08:25:57 +00:00
djfm
11f60492be // removed unnecessary punctuation in English installer strings, both in source code and translations 2013-10-31 08:09:14 +00:00
djfm
16efe89bed // improved installer translations: no colons in translations and filled some missing fields 2013-10-30 16:57:30 +00:00
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
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
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
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
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
Rémi Gaillard
c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Damien Metzger
c6878bc06d // Installer improvements 2013-06-18 14:46:45 +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
Damien Metzger
ea6b4eaef8 // Fixed installer translation 2013-04-26 14:09:23 +02:00
Francois Gaillard
8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
djfm
e664335f4d [*] TR : Improved English text of installer 2013-04-25 10:24:13 +02:00
djfm
6a70093416 [*] TR : Added tab translations for installer languages 2013-04-22 15:40:25 +02:00
Damien Metzger
c4ae13af75 // Changed link to documentation in the installer 2013-04-18 16:57:05 -03:00
Damien Metzger
391d30b2cd // Fixed installer translations 2013-03-21 14:04:44 +01:00
Gregory Roussac
d758801752 [-] INSTALLER : Fix crash from genders jpg copy 2013-03-06 21:16:24 +01:00
Damien Metzger
6191b928e6 // Installer improvements 2013-02-27 14:53:51 +01:00
Damien Metzger
52435c2fad // Installer can be translated at /install-dev/dev/translate.php 2013-02-27 14:53:51 +01:00
Francois Gaillard
86215b6cd8 // Order confirmation rewrite rule added 2013-02-22 10:14:47 +01:00
Damien Metzger
f4bf4c47a9 [*] Installer : installer improvements - Step 1 2013-02-21 11:05:47 +01:00
Rémi Gaillard
4b4b4b89f2 // small typo fix 2013-02-13 12:04:42 +01:00
vAugagneur
d6f5566e65 [+] BO : added new marketing tab 2013-02-13 09:57:30 +01:00
Damien Metzger
bbe9909772 // Changed number of languages 2013-02-01 17:48:24 +01:00
Damien Metzger
1b815134a1 // A few changes in the installation wizard 2013-02-01 17:47:51 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
28a3856bfa //added check on field lenght in install and fix sql in upgrade 2012-12-13 16:26:38 +01:00
Damien Metzger
f78abb14b9 // New user assistance in the installer 2012-12-12 20:34:13 +01:00
vAugagneur
bfff958b1f Merge pull request #75 from @sebastienhouzet 2012-12-12 11:24:56 +01:00
Rémi Gaillard
131f99eb69 [-] Core: send email when payment is remotly accepted #PSCFV-6064 2012-12-10 15:57:59 +01:00
DamienMetzger
5dfa888b6f [-] Installer : name of the supplier page fixed #PSCFV-5571 2012-11-22 15:28:00 +01:00
vAugagneur
be946319be //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
07ca3c5258 // #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
398d345362 // #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
dMetzger
ab0be50ad4 // Translation #PSCFV-4234 2012-09-21 12:16:03 +00:00
lLefevre
5e8d172728 [-] TR : #PSCFV-4027 : change string "tabs" by "Menus"... 2012-09-12 15:06:48 +00:00
lLefevre
28fb99f1e9 [-] BO : fix #PSCFV-3116 2012-07-09 15:39:08 +00:00