Commit Graph

Select branches

Hide Pull Requests

1.5

1.6

bootstrap

carrierwizard

development

export_excel

ignore_stock_without_combination

master

patch-1

1.5.0.0

1.5.0.1

1.5.0.13

1.5.0.15

1.5.0.17

1.5.0.2

1.5.0.3

1.5.0.5

1.5.0.9

1.5.1.0

1.5.2.0

1.5.3.0

1.5.3.1

1.5.4.0

1.5.4.1

1.5.5.0

1.5.6.0

1.5.6.1

1.6.0.1

Mono Color

• ac112c38df // File imput improvement Jerome Nadaud 2013-10-18 17:32:29 +02:00
• 9dfecbb1b8 // Fixed addons url Damien Metzger 2013-10-18 17:04:49 +02:00
• 5a3d487e9f // sprintf again djfm 2013-10-18 14:31:48 +00:00
• d097679ea0 // improvements to producttooltip texts djfm 2013-10-18 14:16:17 +00:00
• b5b18b9d2b // use sprintf djfm 2013-10-18 13:55:30 +00:00
• 23abf712ec // missing files Rémi Gaillard 2013-10-18 15:53:05 +02:00
• d61d2b6627 // rm 1.4 controllers - RIP Rémi Gaillard 2013-10-18 15:50:12 +02:00
• 2e2151a1bb [-] CORE : error_get_last > PHP 5.1 gRoussac 2013-10-18 15:23:14 +02:00
• 06b80701c0 // labels djfm 2013-10-18 13:04:49 +00:00
• f31eb37f37 // improved translations in carriercompare djfm 2013-10-18 12:53:16 +00:00
• 3e687cd533 // improved some messages djfm 2013-10-18 12:17:23 +00:00
• 8a682081de // typo Rémi Gaillard 2013-10-18 12:17:51 +02:00
• 316f10a352 // Changed calibration of the dashboard chart Damien Metzger 2013-10-18 12:15:37 +02:00
• 1cd9ceca35 // Compare data on the chart Damien Metzger 2013-10-18 12:10:06 +02:00
• d6235bdacc // Cannot use analytics real time at this time since it is in private beta Damien Metzger 2013-10-18 10:54:03 +02:00
• 6747d3bbac [-] BO: Default country should be overriden in the context in multishop Rémi Gaillard 2013-10-18 10:23:06 +02:00
• 901f5aeb08 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap djfm 2013-10-18 08:20:32 +00:00
• 37656c2df9 // fixed improper English string for translation djfm 2013-10-18 08:20:20 +00:00
• e17c5f7c91 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-17 18:43:31 +02:00
• 9c07cb9302 // fix informations Kevin Granger 2013-10-17 18:43:15 +02:00
• b8273a13e6 // Rémi Gaillard 2013-10-17 18:30:22 +02:00
• fa22cff995 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-17 18:27:14 +02:00
• 088d23f8f9 // Add edit button to customer groups view list Jerome Nadaud 2013-10-17 18:27:00 +02:00
• d933466d04 // fixs add product informations Kevin Granger 2013-10-17 18:11:47 +02:00
• 7189aa9de9 // fix yes/no, alert success, cache clear button Kevin Granger 2013-10-17 17:33:55 +02:00
• 5a6fef2ee8 // Fixed typo Damien Metzger 2013-10-17 17:13:30 +02:00
• f77fa3d7c6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-17 16:00:10 +02:00
• 08525e5af4 // Fix missing commits !!!! Jerome Nadaud 2013-10-17 15:59:46 +02:00
• c43a7093ac // fix calendar Kevin Granger 2013-10-17 15:57:23 +02:00
• 205e00d4a7 // small fix Jerome Nadaud 2013-10-17 15:43:52 +02:00
• 7ae123227e // fix nav collapsed and clipping on page loading Kevin Granger 2013-10-17 15:39:53 +02:00
• cbf2e6b65b Merge pull request #848 from djfm/bootstrap Gregory Roussac 2013-10-17 06:36:20 -07:00
• 0393e6bc6d // Date Range Picker improvement Jerome Nadaud 2013-10-17 15:28:47 +02:00
• fc896f6a48 // correct use of translation functions djfm 2013-10-17 13:20:00 +00:00
• 1097bb56f9 // calendar Kevin Granger 2013-10-17 14:35:51 +02:00
• 3a38af9982 [-] FO : Could not redirect back to url in adress.php gRoussac 2013-10-17 14:16:54 +02:00
• 185c518d3d // Force cast on select filter Jerome Nadaud 2013-10-17 14:06:48 +02:00
• b391d833d3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-17 14:01:50 +02:00
• 9abb9a9b15 // removed version fix bootstrap, please report forms where margin could miss between fields (.row => .form-group) Kevin Granger 2013-10-17 14:01:26 +02:00
• dc43c0f7d3 // fix delete categories Kevin Granger 2013-10-17 13:50:14 +02:00
• 99f66e26d0 // Change datepicker class Jerome Nadaud 2013-10-17 13:24:46 +02:00
• 1f93d071c2 // Add transplant module button to page header toolbar Jerome Nadaud 2013-10-17 13:24:01 +02:00
• 6b1d69dd7d [-] FO : $back value twice escaped gRoussac 2013-10-17 12:18:23 +02:00
• 983b4dd617 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-17 11:41:10 +02:00
• cee6c2b2d6 // Add class to calendar.tpl Jerome Nadaud 2013-10-17 11:40:58 +02:00
• 193d3921fa // calendar date range picker compare Kevin Granger 2013-10-17 11:40:02 +02:00
• f9b115a2f8 // Date Range picker improvements Jerome Nadaud 2013-10-17 11:39:02 +02:00
• b67a78f9dd [-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC gRoussac 2013-10-15 14:53:44 +02:00
• eb14e25e2a // small fix for some order by on listing Rémi Gaillard 2013-10-17 11:33:05 +02:00
• d1ee6e6357 //small fix Vincent Augagneur 2013-10-17 11:27:30 +02:00
• ca1a03e81d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-17 11:22:17 +02:00
• 86ef9b5461 // calendar Kevin Granger 2013-10-17 11:22:03 +02:00
• f1ea9ba5b4 [-] BO : Fix bug #PSCFV-10709 rename root category with slashes in it gRoussac 2013-10-17 10:53:20 +02:00
• e4faa2bb75 [-] Core: Out of stock status should be setted after the first order history Rémi Gaillard 2013-10-17 10:28:14 +02:00
• 6ed7ffc647 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-17 09:37:37 +02:00
• 1f50e074f7 // New order button fix Jerome Nadaud 2013-10-17 09:37:19 +02:00
• fba95afdcc // Removed deprecated modules Damien Metzger 2013-10-17 09:36:45 +02:00
• 2f34af4646 //remove debug Vincent Augagneur 2013-10-17 09:26:47 +02:00
• 89d7b9ab96 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-17 09:24:59 +02:00
• 334d0a01bd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-17 09:24:09 +02:00
• a85b931765 // Adding compare options Jerome Nadaud 2013-10-16 19:07:23 +02:00
• 561c036240 // calendar Kevin Granger 2013-10-16 19:03:02 +02:00
• 6a7990869a // Range datepicker special compare actions Jerome Nadaud 2013-10-16 18:26:00 +02:00
• 6ed8afd1be // Fix names Jerome Nadaud 2013-10-16 16:36:05 +02:00
• c7f8b30e88 // Add compare system to daterange picker Jerome Nadaud 2013-10-16 16:30:41 +02:00
• 3ba5905042 [-] BO : Could not order by reserved words like 'key' gRoussac 2013-10-16 16:25:40 +02:00
• 37712f0193 //when a module is disabled, first option is enable Vincent Augagneur 2013-10-16 16:20:51 +02:00
• 22df963c72 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-10-16 16:09:51 +02:00
• c684fa13cb //module anchor now use instant search to filter module list Vincent Augagneur 2013-10-16 16:09:44 +02:00
• 7c096d9769 // small fix Rémi Gaillard 2013-10-16 15:48:52 +02:00
• 9492557284 // Removed administrator account from the installer, replaced by the superadministrator account Damien Metzger 2013-10-16 15:40:30 +02:00
• 8cfdad9def // Removed currently unused table in the dashboard Damien Metzger 2013-10-16 15:25:41 +02:00
• e493305c47 // merge problem Rémi Gaillard 2013-10-16 15:08:39 +02:00
• dfd00bb064 // Add stats date in install Jerome Nadaud 2013-10-16 14:44:49 +02:00
• f225fb5f2c // replaced class .row with class .form-group inside forms Kevin Granger 2013-10-16 14:19:26 +02:00
• 3e269f211c //blockadvertising now use boostrap design Vincent Augagneur 2013-10-16 14:15:22 +02:00
• d67be9431a //blocktopmenu now use bootstrap design Vincent Augagneur 2013-10-16 13:55:58 +02:00
• bc5b807a7b // graph update Kevin Granger 2013-10-16 12:18:27 +02:00
• f284777fc4 // Removed the trailing (Addons) after the name of the native modules Damien Metzger 2013-10-16 11:59:36 +02:00
• 7c5ff8073f // Code cleaning Damien Metzger 2013-10-16 11:47:47 +02:00
• 8f9fc10221 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap gRoussac 2013-10-16 11:45:31 +02:00
• 62aaf16d60 [*] FO : New hooks for home tabs gRoussac 2013-10-16 11:44:55 +02:00
• a51f41ca09 // Fixed dashboard best sellers Damien Metzger 2013-10-16 11:38:59 +02:00
• 2e65214c39 // manually merge of modules search Rémi Gaillard 2013-10-16 11:36:40 +02:00
• 486e6c1b66 // datepicker Kevin Granger 2013-10-16 10:55:47 +02:00
• 22fd1b84c4 Merge pull request #847 from MustangZhong/patch-1 Rémi Gaillard 2013-10-16 00:58:16 -07:00
• 04999f7624 // Small fixes Damien Metzger 2013-10-16 09:43:23 +02:00
• 476bf72bcc // Ooops Jerome Nadaud 2013-10-16 09:21:49 +02:00
• ad27dbe8d1 Update Cart.php MustangZhong 2013-10-16 10:14:14 +08:00
• 5abd93e619 [-] MO : Fix add truncate tag Sébastien 2013-10-15 21:38:10 +02:00
• be2ea4ca77 // login Kevin Granger 2013-10-15 20:04:19 +02:00
• 6ee538c710 // fix on ps_cleaner Rémi Gaillard 2013-10-15 19:53:59 +02:00
• dcbe3cb8e8 // Small datapicker fix Jerome Nadaud 2013-10-15 19:16:23 +02:00
• 3aa6976e31 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-15 19:14:51 +02:00
• 04e760512f // Fix month overlapping on datapicker Jerome Nadaud 2013-10-15 19:14:45 +02:00
• 1b8526cd05 // fix ajax on module list Rémi Gaillard 2013-10-15 18:35:04 +02:00
• 8dce01e633 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-15 18:20:40 +02:00
• aefd5947d2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-15 18:12:28 +02:00
• ed2e9bee70 // Small datepicker fix Jerome Nadaud 2013-10-15 18:12:01 +02:00
• 0e7a7f8be4 // replace fieldset with div for responsive table Kevin Granger 2013-10-15 18:09:53 +02:00