Commit Graph
20949 Commits
Author SHA1 Message Date
gRoussac 2e2151a1bb [-] CORE : error_get_last > PHP 5.1 2013-10-18 15:29: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
Rémi Gaillard 8a682081de // typo 2013-10-18 12:17:51 +02: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
Rémi Gaillard 6747d3bbac [-] BO: Default country should be overriden in the context in multishop 2013-10-18 10:23:06 +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
Rémi Gaillard b8273a13e6 // 2013-10-17 18:30:22 +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
gRoussac 3a38af9982 [-] FO : Could not redirect back to url in adress.php 2013-10-17 14:16:54 +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
gRoussac 6b1d69dd7d [-] FO : $back value twice escaped 2013-10-17 12:18:23 +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
Jerome Nadaud f9b115a2f8 // Date Range picker improvements 2013-10-17 11:39:02 +02:00
gRoussac b67a78f9dd [-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC 2013-10-17 11:37:45 +02:00
Rémi Gaillard eb14e25e2a // small fix for some order by on listing 2013-10-17 11:33:05 +02:00
Vincent Augagneur d1ee6e6357 //small fix 2013-10-17 11:27:30 +02:00
Kevin Granger ca1a03e81d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 11:22:17 +02:00
Kevin Granger 86ef9b5461 // calendar 2013-10-17 11:22:03 +02:00
gRoussac f1ea9ba5b4 [-] BO : Fix bug #PSCFV-10709 rename root category with slashes in it 2013-10-17 10:53:20 +02:00
Rémi Gaillard e4faa2bb75 [-] Core: Out of stock status should be setted after the first order history 2013-10-17 10:28:14 +02:00
Jerome Nadaud 6ed7ffc647 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-17 09:37:37 +02:00
Jerome Nadaud 1f50e074f7 // New order button fix 2013-10-17 09:37:19 +02:00
Damien Metzger fba95afdcc // Removed deprecated modules 2013-10-17 09:37:01 +02:00