Commit Graph

4011 Commits

Author SHA1 Message Date
Damien Metzger
d2ff076eb1 // Removed useless alert 2013-10-24 16:43:41 +02:00
Rémi Gaillard
691e45a168 // delete useless file 2013-10-24 15:23:03 +02:00
Rémi Gaillard
4bfd8dee11 // note updated by ajax in admincustomers should be url encoded 2013-10-24 11:51:48 +02:00
Damien Metzger
e17dd1fdde // theme installation 2013-10-24 09:49:46 +02:00
Kevin Granger
7a8cdf3913 // admin create order WIP 2013-10-23 18:54:44 +02:00
Sarah Lorenzini
7a23c169d6 // update css mail template 2013-10-23 17:58:28 +02:00
Jerome Nadaud
16dfea95e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-23 16:49:05 +02:00
Jerome Nadaud
a27f8bc999 // Fix Stats datepicker 2013-10-23 16:48:55 +02:00
Damien Metzger
9930c375c7 // Dashgoals :) 2013-10-23 15:37:43 +02:00
Jerome Nadaud
ff3455be78 // Products combinations form bootstraping 2013-10-23 15:03:28 +02:00
Jerome Nadaud
c30d103410 // Check if exist children opt. in employees 2013-10-23 14:49:22 +02:00
Jerome Nadaud
0bf6410773 //Fix save and stay combinations problem 2013-10-23 12:10:36 +02:00
Rémi Gaillard
8662ef12b4 // small changes on orders view 2013-10-23 11:59:28 +02:00
Kevin Granger
5ee716ff9e // fix admin edit countries 2013-10-23 11:18:31 +02:00
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
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
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
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
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