dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,677 Commits 9 Branches 19 Tags
cc8f4696b1ce2bc189eaa5b33d3de4cc9575a4a6
Commit Graph
20677 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud cc8f4696b1 // Small Fix in product image upload 2013-11-27 15:56:15 +01:00
gRoussac dd99d13dc4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/766 2013-11-27 15:42:11 +01:00
Kevin Granger 8f51fee67a // load jquery-timeago.js 2013-11-27 15:15:30 +01:00
Kevin Granger 6d9f71a8db Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 14:39:41 +01:00
Kevin Granger e1ae484c10 // add jquery.timeago.js + jquery. validatio,.js 2013-11-27 14:39:09 +01:00
Kevin Granger 66f8b55fc2 // import WIP (broken for now) 2013-11-27 14:35:47 +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
TMMeilleur 44549d650f fixes 27.11.2013 2013-11-27 14:02:26 +02:00
gRoussac ef6dd3bfed [-] MO : display_column_left not assigned to smarty in modules initContent() + ssl on loyalty front controller 2013-11-27 12:32:01 +01:00
Kevin Granger dd36a9e8b7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 11:35:41 +01:00
gRoussac 6959e71bec [*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/729 2013-11-27 00:09:41 +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 5485433df6 [-] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/819 2013-11-26 22:57:57 +01:00
gRoussac 9ccd4504f4 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/820 + https://github.com/PrestaShop/PrestaShop/commit/5e407db21e3e30a1a5fa94b9558314ffa21af407 2013-11-26 22:49:10 +01:00
gRoussac b8012952f7 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/852 2013-11-26 22:32:57 +01:00
gRoussac 4c92e8f4c5 [*] PDF : Merge of https://github.com/PrestaShop/PrestaShop/pull/873 2013-11-26 19:06:50 +01:00
Kevin Granger 37d4d4bd5f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-26 19:03:27 +01:00
Kevin Granger 32af46e42c // Import WIP 2013-11-26 19:03:15 +01:00
gRoussac 13b5762367 [-] FO : trailing \t in minified html 2013-11-26 18:41:02 +01:00
gRoussac c5b6ec5c3c [+] FO : Missing old default templates 2013-11-26 18:09:05 +01:00
rGaillard 58eb63e99e // small fix 2013-11-26 17:02:13 +01:00
gRoussac 7f304fc768 [-] FO : Merge of https://github.com/ldecoker/PrestaShop/commit/d3bf4d233005511e08554a7c283e0b992815e01a 2013-11-26 16:26:35 +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
PhpMadman 0a5216e35b show all messages link linked to tab 2013-11-26 15:56:21 +01:00
Jerome Nadaud dc90bb6227 // Force clearstatcache on product image upload 2013-11-26 15:46:21 +01:00
gRoussac 69c99f49c9 [-] BO : Merge of https://github.com/smilesrg/PrestaShop/commit/b7b79ff4614e5be7891f8702acdc46c8303a2fdd 2013-11-26 15:27:59 +01:00
Gregory Roussac 841f6ec65d Merge pull request #1011 from indesign47/patch-10 
[+] BO : AdminSearchConf add import alias
 2013-11-26 02:35:30 -08:00
Gregory Roussac 5153b49eae Merge pull request #1013 from indesign47/patch-12 
[-] FO : Contact-form add translation for fields
 2013-11-26 02:35:07 -08:00
Gregory Roussac 24dc07ef85 Merge pull request #1022 from indesign47/patch-18 
[-] BO : AdminImport add image manufacturers
 2013-11-26 02:34:31 -08:00
Gregory Roussac b6a41fca69 Merge pull request #1015 from indesign47/patch-14 
[-] BO : AdminImages manufacturers/suppliers/stores image
 2013-11-26 02:34:25 -08:00
gRoussac 6de541ea1d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-26 11:27:41 +01:00
gRoussac 53b91fc0b7 attribute_anchor_separator 2013-11-26 11:27:25 +01:00
Vincent Augagneur 33b7c554f7 //small fix #PSCSX-39 2013-11-26 10:59:03 +01:00
Kevin Granger 926286eaf9 // fix switch 2013-11-26 10:33:35 +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
Vincent Augagneur e3f3f8a58f //oups 2013-11-26 10:25:03 +01:00
Vincent Augagneur 690b6b160a //small js fix 2013-11-26 10:24:19 +01:00
gRoussac 8a7d39d800 [-] BO : Undefined on image upload, revert of https://github.com/PrestaShop/PrestaShop/commit/48b7a49b1aea34a2def355ffec1d4c08dfdbdfd6 2013-11-25 22:58:22 +01:00
Jerome Nadaud 47b7bf5458 // Adding some style to tinymce 2013-11-25 19:05:58 +01:00
gRoussac 695aaa73fb [-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/696 2013-11-25 19:03:15 +01:00
Jerome Nadaud 5eae3acee3 // Add new value button at attribute controller start 2013-11-25 18:29:06 +01:00
Jerome Nadaud 0d6bc850de // Update datepicker button with period buttons select 2013-11-25 18:24:06 +01:00
Jerome Nadaud a81ee41374 // Fix missing saving button in products 2013-11-25 18:01:01 +01:00
Kevin Granger d9e53486a0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:56:11 +01:00
Kevin Granger 4c8c48f441 // admin import 2013-11-25 17:55:59 +01:00