Commit Graph

2946 Commits

Author SHA1 Message Date
Jerome Nadaud 45ea4aefad // Fix Combinations ajax problem 2013-10-23 10:50:18 +02:00
Damien Metzger 9d3f3d1876 // Fixed warning in admin customer tpl 2013-10-23 09:32:48 +02:00
Gregory Roussac 5bb4d48ddd Merge pull request #870 from djfm/development
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-22 10:17:11 -07:00
Jerome Nadaud 766d0e01f4 // Adding reset button to form template 2013-10-22 18:00:39 +02:00
Jerome Nadaud 67fc91e2c9 // Categories thumbnails 2013-10-22 17:43:10 +02:00
Sarah Lorenzini 32a85007df // update mail templates 2013-10-22 15:45:33 +02:00
Vincent Augagneur fea7cd5983 //helper list must be wrapped by a form even if it's a simple header 2013-10-22 14:48:44 +02:00
Damien Metzger a4eeff4cd7 // Shortcuts for chart selection 2013-10-22 14:07:19 +02:00
Jerome Nadaud a7c7bc68a3 // Fix products form content 2013-10-22 13:38:47 +02:00
Jerome Nadaud c307eb7ece // Date range picker fix 2013-10-22 12:29:17 +02:00
Jerome Nadaud b6d6336e26 // Add date subtitle 2013-10-22 12:12:41 +02:00
Jerome Nadaud d8d9436f51 // add date change trigger 2013-10-22 11:35:24 +02:00
Jerome Nadaud 73e9d966a6 // list bulk actions fix 2013-10-22 11:24:50 +02:00
Kevin Granger aa95454c4e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/images/content.tpl
2013-10-22 10:07:03 +02:00
Kevin Granger eb82297f45 // small fixs 2013-10-22 10:04:45 +02:00
gRoussac 2aa52356ad [-] BO : Fix bug #PSCFV-10607 one upload name 2013-10-22 09:39:59 +02:00
Jerome Nadaud 3ba337f19a // Image preference bootstraping 2013-10-22 09:25:05 +02:00
Jerome Nadaud fb167d94f9 // Remove duplicate class 2013-10-21 19:13:19 +02:00
Kevin Granger fadbc4c250 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 19:00:18 +02:00
Kevin Granger c89f6c1adb // css fix 2013-10-21 18:58:23 +02:00
Jerome Nadaud f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02:00
Jerome Nadaud 766e409476 // Wrong end block position 2013-10-21 18:34:03 +02:00
Damien Metzger bf6c57063c // Fixed dashboard style 2013-10-21 18:18:48 +02:00
Kevin Granger 3ae1f68b3b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 18:03:15 +02:00
Kevin Granger 2e13013657 // search field WIP 2013-10-21 18:03:00 +02:00
Jerome Nadaud d6ad300625 // List pagination improvements 2013-10-21 17:59:48 +02:00
Damien Metzger e7b901ce34 // Smaller update notification 2013-10-21 17:24:34 +02:00
Jerome Nadaud 5f75439a6b // Date range picker improvements 2013-10-21 17:07:57 +02:00
gRoussac 16ffbd8ee5 // norms 2013-10-21 16:46:22 +02:00
gRoussac 61884ec223 // norms 2013-10-21 16:31:56 +02:00
Jerome Nadaud 7fbf6c7de0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 13:45:50 +02:00
Jerome Nadaud e53e63c257 // Add Back button to list footer 2013-10-21 13:45:39 +02:00
gRoussac 7c7fe5dc0b // small change 2013-10-21 12:39:48 +02:00
Jerome Nadaud 53a7b75d7a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-21 12:36:02 +02:00
Jerome Nadaud 101df4c0b9 // Add check list filters value 2013-10-21 12:35:57 +02:00
gRoussac 15cd0b9fbc [-] BO : Report of https://github.com/PrestaShop/PrestaShop/commit/fd86a29c5c369ec5da0f91bbe97c584a00d02d0d 2013-10-21 12:21:49 +02:00
Kevin Granger 957f9f0467 // categories group 2013-10-21 12:21:35 +02:00
Jerome Nadaud 9c4b975cfc //Module uploader bootstraping 2013-10-21 11:31:50 +02:00
Jerome Nadaud 81042db718 // CSV import uploader bootstraping 2013-10-21 11:24:56 +02:00
Kevin Granger a5ca6f11a7 // css email 2013-10-21 09:51:46 +02:00
Vincent Augagneur fd86a29c5c //small fix 2013-10-21 09:50:20 +02:00
Kevin Granger 067eecdc70 // small fix 2013-10-18 19:07:03 +02:00
Kevin Granger 04b4e548f3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 18:38:17 +02:00
Kevin Granger 5f52a9e171 // fix products 2013-10-18 18:38:02 +02:00
Damien Metzger d1a2c33322 Merge pull request #849 from djfm/bootstrap
// Translations fix
2013-10-18 09:35:20 -07:00
Jerome Nadaud 6c37efdb6a // Categories image upload bootstraping 2013-10-18 18:33:32 +02:00
Jerome Nadaud ff81667b5c // Image thumnail fix 2013-10-18 18:28:57 +02:00
Jerome Nadaud 667353d43f // Store contacts bootstraping 2013-10-18 18:24:21 +02:00
PrestanceDesign 6965bb29c1 [*] BO : Adding a title tag to display the module name on hover like PS 1.4 2013-10-18 18:20:15 +02:00
Jerome Nadaud ac112c38df // File imput improvement 2013-10-18 17:32:29 +02:00