dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,592 Commits 9 Branches 19 Tags
dc1632a8b00a89e71bbc6e39acd3fa87d8d8385c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Francois Gaillard 77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
Francois Gaillard f4610c06e0 [-] BO : Bug fix - Modules confirmation messages 2013-10-07 12:21:16 +02:00
Francois Gaillard 68cba08303 [-] BO : Bug fix - Modules confirmation messages 2013-10-07 12:18:44 +02:00
Francois Gaillard 8c6aaa3c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-19 17:31:42 +02:00
Francois Gaillard 63f4743134 [-] MO : PNM-1715 - Bug fix accented chars & ajax-cart 2013-09-19 17:31:35 +02:00
Francois Gaillard cc36eb2d27 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-12 14:32:22 +02:00
Francois Gaillard 53c1e56c51 [-] BO : Bug fix - Encoding & tips of the day 2013-09-12 14:32:02 +02:00
Francois Gaillard e1d0347757 [-] Classes : Bug fix - FrontController, mobile & JS minifier fixed 2013-09-09 10:17:15 +02:00
Francois Gaillard 768a8b36d5 [-] BO : AdminModulesController - Bug fix, $params was not set 2013-09-06 15:41:24 +02:00
Francois Gaillard d0087267df // Fixed tips of the day & encoding 2013-08-30 14:22:24 +02:00
Francois Gaillard e6abe1c5a0 // Release branch merged 2013-08-29 18:46:34 +02:00
Francois Gaillard 4a8f6c3116 // Modules categories sort 2013-08-29 17:00:34 +02:00
Francois Gaillard c0bc3bda29 // Bug fix template override & admin templates 2013-08-06 11:13:49 +02:00
Francois Gaillard 29bbe81ae6 // CloudCache removed from AdminPerformanceController 2013-08-06 09:25:47 +02:00
Francois Gaillard 58b5028147 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 16:25:57 +02:00
Francois Gaillard 176c6a8767 [-] Classes : ModuleFrontController updated. Thank you @codeurWeb 2013-08-05 16:25:52 +02:00
Francois Gaillard db951f5b76 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-05 15:37:20 +02:00
Francois Gaillard f217061e27 [-] Classes : ModuleFrontController & templates overrides fixed 2013-08-05 15:37:16 +02:00
Francois Gaillard 268b3c6bda // Variables name fixed 2013-08-01 19:14:04 +02:00
Francois Gaillard b51d4f4c7d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-08-01 19:11:27 +02:00
Francois Gaillard 28de7890d2 [*] MO : Templates overrides works with the new structure (/views/templates/admin|front|hook) 2013-08-01 19:10:25 +02:00
Francois Gaillard 07ce127723 [-] Classes : Bug fix Validate.php - Error with $mail_name 2013-08-01 17:31:45 +02:00
Francois Gaillard 7e7b5af26e // Profiler fixed 2013-08-01 17:21:38 +02:00
Francois Gaillard 2e3f13db95 [-] Controller : AdminTranslationsController - Fixed bug with simple & double quotes 2013-07-23 18:47:35 +02:00
Francois Gaillard d0e4e956c4 [-] Classes : Mail - check instance of link in the context 2013-07-11 14:01:24 +02:00
Francois Gaillard 8d3f330b2d [-] IN : Fixed bug with database creation 2013-07-03 12:19:34 +02:00
Francois Gaillard b8bfdcd3f5 // .gitattributes files added 2013-07-02 14:53:58 +02:00
Francois Gaillard b8df8e6fb1 [-] Classes : Db : Fixed $link 2013-06-26 17:39:53 +02:00
Francois Gaillard 73a372bab2 // Disable autocomplete on radio button in installer, error fixed with Chrome browser 2013-06-05 10:41:46 +02:00
Francois Gaillard dfac99dc64 [-] Classes : Db classe fixed (check InnoDB support MySQL >= 5.6) 2013-05-30 16:23:24 +02:00
Francois Gaillard 97e4284f16 [-] BO : Fixed unregistered version field for some modules 2013-05-27 18:12:40 +02:00
Franois Gaillard adb0da00f6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-05-24 11:39:37 +02:00
Franois Gaillard 3b1a9f9f80 [-] BO : Fixed unregistered version field for some modules 2013-05-24 11:39:20 +02:00
François Gaillard 6106066ef1 // Release branch merged 2013-04-25 17:00:56 +02:00
Francois Gaillard 8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
François Gaillard 056709f2dd // CHANGELOG 1.5.4.1 2013-04-25 16:59:40 +02:00
Francois Gaillard 062759808e // CHANGELOG 1.5.4.1 2013-04-25 16:59:40 +02:00
Francois Gaillard 2c3f2eb1da //new addons url in install process 2013-04-24 16:39:04 +02:00
François Gaillard b5047051cd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-24 16:38:31 +02:00
Francois Gaillard 50d52baa7b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-24 16:38:31 +02:00
François Gaillard f1e34c20b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-23 11:39:14 +02:00
Francois Gaillard e61bd7c185 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-23 11:39:14 +02:00
François Gaillard b6d9c89b99 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 18:23:18 +02:00
Francois Gaillard 8251e98323 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 18:23:18 +02:00
François Gaillard 768eb473e4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 12:09:47 +02:00
Francois Gaillard c9a53bf491 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-18 12:09:47 +02:00
François Gaillard 1ae6507973 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 10:28:49 +02:00
Francois Gaillard 8793024d56 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-11 10:28:49 +02:00
François Gaillard 8125a2e5b4 // Fixed Tools::jsonEncode() on Tools.php 2013-04-11 10:28:38 +02:00
Francois Gaillard 9c3417bfff // Fixed Tools::jsonEncode() on Tools.php 2013-04-11 10:28:38 +02:00
François Gaillard b925bd9ac1 [-] Mobile : Added sub-categories view from home page 2013-04-05 10:08:26 +02:00
Francois Gaillard bfd3e40ab3 [-] Mobile : Added sub-categories view from home page 2013-04-05 10:08:26 +02:00
François Gaillard b9e3436e30 [-] Classes : Bug fix : OrderOpcController, check instance of blocknewsletter module 2013-04-05 10:07:29 +02:00
Francois Gaillard 38f3679302 [-] Classes : Bug fix : OrderOpcController, check instance of blocknewsletter module 2013-04-05 10:07:29 +02:00
François Gaillard 47e918aa67 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-05 10:06:14 +02:00
Francois Gaillard 29dd4ddd77 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-05 10:06:14 +02:00
François Gaillard d2b5c35d3d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-03 16:17:41 +02:00
Francois Gaillard 5a06c90204 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-03 16:17:41 +02:00
François Gaillard a26ce970ff // .gitignore updated 2013-04-03 16:17:33 +02:00
Francois Gaillard d578075475 // .gitignore updated 2013-04-03 16:17:33 +02:00
François Gaillard 5fe0acbfcb [-] Classes : Bug fix : Mobile hooks, check PayPal for payments only 2013-04-02 17:52:52 +02:00
Francois Gaillard 59f6b49b8c [-] Classes : Bug fix : Mobile hooks, check PayPal for payments only 2013-04-02 17:52:52 +02:00
François Gaillard 22fe9f9d01 Merge branch 'release' into development 2013-03-27 10:29:58 +01:00
Francois Gaillard fbcbfdb663 Merge branch 'release' into development 2013-03-27 10:29:58 +01:00
François Gaillard 8bc725f4b6 // Release branch merged 2013-03-27 10:25:16 +01:00
Francois Gaillard 77871338c6 // Release branch merged 2013-03-27 10:25:16 +01:00
François Gaillard 66c9c1f66e Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 18:04:43 +01:00
Francois Gaillard e0a1644453 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 18:04:43 +01:00
François Gaillard 362108efd3 [-] Mobile : Bug fix : Address block (data-ajax) 2013-03-25 17:58:45 +01:00
Francois Gaillard ef0bb1a575 [-] Mobile : Bug fix : Address block (data-ajax) 2013-03-25 17:58:45 +01:00
François Gaillard dda804bffc // Ingore list updated 2013-03-25 15:07:13 +01:00
Francois Gaillard b901750675 // Ingore list updated 2013-03-25 15:07:13 +01:00
François Gaillard ab061827b9 // Ignore list updated (en.php removed) 2013-03-25 15:01:59 +01:00
Francois Gaillard 3eef7892e2 // Ignore list updated (en.php removed) 2013-03-25 15:01:59 +01:00
François Gaillard eeb84d8adf // Ignore list updated + fr translations updated 2013-03-25 14:59:01 +01:00
Francois Gaillard 6d7ea35e97 // Ignore list updated + fr translations updated 2013-03-25 14:59:01 +01:00
François Gaillard 54103a1a8f Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 12:14:09 +01:00
Francois Gaillard 4baf5893e2 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 12:14:09 +01:00
François Gaillard 2866f62e79 // Default carrier groups updated 2013-03-25 12:13:53 +01:00
Francois Gaillard 9b74349f71 // Default carrier groups updated 2013-03-25 12:13:53 +01:00
Francois Gaillard 0fb8bb1127 // Bug fix, no language is set when a employee is not logged yet 2013-03-20 16:06:48 +01:00
François Gaillard 5b96943e7f // Bug fix : Mobile, js errors fixed 2013-03-19 11:16:40 +01:00
Francois Gaillard 2bdb188634 // Bug fix : Mobile, js errors fixed 2013-03-19 11:16:40 +01:00
François Gaillard 97c5c0d0c7 [*] Mobile : OPC, display carrier price, gift wrapping price and gift products 2013-03-19 10:01:07 +01:00
Francois Gaillard cd60e6785e [*] Mobile : OPC, display carrier price, gift wrapping price and gift products 2013-03-19 10:01:07 +01:00
François Gaillard fddbfa6032 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-19 09:47:46 +01:00
Francois Gaillard 3cd5de42b0 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-19 09:47:46 +01:00
François Gaillard a7f4f82fc0 // Debug removed from shopping cart 2013-03-19 09:47:39 +01:00
Francois Gaillard fef6c04f32 // Debug removed from shopping cart 2013-03-19 09:47:39 +01:00
François Gaillard 016ae80514 // Version number updated 2013-03-18 10:47:50 +01:00
Francois Gaillard bd1cc77cf1 // Version number updated 2013-03-18 10:47:50 +01:00
François Gaillard e5e6e8c29c [*] Mobile : Shopping cart displays gifts 2013-03-15 17:24:00 +01:00
Francois Gaillard 97490b5e7b [*] Mobile : Shopping cart displays gifts 2013-03-15 17:24:00 +01:00
François Gaillard e015d9d25e [-] Mobile : Bug fix : Combinations, radio buttons without select 2013-03-15 15:00:49 +01:00
Francois Gaillard 001cf9a5bd [-] Mobile : Bug fix : Combinations, radio buttons without select 2013-03-15 15:00:49 +01:00
François Gaillard 7dc7de6ba7 Merge branch 'release' into development 2013-03-14 17:02:40 +01:00
Francois Gaillard 82d81ed58c Merge branch 'release' into development 2013-03-14 17:02:40 +01:00
François Gaillard 138c225845 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
Francois Gaillard 3599958b5c Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
François Gaillard ad7c73348d Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler" 
This reverts commit da77ce1029.
 2013-03-14 17:01:16 +01:00