dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

6495 Commits

Author SHA1 Message Date
Jerome Nadaud
551358f88b [-] BO : FixBug #PSCSX-116 Wrong friendly url hint description 2013-12-11 09:59:00 +01:00
Jerome Nadaud
fe8d9923f6 // Add new root category button to page header toolbar 2013-12-11 09:39:47 +01:00
Jerome Nadaud
c869a63f35 // Fix missing Carrier wizard cancel button 2013-12-11 09:38:31 +01:00
rGaillard
70628845b7 [-] BO: call actionProductUpdate hook on status change 2013-12-10 11:41:02 +01:00
Jerome Nadaud
4a013cf537 [-] BO : FixBug #PSCSX-100 wrong checkbox integration 2013-12-10 09:43:03 +01:00
Jerome Nadaud
ed92603472 // Small Fix in modules upload 2013-12-09 17:25:41 +01:00
Gregory Roussac
27e8beb6a9 Merge pull request #1111 from Gamesh/patch-1 
[*] FO: now you can download files >1G without running into max executio...
 2013-12-09 05:17:14 -08:00
Gamesh
5c496f45a1 [*] FO: now you can download files >1G without running into max execution limitation 
Added @ to suppress warning i safe mode.
 2013-12-09 15:04:16 +02:00
Jerome Nadaud
b0c9e73e30 [+] BO : Add error control to modules uploading 2013-12-09 11:30:42 +01:00
Gamesh
9713d38078 [*] FO: now you can download files >1G without running into max execution limitation 
when reading large files ( >1G ), you often get max execution timeout error, this fix will prevent this.
 2013-12-09 08:53:11 +02:00
gRoussac
d4b39184a0 // AdminCarts order way DESC 2013-12-08 16:39:41 +01:00
rGaillard
ae98bcd86b // php warning 2013-12-06 18:40:44 +01:00
rGaillard
746c74dfac // id of root category could be different of 1 2013-12-06 18:34:50 +01:00
djfm
6419f6a7ad // fixed bug with ordering of JS files in AdminImport 2013-12-06 15:47:29 +00:00
rGaillard
0d374e5501 // new hook 2013-12-06 14:54:45 +01:00
Vincent Augagneur
669a49be59 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 10:17:12 +01:00
Vincent Augagneur
c2e0edcc7a [-] BO : carrier wizard no fees display 2013-12-06 10:17:07 +01:00
rGaillard
5e18a94d2a // employee avatar on the logs listing 2013-12-05 19:16:43 +01:00
PhpMadman
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
gRoussac
3889f6d61f // follow up 7140a63272 (commitcomment-4775950) 2013-12-05 11:27:07 +01:00
gRoussac
ec8ca92e67 // norms 2013-12-04 18:49:34 +01:00
gRoussac
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
gRoussac
72be705759 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-04 17:53:01 +01:00
gRoussac
96fd3f3d32 [+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570 2013-12-04 17:41:10 +01:00
Krystian Podemski
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
rGaillard
90f5560cb3 // add new hook on product comparator 2013-12-04 14:43:09 +01:00
gRoussac
f6fed64472 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/636 2013-12-04 12:14:51 +01:00
gRoussac
81481d6105 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/48 2013-12-03 19:24:31 +01:00
Damien Metzger
b657115552 // Fixed bad entities in KPI 2013-12-03 18:12:02 +01:00
Lucas CERDAN
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
Gregory Roussac
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
Mikael Blotin
d81e81e4f3 [-] BO : Fix timeout handling on product images regeneration 2013-12-03 14:42:14 +01:00
Vincent Augagneur
a9f2bd053a [-] BO : carrier wizard fixed when select zone and set no shipping fees 2013-12-03 11:45:43 +01:00
Damien Metzger
de456e45ec [*] Bo : removed empty filters from the cookie (thus limiting its size) 2013-12-03 11:44:51 +01:00
rGaillard
8a72e4d810 // small fix 2013-12-03 11:18:58 +01:00
PhpMadman
0de9c3ac6c [*] BO : Added option to always rewrite friendly url of product 2013-12-03 10:57:25 +01:00
Damien Metzger
2931ebeeae [-] FO : fixed product comparator when there are no products anymore 2013-12-02 19:21:54 +01:00
Damien Metzger
2316bb50ba // Fixed import button in AdminImport 2013-12-02 18:53:51 +01:00
rGaillard
9078290c01 // small fix 2013-12-02 16:18:59 +01:00
rGaillard
3cfafbfe10 // typo 2013-12-02 15:20:12 +01:00
Francois Gaillard
34d56ead85 [-] Controller : ParentOrderController - Missing parenthesis 2013-12-02 09:26:04 +01:00
PrestaEdit
06b68e3757 //use Tools methods instead of $_GET/$_POST 2013-12-01 23:39:27 +01:00
Damien Metzger
7cd38d4461 // Changed base64 to urlencode in import (and fixed filename issue) 2013-11-29 19:24:04 +01:00
Jerome Nadaud
53b327ec46 // small fix 2013-11-29 18:32:05 +01:00
gRoussac
f39b621251 [-] BO : Fix bug #PSCFV-11162 AdminImport, Exception on ProductSupplier 2013-11-29 18:29:50 +01:00
Jerome Nadaud
8dae23891a // Remove add category on edit 2013-11-29 18:08:01 +01:00
Jerome Nadaud
fbf2c26093 // Fix when file is missing 2013-11-29 18:07:50 +01:00
gRoussac
3871ea32a4 // missing parenthesis 2013-11-29 17:48:52 +01:00
Damien Metzger
e0b28dd57b // AdminOutstanding is now bootstraped 2013-11-29 17:10:22 +01:00
gRoussac
68ed6fac82 [*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/582 2013-11-29 17:06:59 +01:00