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
djfm 38f45e3b2c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-28 08:49:24 +00:00
Kevin Granger 8353bc5ac2 // fix attributes-color-container 2013-10-28 09:32:46 +01:00
gRoussac e1d1479f22 [*] FO : Fix bug #PSCFV-10689 handle image legend 2013-10-27 23:31:36 +01:00
gRoussac 2dbaa5f73b [-] BO : Fix bug #10689, could not set image legend in back office 2013-10-27 22:49:25 +01:00
gRoussac 9a3cfece69 //missing line feed after disable_modsec 2013-10-27 16:05:55 +01:00
Aleksander Palyan ee06d3114d [*] BO : improved unicode characters replacement in URLs (Russian and Ukrainian characters added) 2013-10-27 15:05:49 +02:00
gRoussac c5c861b59e [-] MO : Blockwishlist no product image when id_product_attribute is defined, thanks @Broceliande 2013-10-27 13:28:34 +01:00
Julien 0bc1d21432 [-] MO : Fix NetworkError 404 Not Found on admin in blocklayered.php 
These files not exists :
 - /js/jquery/jquery-ui-1.8.10.custom.min.js
 - /css/jquery-ui-1.8.10.custom.css
 2013-10-26 15:08:07 +02:00
Damien Metzger 6f04df8409 // Fixed icon 2013-10-25 19:06:03 +02:00
Damien Metzger 39f6a2354a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	classes/helper/HelperForm.php
	classes/helper/HelperUploader.php
 2013-10-25 18:58:07 +02:00
Damien Metzger 03857c0576 [*] BO : you can know download the previous file near the upload file input 2013-10-25 18:55:25 +02:00
Rémi Gaillard 8b1f9d0560 // small changes on admincms 2013-10-25 18:42:54 +02:00
Jerome Nadaud 8be88324f9 // Add internet explorer 9 Compat 2013-10-25 18:13:25 +02:00
Damien Metzger e9a802cf23 [*] BO : Added the number of associated products in the product attachments list 2013-10-25 18:04:27 +02:00
gRoussac 4c484afda1 [-] MO : Fix bug #PSCFV-10841, blockcart hides on product page when last product is removed from cart 2013-10-25 17:37:32 +02:00
Jerome Nadaud 5ea880b793 // XHTML norm 2013-10-25 17:37:08 +02:00
gRoussac 025b62f995 // norms 2013-10-25 17:33:44 +02:00
Rémi Gaillard c67e71ca59 // layout fix 2013-10-25 17:30:10 +02:00
Kevin Granger 50bc046671 // fix panel header tree actions (search + button) 2013-10-25 17:24:49 +02:00
Fabio Chelly 8f6a5bb3a1 Merge remote-tracking branch 'origin/development' into development 2013-10-25 17:01:51 +02:00
Fabio Chelly a7d0794c43 [-] BO : Fixed bug PSCFV-9910 using basic queries to prevent locking errors 2013-10-25 17:01:28 +02:00
Gregory Roussac 6359c1ca33 Merge pull request #893 from neemzy/development 
[*] FO : Turned "true" and "false" strings to proper booleans in address.tpl
 2013-10-25 07:42:59 -07:00
Tom Panier 9a26cf02a8 Turned "true" and "false" strings to proper booleans 
It's cleaner this way, and matches how it is done on similar templates.
 2013-10-25 16:36:39 +02:00
Rémi Gaillard 180b180aee // small changes 2013-10-25 16:24:57 +02:00
Rémi Gaillard 5ac471deaf // product toolbar 2013-10-25 16:11:33 +02:00
Jerome Nadaud f472f3e848 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-25 15:55:39 +02:00
Jerome Nadaud f89c8ed008 // Fix HelperUploader images params 2013-10-25 15:54:53 +02:00
gRoussac eb8ea1cba5 [-] CORE : SetEnv in if statement 2013-10-25 15:29:15 +02:00
Damien Metzger aa322e4777 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-10-25 15:22:01 +02:00
gRoussac 4e6585a1b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-25 15:21:55 +02:00
gRoussac a03efe152c [-] CORE : SetEnv not available on all config // @todo curl request on dummy .htacces 2013-10-25 15:21:40 +02:00
Damien Metzger e8d5dc8a62 [*] BO : search results improvements (no unaccessible tabs, better display, better information) 2013-10-25 15:19:03 +02:00
Sarah Lorenzini a49cc68b72 // news design sendtoafriend mails template 2013-10-25 15:01:05 +02:00
Kevin Granger cae4770e0f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-25 14:58:30 +02:00
Rémi Gaillard 7aeba25f99 // class_index 2013-10-25 14:58:11 +02:00
Kevin Granger 339f428c23 // fix login - (tabindex, loading, ellipsis) 2013-10-25 14:58:10 +02:00
Sarah Lorenzini f73716f902 // new design for referralprogram mails template 2013-10-25 14:56:34 +02:00
Rémi Gaillard 59a1105fce // small fix on multishop checkboxes 2013-10-25 14:55:27 +02:00
Jerome Nadaud 81482df1e5 // Fix merge 2013-10-25 14:33:29 +02:00
djfm 3a749823bb // small fixes in English Email php templates 2013-10-25 12:29:39 +00:00
Jerome Nadaud 08baa71a05 // Fix on color field in list 2013-10-25 14:29:30 +02:00
Jerome Nadaud 8d1765f2df Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	controllers/admin/AdminCategoriesController.php
 2013-10-25 14:29:02 +02:00
Jerome Nadaud bff1ad8833 // Some changes to integrate uploader helper 2013-10-25 14:20:42 +02:00
Jerome Nadaud 52795495bd //Starting Uploader helper 2013-10-25 14:19:51 +02:00
Rémi Gaillard 3997543e7f // notice 2013-10-25 11:35:01 +02:00
Damien Metzger 087d0d8206 // Fields resizing 2013-10-25 11:25:13 +02:00
Damien Metzger d59c83e64d Merge pull request #888 from djfm/bootstrap 
[+] FO: New E-Mail templates!
 2013-10-25 02:18:04 -07:00
djfm dd009f133f // fixes in php mail templates 2013-10-25 09:13:24 +00:00
Kevin Granger ddf65f3b97 // toolbar nav fixs 2013-10-25 10:33:45 +02:00
Damien Metzger 0ca5a24e84 // Added field (bootstrap) size in helper form 2013-10-25 10:16:39 +02:00