Jerome Nadaud
b5f6e8a1d8
[+] BO : Add "tree-selected" class to tree.js
2013-09-09 12:10:26 +02:00
djfm
641cf225f2
// fix small translation bug PSCFV-10329
2013-09-09 09:47:44 +00:00
djfm
6ea3783013
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-09 09:46:49 +00:00
Damien Metzger
dcad699ede
[-] FO : fixed chinese search with multiple symbols #PSCFV-10322
2013-09-09 11:19:11 +02:00
Francois Gaillard
e1d0347757
[-] Classes : Bug fix - FrontController, mobile & JS minifier fixed
2013-09-09 10:17:15 +02:00
gRoussac
b975a9375c
[-] IN : remove warnings while upgrading
2013-09-09 00:10:03 +02:00
gRoussac
9c756a7fcb
[-] IN : Do not duplicate images types when coming from 1.4, update it
2013-09-08 23:22:36 +02:00
gRoussac
6b03af9ef9
[-] BO : ini_get('safe_mode') can return false
2013-09-08 22:26:21 +02:00
gRoussac
ec556bb307
// remove Warning on array_map()
2013-09-08 20:01:55 +02:00
gRoussac
e6f8dba2e6
// remove Notice: Undefined index
2013-09-08 19:55:03 +02:00
gRoussac
25ba388d69
[-] IN : fix bad pathes
2013-09-08 18:29:06 +02:00
gRoussac
e5337f5e76
[-] IN : Do not test module names if they are not directories
2013-09-08 18:25:54 +02:00
gRoussac
683513a9d2
[-] IN : Remove fails on upgrade coming to loop when upgrading again
2013-09-08 17:29:00 +02:00
gRoussac
19a6c4373e
[-] IN : Remove warnings when safe_mode open_basedir missconfigured
2013-09-08 17:25:59 +02:00
gRoussac
2874f14983
[-] CORE : Fix bug #PSCFV-10040 Notice: Undefined index: unifunc && Fatal error: Function name must be a string on some PHP version with empty cache folder and smarty cache enabled
2013-09-06 23:55:58 +02:00
Cosmin Hutanu
7491f46322
Merge pull request #1 from PrestaShop/development
...
update from prestashop/development
2013-09-06 12:42:22 -07:00
gRoussac
4c49048e39
[-] FO : Partial fix of adding gift on cart rule on the same entity in the cart rule
2013-09-06 18:35:56 +02:00
Rémi Gaillard
302d5f94dd
// grmbl
2013-09-06 18:33:19 +02:00
Damien Metzger
a10b5a517f
// Added visits to chart
2013-09-06 17:56:26 +02:00
Fabio Chelly
e5f53afd5f
Merge remote-tracking branch 'origin/development' into development
2013-09-06 17:54:34 +02:00
Fabio Chelly
9377775eca
[-] MO productcomments :
...
- Module was broken and works now
- A message is displayed to indicate when a comment has been added.
- Error li are correctly indented
#PNM-753
#PNM-1601
#PNM-1660
#PNM-1609
#PNM-1491
#PNM-1311
#PNM-1233
#PNM-1232
#PNM-937
#PNM-775
2013-09-06 17:54:12 +02:00
Jerome Nadaud
f6355ff2d5
[-] BO : Change categories tree method
2013-09-06 17:09:32 +02:00
Jerome Nadaud
c7e4f0ce5f
[+] BO : Adding Tree Helper
2013-09-06 17:06:19 +02:00
Jerome Nadaud
36a863df59
[+] BO : Adding Tree Helper
2013-09-06 17:05:19 +02:00
Damien Metzger
8df63f256d
// Added chart data
2013-09-06 16:25:51 +02:00
Kevin Granger
fa198aeabc
// fix menu, design, css
2013-09-06 16:25:01 +02:00
Francois Gaillard
768a8b36d5
[-] BO : AdminModulesController - Bug fix, $params was not set
2013-09-06 15:41:24 +02:00
Fabio Chelly
1b0c5be93d
Merge remote-tracking branch 'origin/development' into development
2013-09-06 11:47:11 +02:00
Fabio Chelly
663f592306
[-] MO sendtoafriend : a message is displayed whether the e-mail has been sent or not
...
#PNM-627
#PNM-1610
#PNM-1616
2013-09-06 11:40:41 +02:00
Kevin Granger
8e1250dad1
// I hate <br />
2013-09-06 11:13:18 +02:00
Kevin Granger
1b2bab6943
// performance
2013-09-06 11:03:36 +02:00
Damien Metzger
ec11b7e064
// Better control of the requests when our website is down
2013-09-06 10:18:48 +02:00
Kevin Granger
5afdc024aa
// navigation sidebar
2013-09-06 09:48:22 +02:00
Fabio Chelly
7e1c0d5a24
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-06 09:24:43 +02:00
Vincent Augagneur
79677324b6
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-09-05 19:11:07 +02:00
Vincent Augagneur
3c2a086296
//merge
2013-09-05 19:10:59 +02:00
Kevin Granger
b2fd886722
// add new tpl for navigation top/side
2013-09-05 19:07:57 +02:00
Vincent Augagneur
4b2ef10dd6
//dashboard data-chart-line added
2013-09-05 19:07:49 +02:00
gRoussac
53241af228
// remove strict standard warning
2013-09-05 19:00:25 +02:00
Rémi Gaillard
a3233cc00c
//
2013-09-05 18:51:53 +02:00
Rémi Gaillard
c35d8c7845
//
2013-09-05 18:47:13 +02:00
Rémi Gaillard
f5e00a59f7
//
2013-09-05 18:41:51 +02:00
gRoussac
a7d619b208
[-] MO : fix bug #PSCFV-9906 again, bad url parsing
2013-09-05 18:39:07 +02:00
Rémi Gaillard
8868271c07
// push changes
2013-09-05 18:37:25 +02:00
sjousse
6b080e1f02
Optimize image copy in ShopImport module
...
2 things :
- copy images to new folder structure instead of legacy one since it's a PS 1.5 branch
- don't create all sizes of images at migration, there's an Admin controller for that (Admin > Settings > Images). That's speed up the import and remove duplicate code (less code to support).
+ some cleaning of unused variables
2013-09-05 18:24:02 +02:00
Vincent Augagneur
e7495f3fe4
//oups
2013-09-05 17:38:17 +02:00
Damien Metzger
2ff2a6b6f9
// Profiling adapted to the new dashboard
2013-09-05 17:28:05 +02:00
Vincent Augagneur
06b54d0519
//typo
2013-09-05 16:35:15 +02:00
Vincent Augagneur
4124a48b1e
//added check on range picker if date from is superior than date to
2013-09-05 16:34:03 +02:00
Vincent Augagneur
e4932131f6
//small fix
2013-09-05 16:25:42 +02:00
Jerome Nadaud