dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,882 Commits 9 Branches 19 Tags
3f3dc0feb950bb0cfb20fbf8a358c656573ee04a
Commit Graph

18882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud 3f3dc0feb9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-05 16:39:12 +01:00
Rémi Gaillard d4253b9849 // small fix 2013-11-05 15:33:21 +01:00
Rémi Gaillard 9817ef6840 // small fix on profiling 2013-11-05 11:54:22 +01:00
gRoussac 581645ce6d [-) BO : Action is mandatory for a cart rule 2013-11-05 11:26:10 +01:00
gRoussac 87be153e42 [-] MO : Blockcategories last_visited_category must not be cached 2013-11-05 11:16:52 +01:00
Gregory Roussac f85c6b59c8 Merge pull request #921 from Jacky75/20131105-layered-feature-sorted 
[*] MO : Blocklayered filter feature blocks sorted
 2013-11-05 01:50:48 -08:00
Daniele Giachino 99e98a5164 In multistore, layered filters about categories are not loading the category name from the proper shop 2013-11-05 10:45:23 +01:00
Damien Metzger 4c1ad83b18 // "Fixed" strict standard 2013-11-05 10:22:39 +01:00
gRoussac 26a43260c5 [-] CORE : invalid method name in displayAjax method of Controller action 2013-11-05 10:18:53 +01:00
Gregory Roussac c69429c126 Merge pull request #922 from Jacky75/20131105-layered-categories-shop 
[-] MO : Missing context shop for categories
 2013-11-05 01:10:39 -08:00
Daniele Giachino 02c04a9884 In multistore, layered filters about categories are not loading the category name from the proper shop 2013-11-05 09:40:53 +01:00
Daniele Giachino cf65877f3f layered filters involving features are now natural sorted 2013-11-05 09:32:36 +01:00
Daniele Giachino f0abdca08f layered filters involving features are now natural sorted 2013-11-05 09:30:13 +01:00
gRoussac 0e54bf0f76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 18:27:39 +01:00
Jerome Nadaud 12276f41fb // Update image when updated 2013-11-04 18:26:24 +01:00
gRoussac be13f82b30 [*] FO: Follow up https://github.com/PrestaShop/PrestaShop/commit/e86c56172dad2892d5c7e7dbb0908b0f4ffbaae0 2013-11-04 18:20:01 +01:00
Rémi Gaillard f5cc6862cb // don't die on autoload 2013-11-04 18:08:24 +01:00
Rémi Gaillard 0a65de5e5f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 17:22:21 +01:00
Rémi Gaillard f4740088c1 // small fix 2013-11-04 17:22:08 +01:00
gRoussac c44b1d617c [-] BO : Could not change image position 2013-11-04 16:59:03 +01:00
gRoussac c452444620 [-] IN : Could not install when session_start() does not fail on ajax requests 2013-11-04 15:47:29 +01:00
gRoussac 3f817e8729 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 14:31:29 +01:00
gRoussac 66f314bbb2 // missing trailing bracket in modules/productcomments/config.xml 2013-11-04 14:31:15 +01:00
Rémi Gaillard bf8cd29868 // validator on message field 2013-11-04 14:21:42 +01:00
gRoussac b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 2013-11-04 11:57:31 +01:00
gRoussac 9ea79f8cb5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 11:48:25 +01:00
Rémi Gaillard b3c54a59dd // typo 2013-11-04 11:48:30 +01:00
Rémi Gaillard 06d73554be // preg instead strpos 2013-11-04 11:39:48 +01:00
gRoussac ad555f1d30 [-] IN : Follow up #PSCFV-10671 update messages in base and https://github.com/PrestaShop/PrestaShop/commit/b16e4b5a8ee6bdab13808f8ab473bda6c060c086 2013-11-04 11:10:40 +01:00
Gregory Roussac 4b6ee72072 Merge pull request #894 from codeurWeb/patch-6 
[-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php
 2013-11-04 02:02:10 -08:00
Rémi Gaillard e000f8c627 // something is missing in the last commit 2013-11-04 11:00:21 +01:00
Rémi Gaillard 6ef7f258ea // small fix 2013-11-04 10:34:58 +01:00
Jerome Nadaud 2be72f50d1 [-] FO : FixBug Categories description 2013-11-04 10:29:44 +01:00
Rémi Gaillard d49c4cf62e [-] BO: Fix from name when replying to customer threads 2013-11-04 09:38:12 +01:00
gRoussac c7323c2bfe [-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities 2013-11-03 22:59:04 +01:00
gRoussac 2a3192d98c [-] IN : Refacto for update_customer_default_group bad logical 2013-11-03 14:55:25 +01:00
gRoussac b16e4b5a8e [-] IN : Lower memory usage in migrate_orders, fix update_order_messages loop 2013-11-03 01:49:16 +01:00
gRoussac 8f72282594 [-] IN : update_customer_default_group returning false 2013-11-02 21:51:13 +01:00
gRoussac a5bb4f0323 [-] IN: Fix [insert order detail 1] error while upgrading 2013-11-02 20:39:53 +01:00
gRoussac 062fb90c2e [-] IN : Fix Unknown column 'module_name' in 'ps_webservice_account' during upgrade 2013-10-31 19:24:41 +01:00
Jerome Nadaud 9193a29a44 [+] MO : Blockcart - Add error handler on ajax function 2013-10-31 19:02:43 +01:00
Jerome Nadaud 671062af07 // Add Disable overrides to debug mode 2013-10-31 18:41:56 +01:00
gRoussac 80c60be952 [-] BO : Do not enable rewrite url for index 2013-10-31 16:20:55 +01:00
Rémi Gaillard 1b019dffc5 // Fix lang detection on dispatcher 2013-10-31 15:28:19 +01:00
gRoussac f9dc0b0252 [-] MO : Could not translate in transit mail, revert from https://github.com/viger-creator/PrestaShop/commit/3213b5dffb266ddb0639b94f72babd892328ffa2 2013-10-31 14:20:21 +01:00
Rémi Gaillard 9611ea1f70 [-] BO: Fix empty group list on changing opt or newsletter on customers listing 2013-10-31 11:22:40 +01:00
Rémi Gaillard d17515a728 // don't format currency on input 2013-10-31 10:22:38 +01:00
gRoussac 036fa7cba6 [-] FO : Fix bug #PSCFV-10889 wrong color when oos product 2013-10-31 10:18:28 +01:00
Damien Metzger 9c57c71deb Merge pull request #913 from djfm/development 
// Installer Translations
 2013-10-31 01:48:56 -07:00
djfm 7812731095 // removed hard-coded space before ellipsis (...) in English installer steps 2013-10-31 08:29:05 +00:00