dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,896 Commits 9 Branches 19 Tags
da3ca98dfd1e21ab287b108c07ea2a1008a6ba2d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
rGaillard 5e18a94d2a // employee avatar on the logs listing 2013-12-05 19:16:43 +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
rGaillard f128dac9c4 // small fix 2013-12-05 15:59:14 +01:00
rGaillard e52652f96f Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-05 11:26:39 +01:00
rGaillard acd0bbc366 // php warning 2013-12-05 11:26:26 +01:00
Rémi Gaillard 79198487ac Merge pull request #1098 from djfm/1.6 
// typo in default theme blockcart.tpl
 2013-12-04 06:19:39 -08:00
rGaillard 90f5560cb3 // add new hook on product comparator 2013-12-04 14:43:09 +01:00
Rémi Gaillard a7f20fd986 Merge pull request #1097 from TMMeilleur/1.6 
// added social's buttons on product's comparisions page
 2013-12-04 05:34:09 -08:00
rGaillard be91ec02f2 // fix modules filter after category change 2013-12-04 12:03:12 +01:00
Rémi Gaillard 360d68c5f7 Merge pull request #1091 from TMMeilleur/1.6 
// small fixes
 2013-12-04 00:45:33 -08:00
rGaillard 8a72e4d810 // small fix 2013-12-03 11:18:58 +01:00
rGaillard 08ef0667ca Revert "// update some css&tpl bugs" 
This reverts commit 01d5087067.
 2013-12-02 19:25:21 +01:00
rGaillard 102b99eb1c // small fix 2013-12-02 18:15:37 +01:00
rGaillard 9078290c01 // small fix 2013-12-02 16:18:59 +01:00
rGaillard 78a6821b2f // handle img extensions in the end of query string in the dispatcher 2013-12-02 16:14:27 +01:00
Rémi Gaillard 6d473d5374 Merge pull request #1071 from TMMeilleur/bootstrap 
//updated jqzoom and products compare page is responsive now
 2013-12-02 06:49:24 -08:00
rGaillard 3cfafbfe10 // typo 2013-12-02 15:20:12 +01:00
rGaillard 89329dc865 // small fix 2013-12-02 15:15:17 +01:00
rGaillard 0b147f626f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 18:18:29 +01:00
rGaillard e0fd879037 [-] BO: Add some useful hooks to modify the listings/options/forms 2013-11-29 18:18:17 +01:00
rGaillard 8ee61f8709 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 16:40:14 +01:00
rGaillard 8ba251c996 // small clean 2013-11-29 16:40:00 +01:00
Rémi Gaillard 6a5cebaff4 Merge pull request #1061 from TMMeilleur/bootstrap 
// fixes 29.11.2013
 2013-11-29 07:19:48 -08:00
rGaillard 5c3f43141b // small fix 2013-11-29 14:20:06 +01:00
rGaillard 621ad532d7 // typo 2013-11-27 17:00:13 +01:00
Rémi Gaillard 9bc020ce9e Merge pull request #1051 from TMMeilleur/bootstrap 
// fixes 27.11.2013
 2013-11-27 05:13:46 -08:00
rGaillard 58eb63e99e // small fix 2013-11-26 17:02:13 +01:00
Rémi Gaillard a71bfa8d4e Merge pull request #1046 from PhpMadman/patch-1 
// "show all messages" link linked to tab instead of controller
 2013-11-26 07:10:28 -08:00
rGaillard 375981378f // typo 2013-11-25 16:44:08 +01:00
rGaillard b29a30f033 // small fix 2013-11-22 17:59:32 +01:00
rGaillard 88ad2010d6 // add padding and margin to automplete width #PSCFV-5876 2013-11-22 16:41:25 +01:00
Rémi Gaillard 45525dac71 Merge pull request #1017 from TMMeilleur/bootstrap 
// fixes for cross-browser compability
 2013-11-22 05:50:37 -08:00
Rémi Gaillard 70180f10d4 Merge pull request #1014 from indesign47/patch-13 
[-] FO : header add translation for fields
 2013-11-22 03:08:04 -08:00
Rémi Gaillard c2e3e1295c Merge pull request #1006 from TMMeilleur/bootstrap 
// Added all themes for themeconfigurator and fixed Rich Snipet (availability)
 2013-11-20 09:37:56 -08:00
Rémi Gaillard df4cc9d876 Merge pull request #1002 from TMMeilleur/bootstrap 
//fixed banners style
 2013-11-20 07:28:51 -08:00
rGaillard 7755cd8d3e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 17:46:20 +01:00
rGaillard 5c1f8871fc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 17:46:05 +01:00
rGaillard 9197498c3c // delete useless module 2013-11-18 17:45:53 +01:00
rGaillard 5d0b188eed // small fix 2013-11-18 16:19:02 +01:00
Rémi Gaillard 10e0205cb8 Merge pull request #992 from djfm/development 
// fixed typo in Russian installer
 2013-11-18 06:40:31 -08:00
Rémi Gaillard a1d34e4ad2 Merge pull request #993 from djfm/bootstrap 
// fixed typo in Russian installer
 2013-11-18 06:40:02 -08:00
Rémi Gaillard 4cba2623e5 Merge pull request #926 from djfm/loc_ui 
//Localization
 2013-11-18 06:32:34 -08:00
Rémi Gaillard 618aa24f74 Merge pull request #945 from Javsmile/patch-2 
// Update productcomments.php
 2013-11-18 06:30:59 -08:00
Rémi Gaillard f4194bedd9 Merge pull request #978 from StanProg/bootstrap 
// FO : Removed unused local variable, tabs added, phpdoc tags
 2013-11-18 06:27:46 -08:00
