gRoussac
e2dac03baa
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-11 16:30:52 +02:00
gRoussac
dfdbe39ee3
[-] BO : Small changes when creating vouchers in back office orders
2013-09-11 16:28:11 +02:00
Rémi Gaillard
31c94caebc
[-] BO: Fix out of stock creation with multishop and stock sharing
2013-09-11 16:22:13 +02:00
Rémi Gaillard
669c3791b5
[-] BO: Fix preview url with multishop
2013-09-11 15:55:25 +02:00
Rémi Gaillard
3e750490fe
// chmod class_index 666 instead of 664
2013-09-11 15:16:15 +02:00
Jerome Nadaud
49c9afec40
// Categories tree
2013-09-11 15:08:24 +02:00
gRoussac
01be908e51
[-] CORE : Could not add several cart rules
2013-09-11 14:50:42 +02:00
gRoussac
9f12ff15be
[-] BO : Fix possible Uncaught exception 'ReflectionException' when viewing AdminMeta
2013-09-11 10:30:40 +02:00
gRoussac
85a471a690
//bad commit , sorry for that
2013-09-10 18:51:20 +02:00
gRoussac
86d3a8afe1
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-10 18:49:05 +02:00
gRoussac
f94f0f14a4
[-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address
2013-09-10 18:48:28 +02:00
Jerome Nadaud
e0d33eae9e
// Categories Tree changes
2013-09-10 18:40:05 +02:00
Nils-Helge Garli Hegvik
9713f93075
Add Bcc support in Mail class
2013-09-10 17:11:34 +02:00
Jerome Nadaud
85dc552667
// Toolbar
2013-09-10 14:08:29 +02:00
gRoussac
332d68c7ec
[-] MO : Statsdata, exception on duplicate entry
2013-09-10 11:08:57 +02:00
Rémi Gaillard
3c090535a9
// small fix for image SSL links
2013-09-10 10:39:03 +02:00
Rémi Gaillard
021790a3e2
[-] FO: Fix SSL links on domain_ssl instead domain
2013-09-10 10:15:52 +02:00
Damien Metzger
1d8da79507
[-] BO : fixed notifications when there is too much data
2013-09-10 09:17:54 +02:00
Jerome Nadaud
e91460b8fe
[-] BO : Change Nested categories
2013-09-09 18:58:32 +02:00
Jerome Nadaud
4e8658f1d6
[+] BO : Helper Tree js improvement
2013-09-09 18:57:42 +02:00
Rémi Gaillard
242556e176
[-] MO: Fix unifunc smarty errors if module is displayed on multiplehook without cache
2013-09-09 15:12:26 +02:00
Jerome Nadaud
accd2d77c1
[+] BO : Adding tree templates and functions
2013-09-09 12:20:58 +02: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
6b03af9ef9
[-] BO : ini_get('safe_mode') can return false
2013-09-08 22:26:21 +02:00
gRoussac
e6f8dba2e6
// remove Notice: Undefined index
2013-09-08 19:55:03 +02: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
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
ec11b7e064
// Better control of the requests when our website is down
2013-09-06 10:18:48 +02:00
gRoussac
53241af228
// remove strict standard warning
2013-09-05 19:00:25 +02:00
Rémi Gaillard
8868271c07
// push changes
2013-09-05 18:37:25 +02:00
Rémi Gaillard
0f81518ba2
// Add a buton to erase all log
2013-09-05 15:58:36 +02:00
Sarah Lorenzini
73524c7a4c
// update maintenance and email pages
2013-09-05 14:16:06 +02:00
Vincent Augagneur
009536d3f4
//small fix on version compare for install module
2013-09-05 10:33:15 +02:00
Rémi Gaillard
6e3d24b567
// add push
2013-09-04 19:33:05 +02:00
Kevin Granger
b4ecaf3ddb
// Carrier Wizard with bootstrap WIP
2013-09-04 15:38:45 +02:00
Rémi Gaillard
00c1860d22
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-04 15:08:41 +02:00
Rémi Gaillard
9348768ceb
[-] MO: Fix blocklayered sort by quantity #PSCFV-10300
2013-09-04 15:05:55 +02:00
gRoussac
df56d7af42
[-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678
2013-09-04 10:38:14 +02:00
djfm
87567ed1a0
// fixed translation of modules descriptions containing quotes
2013-09-04 07:44:52 +00:00
Gregory Roussac
5d38743b72
Merge pull request #690 from Ha99y/20130903_addToolBarModulesListButton
...
[-] BO : Remove warning in AdminController.php
2013-09-04 00:40:41 -07:00
Jerome Nadaud
75a663b6e3
[-] BO : Fix pull request #665
2013-09-04 09:40:12 +02:00
ha99y
f4892686c1
Warning in AdminController.php
...
If debugging is on (_PS_MODE_DEV_ set to TRUE)
On a fresh install there is a warning on line 1542 in
/classes/controller/AdminController.php in function
addToolBarModulesListButton().
Because of the warning xml files are not populated with data.
Warning: simplexml_load_file()
1: parser error : Document is empty
2013-09-03 17:30:05 -07:00
gRoussac
6daf8ebbfa
[-] BO : Fix error returned when first import of a localisation pack
2013-09-03 18:20:58 +02:00
Jerome Nadaud
7d61be252f
[+] BO : Get categories in nested array
2013-09-03 15:27:58 +02:00
soufyan
cd7d604b75
[*] Project : Orders should rely only on ps_order_cart_rule
2013-09-03 15:10:06 +02:00
gRoussac
98f60d039b
// fix warning
2013-09-03 12:29:17 +02:00
gRoussac