e91460b8fe
[-] BO : Change Nested categories
2013-09-09 18:58:32 +02:00
4e8658f1d6
[+] BO : Helper Tree js improvement
2013-09-09 18:57:42 +02:00
b6e0583af8
//added security check on dashboard
2013-09-09 18:47:15 +02:00
4e1a513371
//added rss and useful link on dashboard
2013-09-09 18:44:34 +02:00
69b38f4d6f
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/products/helpers/tree/tree.tpl
admin-dev/themes/default/template/controllers/products/helpers/tree/tree_header.tpl
2013-09-09 18:13:49 +02:00
7774e46cb3
// tree view product
2013-09-09 18:12:31 +02:00
a383d55421
Merge pull request #707 from sjousse/development
...
[-] MO: ShopImporter fix imported prices
2013-09-09 08:31:15 -07:00
00f3045690
fix imported prices
2013-09-09 17:24:27 +02:00
5362f4d426
Merge pull request #699 from sjousse/patch-1
...
[*] MO : ShopImporter Optimize image copy in ShopImport module
2013-09-09 08:11:51 -07:00
9880d152d4
Merge pull request #706 from sjousse/development
...
[*] MO : Add some fields to Orders in Import module
2013-09-09 08:10:12 -07:00
990a889b1c
Add some fields to Orders in Import module
2013-09-09 17:08:17 +02:00
7bb295b076
//
2013-09-09 16:21:32 +02:00
e6d0a3e5a4
// revert form https://github.com/PrestaShop/PrestaShop/commit/2874f1498352228c84df969c42e9d8f699a8afc5
2013-09-09 15:11:55 +02:00
242556e176
[-] MO: Fix unifunc smarty errors if module is displayed on multiplehook without cache
2013-09-09 15:12:26 +02:00
c502c9766f
[-] BO : FixBug PSCFV-10331 - Tax rules Pagination
2013-09-09 15:04:14 +02:00
c18dea7296
//carrier wizard fix - bootstrap compatibility
2013-09-09 14:14:57 +02:00
accd2d77c1
[+] BO : Adding tree templates and functions
2013-09-09 12:20:58 +02:00
54f7c65165
[-] BO : Display the old image system migration tool if product images are in _PS_PROD_IMG_DIR_
2013-09-09 12:20:38 +02:00
b5f6e8a1d8
[+] BO : Add "tree-selected" class to tree.js
2013-09-09 12:10:26 +02:00
641cf225f2
// fix small translation bug PSCFV-10329
2013-09-09 09:47:44 +00:00
6ea3783013
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-09 09:46:49 +00:00
dcad699ede
[-] FO : fixed chinese search with multiple symbols #PSCFV-10322
2013-09-09 11:19:11 +02:00
e1d0347757
[-] Classes : Bug fix - FrontController, mobile & JS minifier fixed
2013-09-09 10:17:15 +02:00
b975a9375c
[-] IN : remove warnings while upgrading
2013-09-09 00:10:03 +02:00
9c756a7fcb
[-] IN : Do not duplicate images types when coming from 1.4, update it
2013-09-08 23:22:36 +02:00
6b03af9ef9
[-] BO : ini_get('safe_mode') can return false
2013-09-08 22:26:21 +02:00
ec556bb307
// remove Warning on array_map()
2013-09-08 20:01:55 +02:00
e6f8dba2e6
// remove Notice: Undefined index
2013-09-08 19:55:03 +02:00
25ba388d69
[-] IN : fix bad pathes
2013-09-08 18:29:06 +02:00
e5337f5e76
[-] IN : Do not test module names if they are not directories
2013-09-08 18:25:54 +02:00
683513a9d2
[-] IN : Remove fails on upgrade coming to loop when upgrading again
2013-09-08 17:29:00 +02:00
19a6c4373e
[-] IN : Remove warnings when safe_mode open_basedir missconfigured
2013-09-08 17:25:59 +02:00
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
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
302d5f94dd
// grmbl
2013-09-06 18:33:19 +02:00
a10b5a517f
// Added visits to chart
2013-09-06 17:56:26 +02:00
e5f53afd5f
Merge remote-tracking branch 'origin/development' into development
2013-09-06 17:54:34 +02:00
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
f6355ff2d5
[-] BO : Change categories tree method
2013-09-06 17:09:32 +02:00
c7e4f0ce5f
[+] BO : Adding Tree Helper
2013-09-06 17:06:19 +02:00
36a863df59
[+] BO : Adding Tree Helper
2013-09-06 17:05:19 +02:00
8df63f256d
// Added chart data
2013-09-06 16:25:51 +02:00
fa198aeabc
// fix menu, design, css
2013-09-06 16:25:01 +02:00
768a8b36d5
[-] BO : AdminModulesController - Bug fix, $params was not set
2013-09-06 15:41:24 +02:00
1b0c5be93d
Merge remote-tracking branch 'origin/development' into development
2013-09-06 11:47:11 +02:00
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
8e1250dad1
// I hate <br />
2013-09-06 11:13:18 +02:00
1b2bab6943
// performance
2013-09-06 11:03:36 +02:00
ec11b7e064
// Better control of the requests when our website is down
2013-09-06 10:18:48 +02:00
5afdc024aa
// navigation sidebar
2013-09-06 09:48:22 +02:00
Jerome Nadaud