dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,706 Commits 9 Branches 19 Tags
38f034f4e01866d423d7353e593073c1dd1fbd1c
Commit Graph
19706 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud 38f034f4e0 // Remove header and footer display when ajax 2013-10-28 17:10:53 +01:00
Jerome Nadaud a466c6f5f7 // Add tagify system to product information 2013-10-28 16:32:17 +01:00
Kevin Granger 3798adff2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-28 16:19:02 +01:00
Kevin Granger d523d739e7 // dashboard date range picker wip 2013-10-28 16:18:43 +01:00
Jerome Nadaud 5760718b85 // Add Save button to page header toolbar 2013-10-28 15:55:58 +01:00
Rémi Gaillard 1454a0d26a // search type in BO 2013-10-28 15:32:26 +01:00
Damien Metzger 0aea146a4c // Code cleaning stats modules 2013-10-28 13:39:39 +01:00
Damien Metzger 9c54dcce66 // Fixed default stats graph engine 2013-10-28 12:15:35 +01:00
Damien Metzger 08732eda50 // Fixed default selection in the stats submenu 2013-10-28 12:08:46 +01:00
Damien Metzger b6799d4f2f [*] BO : download attachments directly from the list 2013-10-28 11:57:40 +01:00
Damien Metzger 79b7521cac Merge pull request #892 from djfm/bootstrap 
// small fixes in English Email php templates
 2013-10-28 02:21:50 -07:00
Kevin Granger 7126397bfe // fix scroll vertical nav 2013-10-28 10:13:35 +01:00
djfm 4f8d153469 // fixed links in new English mails 2013-10-28 08:57:59 +00:00
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
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
Jerome Nadaud 5ea880b793 // XHTML norm 2013-10-25 17:37:08 +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
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
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
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
Jerome Nadaud 139ee8f62d // Move back button to left 2013-10-25 09:29:42 +02:00
Jerome Nadaud 3850cc94d5 // Align save button to right 2013-10-25 09:18:00 +02:00