Commit Graph

19510 Commits

Author SHA1 Message Date
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
Jerome Nadaud 1c1fb5fb5c // Update image fix 2013-10-18 17:59:45 +02:00
Jerome Nadaud ed2546d07c // Define language dir constant 2013-10-18 17:59:34 +02:00
Jerome Nadaud 1bee0087c0 // Update image fix 2013-10-18 17:50:36 +02:00
Jerome Nadaud 964f546b0b // Update image when updated 2013-10-18 17:41:36 +02:00
Jerome Nadaud 0599d4f056 // Fix Localization page header title 2013-10-18 17:41:10 +02:00
Jerome Nadaud 785fe814bc // Define Order state dir constante 2013-10-18 17:40:49 +02:00
Jerome Nadaud ac112c38df // File imput improvement 2013-10-18 17:32:29 +02:00
Damien Metzger 9dfecbb1b8 // Fixed addons url 2013-10-18 17:05:04 +02:00
djfm 5a3d487e9f // sprintf again 2013-10-18 14:31:48 +00:00
djfm d097679ea0 // improvements to producttooltip texts 2013-10-18 14:16:17 +00:00
djfm b5b18b9d2b // use sprintf 2013-10-18 13:55:30 +00:00
Rémi Gaillard 23abf712ec // missing files 2013-10-18 15:53:05 +02:00
Rémi Gaillard d61d2b6627 // rm 1.4 controllers - RIP 2013-10-18 15:50:12 +02:00
djfm 06b80701c0 // labels 2013-10-18 13:04:49 +00:00
djfm f31eb37f37 // improved translations in carriercompare 2013-10-18 12:53:16 +00:00
djfm 3e687cd533 // improved some messages 2013-10-18 12:17:23 +00:00
Damien Metzger 316f10a352 // Changed calibration of the dashboard chart 2013-10-18 12:15:37 +02:00
Damien Metzger 1cd9ceca35 // Compare data on the chart 2013-10-18 12:10:06 +02:00
Damien Metzger d6235bdacc // Cannot use analytics real time at this time since it is in private beta 2013-10-18 10:54:03 +02:00
djfm 901f5aeb08 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 08:20:32 +00:00
djfm 37656c2df9 // fixed improper English string for translation 2013-10-18 08:20:20 +00:00
Kevin Granger e17c5f7c91 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 18:43:31 +02:00
Kevin Granger 9c07cb9302 // fix informations 2013-10-17 18:43:15 +02:00
Jerome Nadaud fa22cff995 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 18:27:14 +02:00
Jerome Nadaud 088d23f8f9 // Add edit button to customer groups view list 2013-10-17 18:27:00 +02:00
Kevin Granger d933466d04 // fixs add product informations 2013-10-17 18:11:47 +02:00
Kevin Granger 7189aa9de9 // fix yes/no, alert success, cache clear button 2013-10-17 17:33:55 +02:00
Damien Metzger 5a6fef2ee8 // Fixed typo 2013-10-17 17:13:30 +02:00
Jerome Nadaud f77fa3d7c6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 16:00:10 +02:00
Jerome Nadaud 08525e5af4 // Fix missing commits !!!! 2013-10-17 15:59:46 +02:00
Kevin Granger c43a7093ac // fix calendar 2013-10-17 15:57:23 +02:00
Jerome Nadaud 205e00d4a7 // small fix 2013-10-17 15:43:52 +02:00
Kevin Granger 7ae123227e // fix nav collapsed and clipping on page loading 2013-10-17 15:39:53 +02:00
Gregory Roussac cbf2e6b65b Merge pull request #848 from djfm/bootstrap
// correct use of translation functions
2013-10-17 06:36:20 -07:00
Jerome Nadaud 0393e6bc6d // Date Range Picker improvement 2013-10-17 15:28:47 +02:00
djfm fc896f6a48 // correct use of translation functions 2013-10-17 13:20:00 +00:00
Kevin Granger 1097bb56f9 // calendar 2013-10-17 14:35:51 +02:00
Jerome Nadaud 185c518d3d // Force cast on select filter 2013-10-17 14:06:48 +02:00
Kevin Granger b391d833d3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 14:01:50 +02:00
Kevin Granger 9abb9a9b15 // removed version fix bootstrap, please report forms where margin could miss between fields (.row => .form-group) 2013-10-17 14:01:26 +02:00
Kevin Granger dc43c0f7d3 // fix delete categories 2013-10-17 13:50:14 +02:00
Jerome Nadaud 99f66e26d0 // Change datepicker class 2013-10-17 13:24:46 +02:00
Jerome Nadaud 1f93d071c2 // Add transplant module button to page header toolbar 2013-10-17 13:24:01 +02:00
Jerome Nadaud 983b4dd617 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 11:41:10 +02:00
Jerome Nadaud cee6c2b2d6 // Add class to calendar.tpl 2013-10-17 11:40:58 +02:00
Kevin Granger 193d3921fa // calendar date range picker compare 2013-10-17 11:40:02 +02:00