302d5f94dd
// grmbl
2013-09-06 18:33:19 +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
ec11b7e064
// Better control of the requests when our website is down
2013-09-06 10:18:48 +02:00
53241af228
// remove strict standard warning
2013-09-05 19:00:25 +02:00
8868271c07
// push changes
2013-09-05 18:37:25 +02:00
0f81518ba2
// Add a buton to erase all log
2013-09-05 15:58:36 +02:00
73524c7a4c
// update maintenance and email pages
2013-09-05 14:16:06 +02:00
009536d3f4
//small fix on version compare for install module
2013-09-05 10:33:15 +02:00
6e3d24b567
// add push
2013-09-04 19:33:05 +02:00
b4ecaf3ddb
// Carrier Wizard with bootstrap WIP
2013-09-04 15:38:45 +02:00
00c1860d22
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-04 15:08:41 +02:00
9348768ceb
[-] MO: Fix blocklayered sort by quantity #PSCFV-10300
2013-09-04 15:05:55 +02:00
df56d7af42
[-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678
2013-09-04 10:38:14 +02:00
87567ed1a0
// fixed translation of modules descriptions containing quotes
2013-09-04 07:44:52 +00:00
5d38743b72
Merge pull request #690 from Ha99y/20130903_addToolBarModulesListButton
...
[-] BO : Remove warning in AdminController.php
2013-09-04 00:40:41 -07:00
75a663b6e3
[-] BO : Fix pull request #665
2013-09-04 09:40:12 +02:00
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
6daf8ebbfa
[-] BO : Fix error returned when first import of a localisation pack
2013-09-03 18:20:58 +02:00
7d61be252f
[+] BO : Get categories in nested array
2013-09-03 15:27:58 +02:00
cd7d604b75
[*] Project : Orders should rely only on ps_order_cart_rule
2013-09-03 15:10:06 +02:00
98f60d039b
// fix warning
2013-09-03 12:29:17 +02:00
94bdde4630
[-] CORE : Remove PHP Warning: file_put_contents on modules config.xml
2013-09-02 18:19:21 +02:00
f7eb6b3a16
Merge pull request #665 from Ha99y/Get-Combination-Images
...
[*] CLASSES : Add $id_product_attribute param to Image::getImages
2013-09-02 08:11:48 -07:00
d10a339542
//kevin special commit
2013-09-02 14:47:47 +02:00
82939730dd
Merge pull request #667 from Ha99y/Small-Autoload-Fix
...
[-] CORE : Remove warning on rename on index.php
2013-09-02 02:11:51 -07:00
397e42637a
// norms
2013-09-02 10:49:50 +02:00
6dc0edec3a
Merge pull request #668 from lrosset/development
...
[-] CORE : Add APCu support
2013-09-02 01:46:25 -07:00
f7fefe789d
// typo fix
2013-08-30 11:21:00 +02:00
37e3b9e9e4
[-] WS: 404 error should be returned if a multishop entity does not exists #PSCFV-10229
2013-08-30 11:13:30 +02:00
24146181c6
Add APCu support
2013-08-29 20:13:58 +01:00
e6abe1c5a0
// Release branch merged
2013-08-29 18:46:34 +02:00
eec8aaa4f8
// php noti
2013-08-29 18:15:51 +02:00
f24391be5a
// Fixed hook::getidbyname case
2013-08-29 09:39:48 +02:00
5dee3ca245
// Fixed hook::getidbyname case
2013-08-29 09:33:28 +02:00
75303e82e0
Suppress Error at rename
...
If debugging is one (_PS_MODE_DEV_ set to TRUE)
there is a warning on line 142 in /classes/Autoload.php at function
rename()
2013-08-28 18:56:49 -07:00
4a7e68ae05
// Modules list fix
2013-08-28 10:18:43 +02:00
ffd712312d
Add new argument to function getImages
...
1st: The function will return the product attribute id's with the list.
2nd: If product attribute id is passed to the function it will return
only the image id of the given attribute.
2013-08-28 00:27:52 -07:00
6a4680b4f0
[-] WS: Bad xlink for tax_rules_group in product
2013-08-27 18:58:21 +02:00
5c367cd6e7
//small fix
2013-08-27 18:52:34 +02:00
41a5eb8411
//small fix
2013-08-27 18:50:14 +02:00
ed0037c435
[+] BO : New page header toolbar
2013-08-27 18:21:27 +02:00
9b7f32cbac
[-] CORE : fixed bug #PSCFV-10175 - No virtuel download email send after accepted payment
2013-08-27 18:13:44 +02:00
598469e41e
// typo debug
2013-08-27 15:38:29 +02:00
6aad506c80
[-] FO : FixBug when route id is empty
2013-08-27 12:01:40 +02:00
99b162d16b
[-] CORE : fixed bug #PSCFV-10175 - No virtuel download email send after accepted payment
2013-08-27 10:09:35 +02:00
1673a080a0
//small fix #PSCFV-10194
2013-08-26 17:34:13 +02:00
0a4264c947
[-] BO : fixed bug when try to add jquery from ajax.googleapis.com in BO
2013-08-26 16:31:50 +02:00
ad428dfb2b
//MERGE branche release
2013-08-26 10:59:36 +02:00
bc071f2b04
// Fixed code typo
2013-08-26 09:48:26 +02:00
Rémi Gaillard