 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 |
|
|
Kevin Granger
|
b71b594ca1
|
// fix tree search / title / manufacturers
|
2013-09-18 15:00:10 +02:00 |
|
|
Rémi Gaillard
|
66f46eee03
|
// Avoid exception if amount is null on addind an orderpayment
|
2013-09-18 14:29:01 +02:00 |
|
|
Damien Metzger
|
8a4b24f45e
|
// Added KPIs in products and categories
|
2013-09-18 13:49:42 +02:00 |
|
|
Vincent Augagneur
|
672da852c5
|
[-] BO - fixed bug #PSCFV-10178
|
2013-09-18 11:40:58 +02:00 |
|
|
Vincent Augagneur
|
965b8a1bf3
|
[-] BO - fixed bug #PSCFV-10286 - End range in summary of shipping wizard not correct when range number is a float
|
2013-09-18 11:18:26 +02:00 |
|
|
Jerome Nadaud
|
c48f4f5e1b
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-18 10:44:19 +02:00 |
|
|
Jerome Nadaud
|
5a206e83a8
|
// Security
|
2013-09-18 10:43:58 +02:00 |
|
|
Damien Metzger
|
50a9e7ef99
|
// Code cleaning
|
2013-09-18 10:29:19 +02:00 |
|
|
Jerome Nadaud
|
897f1eafeb
|
//Suppliers view
|
2013-09-18 10:29:04 +02:00 |
|
|
Jerome Nadaud
|
8081acb0b5
|
// Supliers view
|
2013-09-18 10:09:45 +02:00 |
|
|
Sarah Lorenzini
|
bdb797a66c
|
// update tabs stats
|
2013-09-17 17:49:49 +02:00 |
|
|
Jerome Nadaud
|
8f10a0e32f
|
// Product customization
|
2013-09-17 17:30:23 +02:00 |
|
|
Kevin Granger
|
51663f972e
|
// fix scenes
|
2013-09-17 17:15:40 +02:00 |
|
|
Jerome Nadaud
|
0971750f9f
|
// Attribute generator to bootstrap
|
2013-09-17 16:36:54 +02:00 |
|
|
Rémi Gaillard
|
47c5f400ee
|
// Add gender on order view
|
2013-09-17 16:30:47 +02:00 |
|
|
Vincent Augagneur
|
322654cacf
|
//small fix with mode catalog and cart button
|
2013-09-17 14:54:38 +02:00 |
|
|
Damien Metzger
|
f7855f2a3a
|
// Always more KPIs
|
2013-09-17 12:47:13 +02:00 |
|
|
Jérôme Nadaud
|
a0be556795
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-09-17 12:33:48 +02:00 |
|
|
Jérôme Nadaud
|
47341ce0bb
|
// Attributes generator
|
2013-09-17 12:33:06 +02:00 |
|
|
Kevin Granger
|
a53080eefc
|
// fix bug css
|
2013-09-17 12:32:36 +02:00 |
|
|
Vincent Augagneur
|
3151064daf
|
//small fix on helper form && option
|
2013-09-17 12:18:37 +02:00 |
|
|
Kevin Granger
|
5c04e5564c
|
// tags + fixed-width
|
2013-09-17 11:59:57 +02:00 |
|
|
Rémi Gaillard
|
e6e8efc19a
|
[-] FO: Fix Product::getAttributesGroups() minimal_quantity/weight/available_date should be multishop
|
2013-09-17 11:58:12 +02:00 |
|
|
Rémi Gaillard
|
6ee6317fee
|
// orderby position
|
2013-09-17 11:07:29 +02:00 |
|
|
Jérôme Nadaud
|
0ab792cc6e
|
// Change tagify class
|
2013-09-17 10:52:21 +02:00 |
|
|
Damien Metzger
|
c0c4af988f
|
// Added net profits / visitor as a KPI
|
2013-09-17 10:47:54 +02:00 |
|
|
Damien Metzger
|
70f284ad88
|
[+] BO : new graph engine nvd3 (still need some development - will replace the other engines)
|
2013-09-17 10:24:46 +02:00 |
|