Rémi Gaillard 4c51570b34 Merge pull request #991 from TMMeilleur/bootstrap 
// fixed add to wishlist/compare buttons and added product review
 2013-11-18 06:22:43 -08:00
rGaillard bd241a9c48 [-] BO: product price was changed on changing to advanced stock management #PSCFV-10996 2013-11-18 12:04:09 +01:00
rGaillard 68c8e9da57 // move to themeconfigurator 2013-11-16 19:24:03 +01:00
rGaillard 8c3eb9b9a4 // typo 2013-11-15 21:03:17 +01:00
Rémi Gaillard 4bd7164507 Merge pull request #982 from TMMeilleur/bootstrap 
// added responsive rich menu and small fix in blockbanner
 2013-11-15 08:47:58 -08:00
Rémi Gaillard 7fcbf8aa7c Merge pull request #977 from TMMeilleur/bootstrap 
//updates and fixes 14.11.2013
 2013-11-14 10:28:06 -08:00
Rémi Gaillard 3b1168a032 Merge pull request #974 from TMMeilleur/bootstrap 
// added transforming for mobile view and other small fixes
 2013-11-13 08:43:43 -08:00
Rémi Gaillard fa3aa8c9d7 // strict standard 2013-11-13 15:46:06 +01:00
Rémi Gaillard 83400c691c Merge pull request #973 from djfm/development 
//translations
 2013-11-13 06:34:38 -08:00
Rémi Gaillard f4601d9680 // default form language 2013-11-13 15:37:58 +01:00
Rémi Gaillard 899dea47a1 // oups 2013-11-13 15:32:56 +01:00
Rémi Gaillard 2fe12b965b [-] Core: add possibility to choose the position of your css files 2013-11-13 15:31:29 +01:00
Rémi Gaillard f7e1229e16 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-13 11:58:24 +01:00
Rémi Gaillard 24a4694000 // small clean 2013-11-13 11:58:11 +01:00
Rémi Gaillard 4a9383bbcf // small fix 2013-11-13 11:15:48 +01:00
Rémi Gaillard 115c368a89 Merge pull request #970 from alexey-svistunov/bootstrap 
//Frontend updates.
 2013-11-13 01:29:22 -08:00
Rémi Gaillard 75df12dd94 [-] Core: Group::getCurrent() return the default customer group of the shop if default customer group is not associated to shop 2013-11-12 18:49:52 +01:00
Rémi Gaillard 75e6a03591 // small fix 2013-11-12 16:38:34 +01:00
Rémi Gaillard b5eb7c5c28 // typo 2013-11-12 16:25:13 +01:00
Rémi Gaillard 175da3ecf6 Merge pull request #965 from djfm/IETF 
[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'is...
 2013-11-12 06:05:10 -08:00
Rémi Gaillard 8be339463d // small fix 2013-11-12 12:36:51 +01:00
Rémi Gaillard d7dd85d7d0 Merge pull request #955 from alexey-svistunov/bootstrap 
Added changes from eb94b51 TMMeilleur/PrestaShop
 2013-11-08 11:25:25 -08:00
Rémi Gaillard 2d2445efd4 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 18:34:09 +01:00
Rémi Gaillard 855c8a8de4 // add 2 useful hooks 2013-11-07 18:33:49 +01:00
Rémi Gaillard f5c133f6e0 // small fix 2013-11-07 17:50:28 +01:00
Rémi Gaillard 2d609ec93c // merge fixes 2013-11-07 17:43:26 +01:00
Rémi Gaillard e3cfacb90e // link to employee default tab and not index 2013-11-07 17:00:55 +01:00
Rémi Gaillard ef5779f63f // d321b9a5bc 2013-11-06 17:11:31 +01:00
Rémi Gaillard 50c95f568c Merge pull request #935 from jeckyl/patch-4 
Update cart-summary.js
 2013-11-06 07:01:02 -08:00
Rémi Gaillard 9fa4296a06 Merge pull request #929 from djfm/bootstrap 
// updated English emails: now responsive
 2013-11-06 01:38:44 -08:00
Rémi Gaillard 1dd919addf // no need mobile version with responsive :) 2013-11-05 19:15:24 +01:00
Rémi Gaillard 3edaee1313 // themeconfigurator 2013-11-05 19:07:42 +01:00
Rémi Gaillard 65a41a9f7a // theme configurator 2013-11-05 18:49:21 +01:00
Rémi Gaillard 4a6cb5075e Merge pull request #924 from TMMeilleur/bootstrap 
// Update default theme
 2013-11-05 07:36:14 -08: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
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
Rémi Gaillard 9817ef6840 // small fix on profiling 2013-11-05 11:54:22 +01:00
Rémi Gaillard 569455a7ff // fix on front validators 2013-11-04 19:26:51 +01:00
Rémi Gaillard f5cc6862cb // don't die on autoload 2013-11-04 18:08:24 +01:00
Rémi Gaillard 2c3a5c553d // small fix 2013-11-04 17:23:04 +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
Rémi Gaillard bf8cd29868 // validator on message field 2013-11-04 14:21:42 +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
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
Rémi Gaillard d49c4cf62e [-] BO: Fix from name when replying to customer threads 2013-11-04 09:38:12 +01:00
Rémi Gaillard c4d18e5e9f avatar on customer threads 2013-11-02 16:01:06 +01:00
Rémi Gaillard 95b5036782 // addsharethis cache 2013-11-02 15:41:40 +01:00
Rémi Gaillard 930c9f3ff5 // validators 2013-11-02 10:50:02 +01:00
Rémi Gaillard 5db9c5cdd5 // small fix 2013-11-02 09:54:37 +01:00
Rémi Gaillard a1696efe63 // small fix 2013-10-31 18:40:29 +01:00
Rémi Gaillard 74e92e364c // php warning 2013-10-31 18:26:09 +01:00