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

• 1a1f3de775 [-] BO: Fixbug #PSCFV-10671 - Double htmlentities. Jerome Nadaud 2013-10-11 13:33:31 +02:00
• cd5a308ad7 // login : tabindex + ux Kevin Granger 2013-10-11 12:28:01 +02:00
• c68101653d // Fixed tabs Damien Metzger 2013-10-11 12:10:09 +02:00
• b61528057a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-11 11:28:44 +02:00
• 40d4da04bb // cleaned admin-theme.js - added date range picker Kevin Granger 2013-10-11 11:18:27 +02:00
• 49cdfb56c6 // Fix class_index generation Damien Metzger 2013-10-11 11:15:14 +02:00
• f80b348d86 // Default vertical menu in BO Damien Metzger 2013-10-11 11:02:24 +02:00
• bb81e892a0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Rémi Gaillard 2013-10-11 10:58:23 +02:00
• 6c739ee2b3 Merge pull request #833 from djfm/development Gregory Roussac 2013-10-11 01:58:10 -07:00
• 49a9f0bcaa // unlink class_index tmp file if not rename Rémi Gaillard 2013-10-11 10:58:05 +02:00
• 5c66ed4791 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-10-11 10:51:50 +02:00
• d1a7ff50d5 [*] BO Module watermark: minimum transparency level is 1 and not 0. Fabio Chelly 2013-10-11 10:51:28 +02:00
• f95a4d74df // Added Google Plus to the BO footer Damien Metzger 2013-10-11 10:47:35 +02:00
• 28118cf33a // Code cleaning (backoffice javascript) Damien Metzger 2013-10-11 10:40:57 +02:00
• 7b02da5fdf // bad commit sorry gRoussac 2013-10-11 10:32:30 +02:00
• 36ca7bc508 [-] BO : AdminImport, fix Group searchByName gRoussac 2013-10-11 10:23:17 +02:00
• bb35a5b004 // multishop Rémi Gaillard 2013-10-11 10:04:10 +02:00
• 7f5f78a6f3 // Connected footer links and go-top Damien Metzger 2013-10-11 09:44:02 +02:00
• 075a911cee Merge pull request #830 from indesign47/patch-5 fchellypresta 2013-10-11 00:40:32 -07:00
• 6f878353a6 Merge pull request #831 from indesign47/patch-7 fchellypresta 2013-10-11 00:29:37 -07:00
• bb96c8754f [*] LO : set correct currency format for CHF djfm 2013-10-11 07:14:30 +00:00
• dc1632a8b0 [-] BO : Adminimport, id_specific key_price not defined gRoussac 2013-10-10 22:04:42 +02:00
• 544423ea1e // remove duplicate Kevin Granger 2013-10-10 20:05:58 +02:00
• a87bbf84b4 Merge pull request #825 from indesign47/patch-4 Gregory Roussac 2013-10-10 10:22:43 -07:00
• 447f1d4ba7 // quick fix customer view Kevin Granger 2013-10-10 19:04:25 +02:00
• 77551c03f5 // Fixed potential warning Damien Metzger 2013-10-10 18:48:45 +02:00
• 4505387046 // Try to fix regexp issues with some PHP configurations Damien Metzger 2013-10-10 18:41:26 +02:00
• 87417ed928 //producttooltip now use bootstrap design Vincent Augagneur 2013-10-10 18:07:08 +02:00
• 286084c42d Merge branch 'master' of https://github.com/DarkHack/PrestaShop into contrib/master gRoussac 2013-10-10 17:01:43 +02:00
• 5620992735 // fix dashboard Kevin Granger 2013-10-10 16:52:41 +02:00
• 7d717ea207 // fix css + kpi + dashboard Kevin Granger 2013-10-10 16:29:40 +02:00
• 22dcaf246c // Add icon and specific title to list Jerome Nadaud 2013-10-10 15:36:50 +02:00
• be3ccabe66 // footer + go to top + scroll y sidebar Kevin Granger 2013-10-10 15:10:51 +02:00
• 789911184b [-] BO : FixBug - Remove second email in recipient Jerome Nadaud 2013-10-10 15:04:32 +02:00
• 39a543188a [-] BO : Fix bug #PSCFV-10660, could not delete csv file on NT gRoussac 2013-10-10 14:54:12 +02:00
• 278dc32482 [*] BO: Add an option to autologout to the backoffice after 15 minutes Rémi Gaillard 2013-10-10 12:20:10 +02:00
• 9bae53a4d9 Merge pull request #828 from djfm/development Damien Metzger 2013-10-10 03:08:40 -07:00
• 6c35b20b02 // organize css Kevin Granger 2013-10-10 11:43:24 +02:00
• 819dac6622 // fixed name of gender 2 in English djfm 2013-10-10 09:36:05 +00:00
• 7fdf6e614f // don't display some field when an employee edit it's own profile Rémi Gaillard 2013-10-10 11:35:05 +02:00
• 067c78f868 // Fix notifications Jerome Nadaud 2013-10-10 11:02:33 +02:00
• 79b0a571c0 // Updated languages in the installer Damien Metzger 2013-10-10 09:47:10 +02:00
• fb9204ebd6 // Fixed module page Damien Metzger 2013-10-10 09:14:40 +02:00
• 8d1bca5542 Merge pull request #768 from enumag/patch-4 François Gaillard 2013-10-09 13:52:09 -07:00
• 9de6ec0379 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-09 20:28:15 +02:00
• 5b509c2c20 // login WIP Kevin Granger 2013-10-09 20:26:04 +02:00
• 6245b05b6e // Remove flags from language select Jerome Nadaud 2013-10-09 19:39:05 +02:00
• cade037e4f // Use display modal class for lite displaying Jerome Nadaud 2013-10-09 19:28:37 +02:00
• 5ec76a759a // Fix Dashboard toolbar Jerome Nadaud 2013-10-09 19:12:20 +02:00
• a5d1816336 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-09 18:59:32 +02:00
• 0e4cb5bcd5 // Form group bootstraping Jerome Nadaud 2013-10-09 18:59:20 +02:00
• 719e5f4faf Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-09 18:55:46 +02:00
• 74f12c23be // login WIP Kevin Granger 2013-10-09 18:54:13 +02:00
• 079534f039 // Fix header/footer override in admincontroller Damien Metzger 2013-10-09 18:51:20 +02:00
• cfbb0d872b // Add confirmation on category image delete Jerome Nadaud 2013-10-09 18:47:33 +02:00
• 2d9a54c19e // Remove button icon class Jerome Nadaud 2013-10-09 18:43:22 +02:00
• eae76eb63e // Pagination bootstraping Jerome Nadaud 2013-10-09 18:36:19 +02:00
• 246340b78c [*] BO Module search: Enter key is now disabled in quick search field (field is correctly aligned) Fabio Chelly 2013-10-09 18:33:41 +02:00
• d4bf765dd6 // Pagination bootstraping Jerome Nadaud 2013-10-09 18:31:51 +02:00
• 75ffa8c4f8 [*] BO Module search: Enter key is now disabled in quick search field Fabio Chelly 2013-10-09 18:30:09 +02:00
• 1939b8026b // CSS fix Damien Metzger 2013-10-09 18:06:42 +02:00
• 84711bc386 // added .process-icon-save-and-preview Kevin Granger 2013-10-09 17:57:02 +02:00
• f6bbb6e241 // Fix duplicate invoice delivery number Jerome Nadaud 2013-10-09 17:43:43 +02:00
• 2c7ed00b39 // pagination Kevin Granger 2013-10-09 17:21:53 +02:00
• fee92eecdd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Rémi Gaillard 2013-10-09 16:58:13 +02:00
• edddac8a0c // add colors on some controllers Rémi Gaillard 2013-10-09 16:47:47 +02:00
• 9b24cca088 // Fixed category breadcrumb Damien Metzger 2013-10-09 16:44:47 +02:00
• eadbefedae Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-09 16:42:44 +02:00
• e1ff774fcd // Restoring toolbar.tpl file for retrocompatibility Jerome Nadaud 2013-10-09 16:42:13 +02:00
• 68d84892c7 // remove self:: Jerome Nadaud 2013-10-09 16:40:09 +02:00
• 2feb5dd8d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-10-09 16:31:09 +02:00
• d0a4636966 [-] BO : FixBug #PSCFV-9957 - Duplicate order invoice number Jerome Nadaud 2013-10-09 16:29:15 +02:00
• 477973a43e //carrier wizard button good place and order Vincent Augagneur 2013-10-09 16:24:25 +02:00
• e7d7e2f1ab // Fixed CSS hover on KPIs Damien Metzger 2013-10-09 15:46:06 +02:00
• 1870dd4dd2 // Added order state color in order::getHistory() Damien Metzger 2013-10-09 15:33:46 +02:00
• d796d0012e [-] BO : fixed bug #PSCFV-10637 PS_CARRIER_DEFAULT is not updated after edit default carrier Vincent Augagneur 2013-10-09 15:25:02 +02:00
• c8347cbc59 // Restore save button on header toolbar Jerome Nadaud 2013-10-09 15:24:19 +02:00
• f5452aea66 // Products fix Jerome Nadaud 2013-10-09 15:23:44 +02:00
• 61f3c61e2a // Some fix Jerome Nadaud 2013-10-09 15:22:27 +02:00
• 81677cff44 // Toolbar improvement Jerome Nadaud 2013-10-09 15:18:54 +02:00
• a2371067bf // CSS fixes Damien Metzger 2013-10-09 15:11:04 +02:00
• df4ae671a2 Merge pull request #826 from gouz/patch-4 Gregory Roussac 2013-10-09 06:02:52 -07:00
• 9fcb039068 // A few CSS fixes Damien Metzger 2013-10-09 14:33:25 +02:00
• 6f1cdba40e // typo Rémi Gaillard 2013-10-09 14:56:41 +02:00
• 4242e485c7 // Bootstrap design on getPath Jerome Nadaud 2013-10-09 14:25:46 +02:00
• a1ced4ee32 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-09 14:07:17 +02:00
• 3cca8206b9 // Fix missing unwanted div Jerome Nadaud 2013-10-09 14:06:22 +02:00
• df97566018 [-] BO : AdminImport no default value for separators gRoussac 2013-10-09 13:57:36 +02:00
• 338efcad7f [-] CORE : $smarty->compile_check is not set to false, thanks @prestamodule gRoussac 2013-10-09 12:14:49 +02:00
• ced6554133 //loyalty module now use bootstrap design Vincent Augagneur 2013-10-09 11:19:32 +02:00
• c982d08b68 // Removed useless link to the current page in the breadcrumb Damien Metzger 2013-10-09 11:12:21 +02:00
• 3b677092bf [*] FO: You can now choose the anchor separator for attributes Rémi Gaillard 2013-10-09 11:01:18 +02:00
• 623b8c7960 // Added expense management to profitability KPI Damien Metzger 2013-10-09 10:54:59 +02:00
• e16676efaa //added prefix & suffix on helper form Vincent Augagneur 2013-10-09 10:51:04 +02:00
• 7a6dea4964 [~] BO : Export DeliverySlip Sylvain Gougouzian 2013-10-09 10:39:24 +02:00
• 38143e1245 // Fixed stats bug (bad id for ajax request) Damien Metzger 2013-10-09 10:05:12 +02:00
• 8c9dffd854 // Add pagination to states list Jerome Nadaud 2013-10-09 10:03:27 +02:00
• 9bdde5c5c0 // Add pagination to countries list Jerome Nadaud 2013-10-09 09:59:49 +02:00
• 18d909c05d // Add cache control to ajax request for ipad Jerome Nadaud 2013-10-09 09:55:17 +02:00
• d448891065 // Add new country button to countries controller Jerome Nadaud 2013-10-09 09:51:25 +02:00