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

60 Commits

Author SHA1 Message Date
Jerome Nadaud
a536833f52 // Some bootstrap changes in controllers 2013-11-20 18:44:20 +01:00
fram
be38a438e2 // sprintf & English 2013-11-08 11:39:59 +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
gRoussac
a43851469e [-] CORE : Currency conversion rate can not be 0 2013-10-29 15:39:17 +01:00
Jerome Nadaud
f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02: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
bb96c8754f [*] LO : set correct currency format for CHF 2013-10-11 07:14:30 +00:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud
b9ccfe858b // Localization Bootstrap design 2013-09-26 11:36:28 +02:00
djfm
6195d0c319 [*] LO : Use single quote as thousands separator for CHF currency 2013-09-23 16:32:40 +00: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
Damien Metzger
8c47ca3edf [-] BO : fixed sort by currency exchange rate #PSCFV-9840 2013-07-19 11:40:52 +02:00
Damien Metzger
56aab3c676 // Fixed references to a "conversion rate" that was in fact the "exchange rate" 2013-07-01 12:14:50 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard
41645cb225 [-] BO: Fix Currencies bulk statuses and deletion 2013-03-05 18:16:52 +01:00
Rémi Gaillard
6a261cbc66 // small fix 2013-02-01 16:56:30 +01:00
djfm
385c593129 //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
Rémi Gaillard
2a14176055 [*] Core: conversion_rate of currencies are now multishop 2012-12-20 11:35:20 +01:00
vAugagneur
a1db83ef41 //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
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
dMetzger
44e5f740fa // Fixed misleading text #PSCFV-4292 2012-09-24 07:25:22 +00:00
vAugagneur
50e47ab193 [-] BO : fixed bug #PSCFV-3957 2012-09-17 09:18:50 +00:00
vAugagneur
8deb5583ad [-] BO : fixed bug #PSCFV-3541 2012-08-08 09:49:34 +00:00
lLefevre
58e35f3da8 [*] BO : #PSCFV-2671 : Added a new currency format for Switzerland 2012-07-11 08:20:23 +00:00
vAugagneur
f65dd294db //added bulk action for enable or disable item 2012-06-04 12:00:09 +00:00
dMetzger
c7df242539 [-] BO : refresh currency rates button fixed 2012-05-19 14:40:10 +00:00
tDidierjean
e9c8678cd6 // Helpers : remove param 'float' 2012-04-10 13:07:19 +00:00
tDidierjean
c5bf3ab59a // 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
98aa77ef24 // Refactoring: remove $token arg from process functions 2012-03-26 15:25:36 +00:00
lLefevre
1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
rMalie
d2cfa4e8da [*] BO : reorganization of admin tabs 2012-03-02 14:44:07 +00:00
rMalie
0c5e47520d // Fix multishop context in BO 2012-02-27 17:14:33 +00:00
rMalie
7780d7a634 // Fix currencies with multishop #PSTEST-809 2012-02-27 09:49:43 +00:00
rMalie
1ffb8998f3 // Fix multishop_context 2012-02-24 10:38:24 +00:00
rMalie
5788d00d96 // Improve shop associations in BO 2012-02-24 09:11:18 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
735842b766 // Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller 2012-02-22 14:25:28 +00:00
mMarinetti
1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
fBrignoli
232cef2771 [-] BO : Bug Fixed #PSTESTS-672 An error has occured during currency creation 2012-02-17 14:49:49 +00:00
rMalie
26a012c62e // Normalize 2012-01-25 16:39:34 +00:00
tDidierjean
8a757aaa9c // Refactor AdminController::_errors to errors 2012-01-11 08:58:12 +00:00
lLefevre
b699d169e0 [-] BO : fix small bug for translations 2012-01-05 08:45:23 +00:00
vKham
92d53b1cea //add fix table extensible currencies 2011-12-27 17:33:50 +00:00
rMalie
ba8c205c33 // Fix missing Core suffix for some classes / controllers 2011-12-05 16:49:05 +00:00
tDidierjean
93fe92e6dd // AdminCurrencies refactoring 2011-12-01 09:44:58 +00:00
lLefevre
c97ee6e2f9 // fix bug in bulk_actions of type "delete" in AdminController's 2011-11-30 15:24:50 +00:00