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

74 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
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
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
Damien Metzger
a6d8ffa293 // More breadcrumbs improvements 2013-09-30 15:38:22 +02:00
Damien Metzger
17618efb8b // Fixed details 2013-08-27 15:27:51 +02: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
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
Rémi Gaillard
c0cf92cbdf [+] BO: Add a wizard to create and edit your carriers 2013-07-26 18:27:21 +02:00
Damien Metzger
a57003749b [-] IN : updated support phone number and website in the installer 2013-05-23 14:11:13 +02:00
djfm
e664335f4d [*] TR : Improved English text of installer 2013-04-25 10:24:13 +02:00
Damien Metzger
23dacfd754 // Change link to the documentation in the installer 2013-04-23 14:57:24 +02:00
djfm
6a70093416 [*] TR : Added tab translations for installer languages 2013-04-22 15:40:25 +02:00
Damien Metzger
bc796b9751 // Fixed translations (installer) 2013-03-22 11:28:56 +01:00
Damien Metzger
771d68be3d // Installer translations (de/it) 2013-03-12 15:41:54 +01:00
Damien Metzger
458fc7ad1e // Installer translations 2013-03-07 18:33:53 +01:00
Damien Metzger
c752195020 // Installer translation 2013-03-07 18:16:07 +01:00
Gregory Roussac
d758801752 [-] INSTALLER : Fix crash from genders jpg copy 2013-03-06 21:16:24 +01:00
Francois Gaillard
f80e0aee8d // IT order confirmation meta 2013-02-25 10:18:12 +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
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
vAugagneur
1415f86566 //fix for 1.5.2.0 2012-10-22 12:41:28 +00: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
dMetzger
8efbdfe2ef [-] installer : missing italian translations #PSCFV-3289 2012-07-23 07:42:36 +00:00
dMetzger
6fa9bdaced // Fixed typo #PSCFV-2995 2012-07-03 07:43:31 +00:00
lLefevre
315b7e2bb9 // Fix english translations tab 2012-06-07 16:01:05 +00:00
rMalie
cd64cf59d7 // Reorder taxes and tax rules 2012-06-06 12:25:50 +00:00
rMalie
0fd8acd67e // Rename "Genders" in "Social titles" (ty Xavier) 2012-06-04 14:48:42 +00:00
lLefevre
02e2c3de67 // Add italian translations of tabs 2012-05-30 08:26:38 +00:00
fBrignoli
2034aa477c // "Unknown" gender ... seriously? 2012-05-19 10:03:45 +00:00