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
Jérôme Nadaud
455904a59b
// Some input fix
2013-09-17 10:13:00 +02:00
Kevin Granger
e08d2a8361
// fix
2013-09-17 10:00:33 +02:00
Jérôme Nadaud
ab5dd91359
// Localization
2013-09-17 09:18:56 +02:00
Jerome Nadaud
57ed337030
// Fix autosize for products attachment tab textarea
2013-09-16 18:57:11 +02:00
gRoussac
2d5bd901f4
[*] CORE : Refactoring Tools::copy() as copy with context > PHP 5.3
2013-09-16 18:51:06 +02:00
Damien Metzger
8934f9c7ed
[*] BO : Connected the first KPIs to real data
2013-09-16 18:40:34 +02:00
Jerome Nadaud
80b6d5a570
// fix autosize for textarea in options.tpl
2013-09-16 18:28:57 +02:00
Jerome Nadaud
a4103265e5
// Color picker
2013-09-16 18:17:29 +02:00
Sarah Lorenzini
4ef7bd0b77
// update stats tab
2013-09-16 17:51:03 +02:00
Jerome Nadaud
7b06758e22
// Fix carrier header and button link
2013-09-16 17:23:01 +02:00
gRoussac
b9b4265517
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-16 17:18:56 +02:00
gRoussac
15dd1cf96f
[-] BO : Fix bugPSCFV-10249 images copy when unix path
2013-09-16 17:16:11 +02:00
Vincent Augagneur
c7a777163c
//small fix
2013-09-16 17:14:08 +02:00
Jerome Nadaud
fce87cf66a
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-16 17:05:39 +02:00
Jerome Nadaud
235af94a92
// Fix Page header toolbar
2013-09-16 17:05:27 +02:00
Vincent Augagneur
b0ace74155
//small fix
2013-09-16 16:30:13 +02:00
Jerome Nadaud
7643a45d81
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-16 16:12:37 +02:00
Jerome Nadaud
29dad488d4
// Stats list active class
2013-09-16 16:12:23 +02:00
Gregory Roussac
1c58c1ea6b
Merge pull request #726 from cinscaen/patch-1
...
[-] BO : Move product images in POST method in admin.js
2013-09-16 07:01:45 -07:00
CINS
852faeab7a
Update admin.js
...
Lorsqu'un produit possède trop d'images, il est impossible de réordonner celle-ci car la valeur JSON fourni en URL (GET) est beaucoup trop longue. Il faut envoyer les données JSON en POST pour solutionner le problème de longueur.
---------
When a product has many pictures, we can't reorder them. The JSON value is too long in URL (GET). We need to send data with POST to avoid problem.
2013-09-16 15:57:44 +02:00
Sarah Lorenzini
9dfb573422
// update stats tab
2013-09-16 15:46:21 +02:00
Jerome Nadaud
517e95387c
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-16 15:33:04 +02:00
Jerome Nadaud
3107a4c3f0
// Translations
2013-09-16 15:32:49 +02:00
Kevin Granger