 Francois Gaillard
|
63f4743134
|
[-] MO : PNM-1715 - Bug fix accented chars & ajax-cart
|
2013-09-19 17:31:35 +02:00 |
|
|
gRoussac
|
e0b59082f9
|
[-] BO : Issue with domready on adminImport
|
2013-09-19 17:19:51 +02:00 |
|
|
Vincent Augagneur
|
97cff2210f
|
//removed unused code
|
2013-09-19 17:01:20 +02:00 |
|
|
Vincent Augagneur
|
53e046c4b5
|
//removed unused code
|
2013-09-19 17:00:50 +02:00 |
|
|
gRoussac
|
0361d5db8d
|
[-] BO : do not reaffect import_type for categories
|
2013-09-19 16:59:04 +02:00 |
|
|
Kevin Granger
|
f222bb7b7f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-19 16:58:12 +02:00 |
|
|
Kevin Granger
|
650001024a
|
// orders cleanup
|
2013-09-19 16:55:06 +02:00 |
|
|
Vincent Augagneur
|
2b2b502ba2
|
//blockbestsellers && bankwire now use displayError & displayConfirmation
|
2013-09-19 16:55:04 +02:00 |
|
|
Vincent Augagneur
|
150b68b96b
|
//displayError & displayConfirmation use bootstrap design
|
2013-09-19 16:52:58 +02:00 |
|
|
Vincent Augagneur
|
a5642d43a3
|
//blockbestsellers module configuration is now using bootstrap design
|
2013-09-19 16:47:51 +02:00 |
|
|
Vincent Augagneur
|
ef063db2f0
|
//bankwire module configuration is now using bootstrap design
|
2013-09-19 16:39:22 +02:00 |
|
|
gRoussac
|
ea6ea955bb
|
// licence
|
2013-09-19 16:39:21 +02:00 |
|
|
gRoussac
|
803b6ce8ec
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
Conflicts:
controllers/admin/AdminImportController.php
|
2013-09-19 16:38:01 +02:00 |
|
|
gRoussac
|
0c511dead5
|
[*] FIX #PSCFV-8106 do not regenerate thumbnails if not
|
2013-09-19 16:28:19 +02:00 |
|
|
Jerome Nadaud
|
33943ef66a
|
// Date range filter
|
2013-09-19 16:23:26 +02:00 |
|
|
Vincent Augagneur
|
d1a35838cf
|
//small fix
|
2013-09-19 16:09:53 +02:00 |
|
|
Jerome Nadaud
|
3b465111b9
|
// Customer group
|
2013-09-19 15:57:28 +02:00 |
|
|
Jerome Nadaud
|
15622fbf45
|
// Customers group
|
2013-09-19 14:25:17 +02:00 |
|
|
Jerome Nadaud
|
cd627113b6
|
// Some fix
|
2013-09-19 12:13:24 +02:00 |
|
|
Kevin Granger
|
d735496159
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-19 12:09:34 +02:00 |
|
|
Kevin Granger
|
be8f728b2a
|
// orders
|
2013-09-19 12:09:25 +02:00 |
|
|
Jerome Nadaud
|
eb1531a0b3
|
// Fix textlang size and textarea input group
|
2013-09-19 11:23:09 +02:00 |
|
|
Jerome Nadaud
|
c23f01cdc8
|
// Attributes Groups view
|
2013-09-19 10:48:16 +02:00 |
|
|
Rémi Gaillard
|
6b47f5713e
|
// another fix for multishop fields in context all on product page
|
2013-09-19 09:48:46 +02:00 |
|
|
Rémi Gaillard
|
5eb4c93b8c
|
[-] BO: Bad id for multishop checkbox on admin products - weird bug with active flag #PSCFV-9935
|
2013-09-18 19:35:56 +02:00 |
|
|
djfm
|
0a9f425281
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-18 16:08:44 +00:00 |
|
|
djfm
|
65559c5cf4
|
// small improvement to Brazilian translations
|
2013-09-18 16:08:23 +00:00 |
|
|
Rémi Gaillard
|
e7286c44f2
|
// typo
|
2013-09-18 18:08:22 +02:00 |
|
|
gRoussac
|
4e1d6de9b0
|
[-] FO : Fix bug #PSCFV-10328 Set country currency if defined when geolocated
|
2013-09-18 17:57:00 +02:00 |
|
|
Sarah Lorenzini
|
5621a3b039
|
// update tabs stats
|
2013-09-18 17:47:42 +02:00 |
|
|
Jerome Nadaud
|
154658befd
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-18 17:41:06 +02:00 |
|
|
Jerome Nadaud
|
5bed29a538
|
// Fix Employees fields
|
2013-09-18 17:40:46 +02:00 |
|
|
Francois Gaillard
|
6e0be0c226
|
Dashboard - Fixed last day trend
|
2013-09-18 17:28:04 +02:00 |
|
|
gRoussac
|
75a9629b8a
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-18 17:23:23 +02:00 |
|
|
Jerome Nadaud
|
38d565110f
|
// List header fix
|
2013-09-18 17:23:22 +02:00 |
|
|
gRoussac
|
27f14b9a31
|
[-] BO : Fix proces and save buttons for Modules and AdminControllers
|
2013-09-18 17:23:08 +02:00 |
|
|
Rémi Gaillard
|
70d48d0af1
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-18 17:19:18 +02:00 |
|
|
Rémi Gaillard
|
f6dc81d0f1
|
// small fix for SSL
|
2013-09-18 17:19:03 +02:00 |
|
|
Kevin Granger
|
ac1b9fd96e
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-18 17:10:59 +02:00 |
|
|
Kevin Granger
|
806e628997
|
// dashboard update version
|
2013-09-18 17:10:48 +02:00 |
|
|
Jerome Nadaud
|
4413d04525
|
// Customer fix
|
2013-09-18 17:05:16 +02:00 |
|
|
gRoussac
|
2e311410b2
|
[*] BO : Set import entity in cookie (#PSCFV-8214)
|
2013-09-18 17:02:00 +02:00 |
|
|
Jerome Nadaud
|
64f1ba1e08
|
// Parameters fix
|
2013-09-18 16:36:33 +02:00 |
|
|
Rémi Gaillard
|
0452979ce7
|
[*] FO: Allow to enable SSL on all the pages
|
2013-09-18 16:30:34 +02:00 |
|
|
Jerome Nadaud
|
1f3e717eb6
|
// Preferences - Admin bootstrap fix
|
2013-09-18 16:22:05 +02:00 |
|
|
gRoussac
|
3aec242600
|
[-] MO : Editorial could not delete image
|
2013-09-18 16:16:36 +02:00 |
|
|
gRoussac
|
93aae26269
|
[-] Bo : Modules 'save' button not active
|
2013-09-18 15:41:30 +02:00 |
|
|
Jerome Nadaud
|
0683ed4092
|
// Some list design fix
|
2013-09-18 15:25:58 +02:00 |
|
|
Damien Metzger
|
39fdc8c926
|
[+] BO : Added new class ConfigurationKPI for KPI cache storage
|
2013-09-18 15:09:04 +02:00 |
|
|
gRoussac
|
f293562ea4
|
[-] BO : Fix bug #PSCFV-8214 import entity pre selected
|
2013-09-18 15:03:16 +02:00 |
|