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
92c2f6953f
changed path from dirname(__FILE__) to PS_ROOT_DIR
2013-10-24 11:44:52 +02:00
30adb0932d
[-] BO : pass correct typed parameter to setCurrency
2013-10-07 23:42:26 +03:00
1787923c4c
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency (changed NULL to lowercase)
2013-10-05 00:42:29 +03:00
481cb5c28a
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency
2013-10-04 23:30:24 +03:00
06a178b8fe
// Replaced screencast option by menu option
2013-09-12 18:24:18 +02:00
53c1e56c51
[-] BO : Bug fix - Encoding & tips of the day
2013-09-12 14:32:02 +02:00
d0087267df
// Fixed tips of the day & encoding
2013-08-30 14:22:24 +02:00
0023950c72
[-] BO: correct link in Block Discover.
2013-08-08 11:44:24 +02:00
144c85ed4f
// Removed useless param
2013-08-05 11:40:03 +02:00
fc63b8ad7f
// Improved configuration checklist
2013-08-02 09:11:55 +02:00
af9397a11b
[-] BO : fixed domain warning
2013-08-01 10:50:21 +02:00
6ddf2ee1ab
[-] BO : FixBug allow_url_fopen on BackOffice home page
2013-07-30 15:19:54 +02:00
e7eae03508
Merge pull request #575 from dreammeup/development
...
[-] BO : Correcting errors in order graph at admin home
2013-07-16 07:17:03 -07:00
82c7e3eeff
Correcting errors in order graph at admin home
...
The SQL request was returning multiple lines for every days. This modification change the request to have one line for the 7 days of the week.
So it corrects the number who was totally wrong.
2013-07-16 15:34:52 +02:00
54fac4ee54
// Fixed charset for some items of the dashboard
2013-06-18 14:59:22 +02:00
5d9d3938e5
// small change on optimization tips for smarty
2013-06-04 15:20:09 +02:00
b70497189d
[+] INSTALLER : added modules install from addons
2013-03-20 11:04:48 +01:00
b95b5861ef
[+] INSTALLER : added modules install from addons
2013-03-20 11:04:48 +01:00
85c77105f6
// Remove unnecessary fsockopen
2013-03-15 16:25:19 +01:00
0f2551f5d6
// Remove unnecessary fsockopen
2013-03-15 16:25:19 +01:00
ed947bc123
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
77efe4c04e
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
24ce24426f
[-] MO : Bug fix : AdminHomeController, allow_url_fopen && Tools::file_get_contents()
2013-03-06 11:11:57 +01:00
1cf72fa19a
[-] MO : Bug fix : AdminHomeController, allow_url_fopen && Tools::file_get_contents()
2013-03-06 11:11:57 +01:00
53aefa5b33
[-] BO : Premium activation block & logos
2013-03-05 15:15:18 +01:00
11c3eb0ae5
[-] BO : Premium activation block & logos
2013-03-05 15:15:18 +01:00
338ba1ce85
// AdminHomeController, syntax changed
2013-01-16 18:47:29 +01:00
9390dd63af
// AdminHomeController, syntax changed
2013-01-16 18:47:29 +01:00
385c593129
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
714a5e08cc
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
064ba453e6
// Welcome 2013
2013-01-04 11:19:03 +01:00
8baf87eef5
// Welcome 2013
2013-01-04 11:19:03 +01:00
a4b6594f9c
// Fix PHP notice #PSCFV-5967
2012-12-04 14:33:12 +01:00
6cad7c2bf4
// Fix PHP notice #PSCFV-5967
2012-12-04 14:33:12 +01:00
4368782c4b
[-] BO : fixed duplicated rows with free order in dashboard stats #PSCFV-5626
2012-11-23 10:41:34 +01:00
7fc19de6d3
[-] BO : fixed duplicated rows with free order in dashboard stats #PSCFV-5626
2012-11-23 10:41:34 +01:00
a1db83ef41
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
be946319be
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
779cf350af
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
2012-10-17 09:29:43 +00:00
6588f9514c
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
2012-10-17 09:29:43 +00:00
046b51ab99
// #PSCFV-5017 : update bad licenses in all files
2012-10-17 06:18:59 +00:00
398d345362
// #PSCFV-5017 : update bad licenses in all files
2012-10-17 06:18:59 +00:00
06e88dcdb7
[-] TR : #PSCFV-4027 : change string "tabs" by "Menus"...
2012-09-12 15:06:48 +00:00
5e8d172728
[-] TR : #PSCFV-4027 : change string "tabs" by "Menus"...
2012-09-12 15:06:48 +00:00
3ff989ac30
// Fixed bug #PSCFV-3857
2012-09-10 08:58:34 +00:00
5e54118fb2
// Fixed bug #PSCFV-3857
2012-09-10 08:58:34 +00:00
5a53f18cc4
// Fixed first part of bug #PSCFV-3857
2012-09-10 08:27:38 +00:00
0f9a21ec2e
// Fixed first part of bug #PSCFV-3857
2012-09-10 08:27:38 +00:00
130cd93824
// Fixed // Fixed potential warning on homepage #PSCFV-3687
2012-08-20 14:53:45 +00:00
Kevin Granger