dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
TMMeilleur 21209d799f update 5.11.13 2013-11-05 17:17:26 +02:00
Damien Metzger 0bd6b940d2 // Fixed logoq 2013-11-05 16:17:14 +01:00
Damien Metzger 0e4a900d3d // Fixed group display 2013-11-05 16:13:52 +01:00
Damien Metzger e4fe5f6df6 // Fixed htmlentities in KPIs 2013-11-05 16:01:48 +01:00
Rémi Gaillard 161145fb34 // small fix 2013-11-05 15:35:14 +01:00
Rémi Gaillard d4253b9849 // small fix 2013-11-05 15:33:21 +01:00
Damien Metzger 9bc5a52925 Merge pull request #916 from PrestaEdit/patch-58 
[-] FO: use 4 images in thumbnails, not 3
 2013-11-05 06:20:59 -08:00
Damien Metzger b0ae53f823 // Changed cursor in the module position tab (for drag n drop) 2013-11-05 15:14:58 +01:00
Rémi Gaillard b96da7e5ee Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 15:14:13 +01:00
Rémi Gaillard a5bb0486e6 // fix email validator && allow to convert unicode without classes 2013-11-05 15:06:22 +01:00
Damien Metzger 9a86f2c32b // And now it works! 2013-11-05 15:02:36 +01:00
Damien Metzger a5552f3f85 // Improved dashgoals configuration (tmp) 2013-11-05 14:44:42 +01:00
Kevin Granger eb383e580e // Organize css/sass + backward compatibility WIP 2013-11-05 12:32:41 +01:00
fram 4b0b5cf4da // added an option not to override the local localization pack when installing a localization pack 2013-11-05 12:08:14 +01:00
fram 2b8d069cf9 [*] LO : Added states to Spanish localization pack 2013-11-05 12:06:31 +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
TMMeilleur 55cd7c4c34 update 05.11.13 2013-11-05 11:35:24 +02:00
Vincent Augagneur 1a7aa020f6 //added new configuration on dashproduct 2013-11-05 10:23:26 +01:00
Damien Metzger 4c1ad83b18 // "Fixed" strict standard 2013-11-05 10:22:39 +01:00
Vincent Augagneur e710942833 //small fix on dashboard config save 2013-11-05 10:22:22 +01:00
Vincent Augagneur 9af3b30135 //smal fix on hookDashboardData params 2013-11-05 10:21:34 +01:00
gRoussac 26a43260c5 [-] CORE : invalid method name in displayAjax method of Controller action 2013-11-05 10:18:53 +01:00
Jonathan Danse 9f396ada83 //remove unnecessary addCSS (fancybox) 2013-11-05 10:13:13 +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
Jerome Nadaud de8bd97831 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 19:50:48 +01:00
Jerome Nadaud cf44f8d0b4 // Uploader helper small fix 2013-11-04 19:50:04 +01:00
Kevin Granger fbc93e5632 // moved admin css and backward compatibility css to admin theme css directory 2013-11-04 19:48:53 +01:00
Rémi Gaillard 569455a7ff // fix on front validators 2013-11-04 19:26:51 +01:00
Damien Metzger 8dc29b20f0 // Code cleaning and dashgoals improvements (part 1 - not finished yet) 2013-11-04 18:52:27 +01:00
Jerome Nadaud fa68e015b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 18:34:51 +01:00
Jerome Nadaud bf2d54e286 // Add new uploader helper to blockcategories 2013-11-04 18:32:59 +01:00
Kevin Granger 8aedd4eb04 // Cleaned CSS files 2013-11-04 18:31:59 +01:00
Jerome Nadaud d78a268730 // Uploader helper part 2 2013-11-04 18:31:43 +01:00
gRoussac 0e54bf0f76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-04 18:27:39 +01:00
Jerome NadaudandgRoussac 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
Damien Metzger 2a9ebaa6ed Merge pull request #920 from djfm/bootstrap 
// English emails
 2013-11-04 09:07:41 -08:00
djfm 71e3a8a937 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 16:58:17 +00:00
djfm 5372f31b4c // updated English emails 2013-11-04 16:57:50 +00:00
Jerome Nadaud b650c349d5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 17:47:46 +01:00
Jerome Nadaud 5af2ef38a1 // Fix Tagify javascript error 2013-11-04 17:47:27 +01:00
Kevin Granger 9611c17980 // removed install.css http://www.youtube.com/watch?v=Y9mq7Qc4oSM 2013-11-04 17:28:50 +01:00