77f80b1774
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
.gitignore
admin-dev/themes/default/css/admin.css
admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/page.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/orders/_documents.tpl
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/modules_list/list.tpl
classes/Tools.php
controllers/admin/AdminCartRulesController.php
controllers/admin/AdminProductsController.php
css/admin.css
2013-07-24 17:01:23 +02:00
f7d1743c8a
// fix tags in helper
2013-07-24 11:42:47 +02:00
2e3f13db95
[-] Controller : AdminTranslationsController - Fixed bug with simple & double quotes
2013-07-23 18:47:35 +02:00
4aab4f88cd
[-] BO : Fix SQL query when $join_category == false, pull request https://github.com/Captain-FLAM/PrestaShop/commit/d5f75c63b6e21dd87c77a027bf8dd293afb1a94f thanks @Captain-FLAM
2013-07-23 18:25:32 +02:00
a5e7f7fdac
Merge pull request #588 from joseantgv/patch-1
...
[-] BO : Update AdminCustomerThreadsController.php
2013-07-23 09:16:39 -07:00
dbe26e0a1d
[-] BO : Could not find cover when image table corrupted
2013-07-23 11:47:16 +02:00
63b2f63058
Update AdminCustomerThreadsController.php
...
If language is not defined returns an array instead of a string which makes function Mail::Send to throw a warning.
2013-07-23 09:58:53 +02:00
9d16eb1d1b
// BO fix + work on helpers + compass/codekit config
2013-07-22 16:43:16 +02:00
5646e682bc
[-] BO : FIxBug Correct image language in product
2013-07-19 15:21:06 +02:00
8c47ca3edf
[-] BO : fixed sort by currency exchange rate #PSCFV-9840
2013-07-19 11:40:52 +02:00
78ddec3ac7
[-] BO : translation copy is now easier #PSCFV-8886
2013-07-18 18:51:37 +02:00
0b4512dbcb
// some work on style sheets
2013-07-18 18:51:24 +02:00
ac02e5191a
// ups
2013-07-18 18:34:10 +02:00
354622857f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:31:35 +02:00
958d92c9fa
[*] BO: Add an option to allow iframes on descriptions
2013-07-18 18:31:31 +02:00
a6b2299ed1
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 14:08:36 +02:00
a6da3e94f0
[-] BO : FixBug #PSCFV-9723 Exporting quantity in instant stock was not returning all rows
2013-07-18 14:02:22 +02:00
69066361a6
[-] BO : FixBug #PSCFV-8234 Products tags not correctly indexed in search
2013-07-18 12:15:42 +02:00
d99a1eba24
[-] BO : Bad return value for AdminCountries::processStatus()
2013-07-18 12:12:05 +02:00
5939f65fac
//norms
2013-07-17 19:05:01 +02:00
eecfdae0b6
[-] BO : FixBug #PSCFV-8217 Shop logo image not refresh after change
2013-07-17 18:23:59 +02:00
5c6640c258
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 17:34:44 +02:00
458838e598
[-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent
2013-07-17 17:33:53 +02:00
8d5a632c92
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 16:34:50 +02:00
c9d2cf8ed2
Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate
...
Conflicts:
admin-dev/header.inc.php
2013-07-17 16:31:49 +02:00
6884d7c5de
[-] BO : FixBug #PSCFV-8287 Breadcrumbs label was wrong
2013-07-17 16:19:15 +02:00
421c199e1f
[-] BO : FixBug #PSCFV-8229 Default country value set to manufacturer country
...
Default country value set to manufacturer country
Click on manufacturer address line now redirect to manufacturer address
edition
2013-07-17 15:13:34 +02:00
1199ad8cf2
[-] BO : FixBug #PSCFV-6365 Missing message confirmation for Images modification in Preferences > Images
2013-07-17 10:51:34 +02:00
02921dc9d0
[+] Helper form WIP
2013-07-16 19:23:46 +02:00
ea89c2235d
[-] BO : Fix bug #PSCFV-9722, do not propose adding root categories in categories when there is only one shop
2013-07-16 19:01:05 +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
8d39f32506
[-] BO: Fix tax rule edition - unique tax rule can't be edited
2013-07-16 11:52:05 +02:00
3d283000a0
// Fixed misplaced comma
2013-07-16 10:27:52 +02:00
97b16d2726
[-] BO : Fix Bug #PSCFV-9550 Bad URL redirection
2013-07-16 09:59:47 +02:00
272f2ec8f7
Merge pull request #573 from soware/patch-2
...
[*] BO : Update AdminStockManagementController.php
2013-07-15 09:49:17 -07:00
d9c2ec37d4
// Code cleaning
2013-07-15 18:13:07 +02:00
a3039024e7
// Code cleaning
2013-07-15 18:07:53 +02:00
66f64c1baa
// update order tab
2013-07-15 17:58:23 +02:00
c253a8edf4
Update AdminStockManagementController.php
...
Hi, I altered these values to make default on the radio button.
I think is better because is a value more frequent in stock management form.
2013-07-15 12:45:00 -03:00
0c4a5bd984
// update module tab positions & payment
2013-07-15 11:55:06 +02:00
c89281166b
Merge pull request #467 from PrestaEdit/patch-40
...
[-] BO : Controller: AdminTranslationsController / Back translations
2013-07-12 09:23:29 -07:00
4919d6d81a
// update positions module tab
2013-07-12 17:48:07 +02:00
4b492046c0
// add another logs information
2013-07-12 10:55:37 +02:00
994d43d3e4
// Oops
2013-07-12 09:40:14 +02:00
9af2d3946f
// Fixed potential error when deleting a module
2013-07-11 18:46:06 +02:00
17ee071bdf
Merge pull request #540 from axometeam/patch-7
...
[*] BO : Correct the getList() request for quantity and id_product
2013-07-11 06:40:17 -07:00
004e833b24
[+] BO: Addition, deletion and edition are now logged
2013-07-11 14:50:23 +02:00
d772d97bfa
[-] BO : you can now have different mail topic for one mail template #PSCFV-9617
2013-07-11 14:27:40 +02:00
f042d704d2
// field translatable + tpl products + fixs
2013-07-10 19:39:35 +02:00
Kevin Granger