d4b39184a0
// AdminCarts order way DESC
2013-12-08 16:39:41 +01:00
ae98bcd86b
// php warning
2013-12-06 18:40:44 +01:00
746c74dfac
// id of root category could be different of 1
2013-12-06 18:34:50 +01:00
6419f6a7ad
// fixed bug with ordering of JS files in AdminImport
2013-12-06 15:47:29 +00:00
0d374e5501
// new hook
2013-12-06 14:54:45 +01:00
669a49be59
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-06 10:17:12 +01:00
c2e0edcc7a
[-] BO : carrier wizard no fees display
2013-12-06 10:17:07 +01:00
5e18a94d2a
// employee avatar on the logs listing
2013-12-05 19:16:43 +01:00
9df713e6ec
[-] BO : Fixes for Advanced Stock Management Import
...
[*] BO : Combinations import supports Advanced Stock Management
[*] BO : Advanced Stock Management import now supports stock increase
[*] BO : Advanced Stock Management stock unit price uses wholesale_price (Product Cost) or 0.00001 if not set
[*] BO : Added Advanced Stock Management to csv import docs
2013-12-05 12:30:17 +01:00
3889f6d61f
// follow up https://github.com/PrestaShop/PrestaShop/commit/7140a63272fa2de5f7368a062d7fde79ca89d692#commitcomment-4775950
2013-12-05 11:27:07 +01:00
ec8ca92e67
// norms
2013-12-04 18:49:34 +01:00
7140a63272
Merge branch '1.6-CSVAdvanced' of https://github.com/PhpMadman/PrestaShop into PhpMadman-1.6-CSVAdvanced
2013-12-04 18:39:33 +01:00
72be705759
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6
2013-12-04 17:53:01 +01:00
96fd3f3d32
[+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570
2013-12-04 17:41:10 +01:00
665c5d155d
[*] CORE: original search_query assign to .tpl
...
Avoid problems with special characters for eg. in polish language like ąźćłó etc.
2013-12-04 17:24:30 +01:00
90f5560cb3
// add new hook on product comparator
2013-12-04 14:43:09 +01:00
f6fed64472
[*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/636
2013-12-04 12:14:51 +01:00
81481d6105
[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/48
2013-12-03 19:24:31 +01:00
b657115552
// Fixed bad entities in KPI
2013-12-03 18:12:02 +01:00
da2d48890f
Merge pull request #1072 from PhpMadman/Boot-AutoSeoUrl
...
[*] BO : Option to always rewrite friendly url of product
2013-12-03 06:15:28 -08:00
22c09ac367
Merge pull request #1073 from studiokiwik/sk-ps15x-012
...
[-] BO : Fix timeout handling on product images regeneration
2013-12-03 05:51:27 -08:00
d81e81e4f3
[-] BO : Fix timeout handling on product images regeneration
2013-12-03 14:42:14 +01:00
a9f2bd053a
[-] BO : carrier wizard fixed when select zone and set no shipping fees
2013-12-03 11:45:43 +01:00
de456e45ec
[*] Bo : removed empty filters from the cookie (thus limiting its size)
2013-12-03 11:44:51 +01:00
8a72e4d810
// small fix
2013-12-03 11:18:58 +01:00
0de9c3ac6c
[*] BO : Added option to always rewrite friendly url of product
2013-12-03 10:57:25 +01:00
2931ebeeae
[-] FO : fixed product comparator when there are no products anymore
2013-12-02 19:21:54 +01:00
2316bb50ba
// Fixed import button in AdminImport
2013-12-02 18:53:51 +01:00
9078290c01
// small fix
2013-12-02 16:18:59 +01:00
3cfafbfe10
// typo
2013-12-02 15:20:12 +01:00
34d56ead85
[-] Controller : ParentOrderController - Missing parenthesis
2013-12-02 09:26:04 +01:00
06b68e3757
//use Tools methods instead of $_GET/$_POST
2013-12-01 23:39:27 +01:00
7cd38d4461
// Changed base64 to urlencode in import (and fixed filename issue)
2013-11-29 19:24:04 +01:00
53b327ec46
// small fix
2013-11-29 18:32:05 +01:00
f39b621251
[-] BO : Fix bug #PSCFV-11162 AdminImport, Exception on ProductSupplier
2013-11-29 18:29:50 +01:00
8dae23891a
// Remove add category on edit
2013-11-29 18:08:01 +01:00
fbf2c26093
// Fix when file is missing
2013-11-29 18:07:50 +01:00
3871ea32a4
// missing parenthesis
2013-11-29 17:48:52 +01:00
e0b28dd57b
// AdminOutstanding is now bootstraped
2013-11-29 17:10:22 +01:00
68ed6fac82
[*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/582
2013-11-29 17:06:59 +01:00
6da40e7159
// fix new tax rule button
2013-11-29 16:54:33 +01:00
8ad3166226
// Add save button to Localization tax rules
2013-11-29 15:30:57 +01:00
4c2500fb35
// Remove unnecessary code
2013-11-29 14:35:06 +01:00
e1568a67a2
// Fix products attachments uploader
2013-11-29 12:10:09 +01:00
1d2f6c9b9d
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-28 19:22:03 +01:00
0f74646524
// import
2013-11-28 19:21:55 +01:00
9e6868ba97
// Change product attachment upload system
2013-11-28 19:09:24 +01:00
7261490381
// Fix Categories image problem
2013-11-28 15:35:17 +01:00
35fc864e0b
// Fixed potential warning
2013-11-28 14:29:40 +01:00
cb9d00352f
[-] BO : Adminimport reset selected csv if not exists
2013-11-28 14:19:23 +01:00
gRoussac