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

6950 Commits

Author SHA1 Message Date
Jérôme Nadaud
0af76e01fb Merge pull request #1124 from PhpMadman/1.6-HistoryColorFix 
[*] FO : Fixed issue with custom statues does not have any color, ...
 2013-12-11 03:10:38 -08:00
PhpMadman
b40c642737 [*] FO : Fixed issue with custom statues does not have any color, and text was not visible 2013-12-11 11:56:13 +01:00
Jerome Nadaud
347c0176a5 [-] CORE : FixBug #PSCSX-89 - Up configuration name size to 255 2013-12-11 11:44:34 +01:00
Jerome Nadaud
3792fab83a // Fix missing save button on list display 2013-12-11 11:00:50 +01:00
Mikko Hellsing
addb65eb5f [-] BO : Set correct table alias name in updatePosition 2013-12-11 02:09:45 +01:00
gRoussac
1dcc5e288c [*] FO : Move header modules to new hook, first part 1/2 2013-12-10 20:52:22 +01:00
Jerome Nadaud
a569ab7e33 // Fix tree shop missing attributes 2013-12-06 18:11:06 +01:00
rGaillard
adf158a0c3 // small fix 2013-12-06 17:31:09 +01:00
gRoussac
99fe216413 [*] FO : Move both sliders module on new hook 2013-12-06 17:05:39 +01:00
gRoussac
946d5520f8 // nomrs 2013-12-06 11:42:28 +01:00
Jerome Nadaud
ddcade285f [-] CORE : Ensure correct parent category for home categories 2013-12-05 18:37:49 +01:00
rGaillard
d50999fde0 [-] Core: Fix #PSCFV-11165 numerical configuration values should not be overridden if the value is the same between shop and global context 2013-12-05 17:17:35 +01:00
gRoussac
3975599023 [- ] CORE : Fix bug #PSCFV-10627, bad default shoip currency && Shop::getEntityIds returning deleted currency 2013-12-05 16:47:05 +01:00
rGaillard
f128dac9c4 // small fix 2013-12-05 15:59:14 +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
Guillaume Lafarge
39ded96964 Fix newline trim 
When using with <br /> format it now allows for 'b' and 'r' chars at the end of last line.
I think rtrim is not suitable when used with a word rather than a charlist.
 2013-12-04 17:42:32 +01:00
gRoussac
96fd3f3d32 [+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570 2013-12-04 17:41:10 +01:00
gRoussac
f6fed64472 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/636 2013-12-04 12:14:51 +01:00
Damien Metzger
de456e45ec [*] Bo : removed empty filters from the cookie (thus limiting its size) 2013-12-03 11:44:51 +01:00
Jerome Nadaud
8bf49049eb // Prevent click event in tree toolbar buttons 2013-12-02 19:07:28 +01:00
rGaillard
78a6821b2f // handle img extensions in the end of query string in the dispatcher 2013-12-02 16:14:27 +01:00
gRoussac
aea8f0285e [-] FO : Fix bug #PSCFV-11190 double escaping on customization 2013-12-02 15:51:29 +01:00
Damien Metzger
c8ca67eef5 // Fixed upgrade to 1.6.0.1 2013-12-02 15:28:02 +01:00
Jerome Nadaud
0448ee697f // Merging PR 1070 from DevNet 2013-12-02 15:23:29 +01:00
Damien Metzger
62a7a6a94f [-] FO : fixed cart rules cache id #PSCFV-11123 #PSCFV-11175 2013-12-02 10:06:44 +01:00
Damien Metzger
6230c6249e [-] FO : fixed potential error when you delete a best seller #PSCFV-11167 2013-12-02 09:25:41 +01:00
rGaillard
e0fd879037 [-] BO: Add some useful hooks to modify the listings/options/forms 2013-11-29 18:18:17 +01:00
Damien Metzger
4c2190ddc5 [-] Core : integrated modified pull request 40abb0aa72 2013-11-29 17:18:18 +01:00
Damien Metzger
9dc075ca39 [*] FO : Code cleaning, optimizations, new callstack available in the profiling tools 2013-11-29 14:21:22 +01:00
rGaillard
5c3f43141b // small fix 2013-11-29 14:20:06 +01:00
Jerome Nadaud
e1568a67a2 // Fix products attachments uploader 2013-11-29 12:10:09 +01:00
gRoussac
d46feffcf1 [*] CORE : Throw Exception when no theme selected only in front office 2013-11-28 16:14:30 +01:00
gRoussac
336e784ca5 [*] CORE : Throw Exception when no theme selected 2013-11-28 15:32:19 +01:00
Jerome Nadaud
b66f8ea75a // Allow list disabled categories 2013-11-28 14:49:41 +01:00
Jerome Nadaud
9b241d5e1d // Add interface restriction in Autoload 2013-11-28 11:46:03 +01:00
gRoussac
8370c18fe8 [-] CORE : Remove notices on ob clean 2013-11-28 11:11:49 +01:00
Jerome Nadaud
510b71054a // Add Drag and Drop to uploader helper 2013-11-28 09:55:22 +01:00
gRoussac
82022c337a [-] FO : CCC do not withdraw \t+ and \s+ 2013-11-27 19:49:07 +01:00
Damien Metzger
8dc4eb5c03 [-] BO : Category code cleaning, fixing, moving and multistore-ing 2013-11-27 17:40:35 +01:00
Kevin Granger
8f51fee67a // load jquery-timeago.js 2013-11-27 15:15:30 +01:00
gRoussac
10dac5a45b [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/816 2013-11-27 00:06:44 +01:00
gRoussac
5f5b9bd1de [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/718 2013-11-26 23:43:49 +01:00
gRoussac
5d511c1ac7 // remove notice in ModuleGraph.php 2013-11-26 23:39:28 +01:00
gRoussac
ef466ac47c [+] CORE : Merg of https://github.com/PrestaShop/PrestaShop/pull/775 2013-11-26 23:33:24 +01:00
gRoussac
1855ffa584 [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/813 2013-11-26 23:18:00 +01:00
gRoussac
8d15f5d3e6 [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/814 2013-11-26 23:08:03 +01:00
gRoussac
13b5762367 [-] FO : trailing \t in minified html 2013-11-26 18:41:02 +01:00
Jerome Nadaud
dc90bb6227 // Force clearstatcache on product image upload 2013-11-26 15:46:21 +01:00
Damien Metzger
9ad56871de Merge pull request #1004 from djfm/bootstrap 
// when adding a translation pack, do not install translations for modules that are not on the disk
 2013-11-26 01:31:24 -08:00
Jerome Nadaud
48be09d82d // Missing Base uri in uploader helper 2013-11-25 17:37:26 +01:00