Commit Graph

20777 Commits

Author SHA1 Message Date
PhpMadman 6ef0910bfb [*] BO : Fixes issue with not beeing able to edit weight beacuse string is longer then max length 2013-12-02 10:17:26 +01:00
Damien Metzger 62a7a6a94f [-] FO : fixed cart rules cache id #PSCFV-11123 #PSCFV-11175 2013-12-02 10:06:44 +01:00
Francois Gaillard 3386ad6517 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-12-02 09:26:24 +01:00
Francois Gaillard 34d56ead85 [-] Controller : ParentOrderController - Missing parenthesis 2013-12-02 09:26:04 +01:00
Damien Metzger 6230c6249e [-] FO : fixed potential error when you delete a best seller #PSCFV-11167 2013-12-02 09:25:41 +01:00
Jerome Nadaud d887dfc2f1 // Update cart rules fancybox 2013-12-02 09:13:20 +01:00
Jérôme Nadaud cd2246a9c3 Merge pull request #1068 from Dh42/bootstrap
[*] MO : blockcontact added title tag to link
2013-12-01 23:58:38 -08:00
Jérôme Nadaud 6fcafbe4f2 Merge pull request #1067 from PrestaEdit/patch-61
//use Tools methods instead of $_GET/$_POST
2013-12-01 22:06:30 -08:00
lesley paone f22fd92a95 [*] MO : blockviewed added title tag to image 2013-12-01 23:22:01 -06:00
lesley paone 8de9a0ecda [*] MO: blockcontact Adds title tag on link 2013-12-01 21:43:40 -06:00
PrestaEdit 06b68e3757 //use Tools methods instead of $_GET/$_POST 2013-12-01 23:39:27 +01:00
lesley paone c813cc5176 [*] MO : Blockrss added title tag to links 2013-11-30 20:03:29 -06:00
Damien Metzger 7cd38d4461 // Changed base64 to urlencode in import (and fixed filename issue) 2013-11-29 19:24:04 +01:00
Jerome Nadaud 8decc89750 // Fix color form item 2013-11-29 18:39:26 +01:00
Jerome Nadaud 53b327ec46 // small fix 2013-11-29 18:32:05 +01:00
gRoussac f39b621251 [-] BO : Fix bug #PSCFV-11162 AdminImport, Exception on ProductSupplier 2013-11-29 18:29:50 +01:00
Damien Metzger 782975c708 [-] BO : better error display for forgotten password #PSCSX-58 2013-11-29 18:18:55 +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
Jerome Nadaud 0a2a36f49b // Add text-success class to upload button 2013-11-29 18:15:55 +01:00
Jerome Nadaud 8dae23891a // Remove add category on edit 2013-11-29 18:08:01 +01:00
Jerome Nadaud fbf2c26093 // Fix when file is missing 2013-11-29 18:07:50 +01:00
Jerome Nadaud a597881da7 // Fix simple uploader view 2013-11-29 18:07:27 +01:00
gRoussac 3871ea32a4 // missing parenthesis 2013-11-29 17:48:52 +01:00
Jerome Nadaud f8a94b1be9 // Catalog price rules bootstraping 2013-11-29 17:31:28 +01:00
Kevin Granger c8f130670f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 17:19:04 +01:00
Kevin Granger 6a84f586af // add compass config.rb for theme default-bootstrap 2013-11-29 17:18:50 +01:00
Damien Metzger 4c2190ddc5 [-] Core : integrated modified pull request https://github.com/ExploZe/PrestaShop/commit/40abb0aa72607ddfe912b364d8fc7d65733d2bd8 2013-11-29 17:18:18 +01:00
Jerome Nadaud b432fd5641 // Bootstraping cart rules 2013-11-29 17:13:09 +01:00
Damien Metzger e0b28dd57b // AdminOutstanding is now bootstraped 2013-11-29 17:10:22 +01:00
gRoussac 68ed6fac82 [*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/582 2013-11-29 17:06:59 +01:00
Jerome Nadaud cbc79c6cf2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 16:54:47 +01:00
Jerome Nadaud 6da40e7159 // fix new tax rule button 2013-11-29 16:54:33 +01:00
Damien Metzger 90e1a39025 // Rollback previous pull request merge (with a truncate) 2013-11-29 16:49:28 +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
Damien Metzger af3f7be5ac Merge pull request #1058 from Dh42/patch-20
[*] MO: blockbanner added title and alt tag to image
2013-11-29 07:36:34 -08:00
Damien Metzger b23acae33e Merge pull request #1057 from Dh42/patch-19
// Blockcategories changed title to use name
2013-11-29 07:36:07 -08:00
Rémi Gaillard 6a5cebaff4 Merge pull request #1061 from TMMeilleur/bootstrap
// fixes 29.11.2013
2013-11-29 07:19:48 -08:00
TMMeilleur b122291080 fixes 29.11.2013 2013-11-29 17:13:27 +02:00
Jerome Nadaud 8ad3166226 // Add save button to Localization tax rules 2013-11-29 15:30:57 +01:00
Jerome Nadaud 4c2500fb35 // Remove unnecessary code 2013-11-29 14:35:06 +01:00
Damien Metzger 9dc075ca39 [*] FO : Code cleaning, optimizations, new callstack available in the profiling tools 2013-11-29 14:21:22 +01:00
rGaillard 5c3f43141b // small fix 2013-11-29 14:20:06 +01:00
Jerome Nadaud badfef481c // Small fix 2013-11-29 12:20:10 +01:00
Jerome Nadaud e1568a67a2 // Fix products attachments uploader 2013-11-29 12:10:09 +01:00
Kevin Granger 85f445b7cc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 11:53:52 +01:00
Kevin Granger cc80e82431 // import (todo: add the link delete/view on items loaded with js) 2013-11-29 11:53:43 +01:00
Dh42 77e02f054f [*]MO: blockbanner added title and alt tag to image 2013-11-28 22:39:25 -06:00
Dh42 9cf3fa2e8a [*]MO: Blockcategories changed title to use name
Changed the title tag to use the name of the link not the description. Using the description will get sites with a lot of content keyword stuffing penalties. See screenshot http://screencast.com/t/SXY93Ax7Sm
2013-11-28 22:17:40 -06:00