Commit Graph

553 Commits

Author SHA1 Message Date
Johannes Meyer c7d5e1456a Navigation: Allow basic wildcard to share navigation items 2015-10-01 13:56:28 +02:00
Eric Lippmann 3cd3a7891c Revert "Rename application/VERSION to application/GITCOMMIT"
This reverts commit feb27b8a02.
2015-09-30 18:37:48 +02:00
Johannes Meyer 142851ede7 Merge branch 'master' into feature/show-icinga-web-2-s-version-in-the-frontend-9247 2015-09-30 15:54:22 +02:00
Johannes Meyer a2827e0dd9 Web: It's not necessary anymore to set a key column
refs #10246
2015-09-30 11:47:22 +02:00
Johannes Meyer bbd68457ae Config: Use DIRECTORY_SEPARATOR in static method navigation()
refs #10246
2015-09-30 11:41:49 +02:00
Johannes Meyer 633dca6b76 Web: Load the new config files for shared items
refs #10246
2015-09-30 11:38:51 +02:00
Johannes Meyer befbc6cd6a Config: Add static method navigation()
refs #10246
2015-09-30 11:30:38 +02:00
Johannes Meyer b4bcfa4e08 NavigationController: Register navigation item types differently
refs #10246
2015-09-29 17:12:57 +02:00
Johannes Meyer a55cced039 Merge branch 'master' into feature/custom-menu-items-5600
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-09-25 14:12:43 +02:00
Alexander A. Klimov 8dc9928cb3 IniParser::parseIniFile(): return a Config instance
refs #10150
2015-09-25 12:04:13 +02:00
Alexander A. Klimov e2d6089ff3 Make Version::get() failsafe
refs #9247
2015-09-24 12:25:02 +02:00
Alexander A. Klimov feb27b8a02 Rename application/VERSION to application/GITCOMMIT
refs #9247
2015-09-24 11:35:18 +02:00
Alexander A. Klimov 3e99adbe63 Version::get(): first try to parse application/VERSION
refs #9247
2015-09-24 11:05:21 +02:00
Alexander A. Klimov cc4a47506f Fetch version from constant
refs #9247
2015-09-24 10:53:33 +02:00
Alexander A. Klimov 7c3b46fefa Make regex less complicated 2015-09-23 17:48:30 +02:00
Alexander A. Klimov d6cf6313b9 Split complex if statements 2015-09-23 15:53:10 +02:00
Alexander A. Klimov abcdc5adb1 Fetch Git commit ID from .git/HEAD if available
refs #9247
2015-09-23 15:06:02 +02:00
Alexander A. Klimov 626c3494e4 Config::fromIni(): use IniParser::parseIniFile() instead of parse_ini_file()
refs #10150
2015-09-22 14:50:49 +02:00
Johannes Meyer 0ec3610349 Web: Properly load shared menu items
refs #5600
2015-09-17 13:40:40 +02:00
Eric Lippmann f46504554e lib: Check for mssql extension too in Platform::hasMssqlSupport()
refs #9683
2015-09-17 11:48:25 +02:00
Johannes Meyer 8c17364780 Late translate a module's menu section labels
refs #5600
2015-09-16 14:36:35 +02:00
Johannes Meyer 8b7a1ce28f Late translate a module's dashboard-pane/dashlet labels
refs #5600
2015-09-16 14:29:33 +02:00
Johannes Meyer bbadb0b75c Add support for no-op translations
refs #5600
2015-09-16 14:16:40 +02:00
Johannes Meyer 0ca6e04a5a Module: Allow to pass a label for a custom navigation item type
refs #5600
2015-09-16 13:51:35 +02:00
Johannes Meyer ccae7c4d0d Module: Allow to define a dashboard pane's properties
Since dashboards are now alphabetically sorted as well, we need some way
to affect this as the old behaviour was to sort them as they were registered

refs #5600
2015-09-15 13:54:53 +02:00
Johannes Meyer 1d6ad6df21 Merge branch 'master' into feature/custom-menu-items-5600
Conflicts:
	modules/monitoring/configuration.php
2015-09-15 13:31:30 +02:00
Eric Lippmann d52bb7d92a lib: Add Platform::hasLdapSupport() and Platform::hasDatabaseSupport()
refs #9683
2015-09-07 16:43:41 +02:00
Eric Lippmann 358f1750fb lib: Add Platform::hasOciSupport()
refs #9683
2015-09-07 16:34:10 +02:00
Eric Lippmann bba1838c7d lib: Add Platform::hasOracleSupport()
refs #9683
2015-09-07 16:34:10 +02:00
Eric Lippmann 9f3ef5cc8d lib: Add Platform::hasMssqlSupport()
refs #9683
2015-09-07 16:34:04 +02:00
Johannes Meyer b1e3519353 Add class NavigationController (WIP)
refs #5600
2015-09-07 13:55:19 +02:00
Johannes Meyer 27f3a8f152 Web: Add method getSharedNavigation()
refs #5600
2015-09-07 13:22:02 +02:00
Eric Lippmann 0f8c28d749 Merge branch 'master' into feature/api-9606 2015-09-07 11:33:44 +02:00
Johannes Meyer 1be6dc0553 Module.php: Allow modules to provide configurable navigation items
refs #5600
2015-09-07 11:06:11 +02:00
Johannes Meyer 95a61e89a9 Module: Fix how dashlets are loaded
refs #5600
2015-09-04 15:51:33 +02:00
Johannes Meyer 70a48643c1 Add class DashboardContainer
refs #5600
2015-09-04 15:25:19 +02:00
Johannes Meyer 5c2619dcb5 Add class NavigationItemContainer
refs #5600
2015-09-04 15:04:29 +02:00
Johannes Meyer ab23b56973 Web: Load module menus
refs #5600
2015-09-04 13:55:49 +02:00
Johannes Meyer 27a6b5bb75 Module: Utilize MenuItemContainer instead of Menu
refs #5600
2015-09-04 13:54:53 +02:00
Johannes Meyer 8643fec309 Add class MenuItemContainer
resf #5600
2015-09-04 13:54:23 +02:00
Johannes Meyer 294f9022f2 Use the new navigation to render the menu
refs #5600
2015-09-04 10:53:01 +02:00
Emil Vikström e3ea0e5949 Use yellow for warning logs in ANSI CLI
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-09-01 22:55:42 +02:00
Eric Lippmann c0eb0cbe6a modules: Tell the dispatcher that the static controller is to be found in the default module
refs #5786
2015-08-28 13:13:07 +02:00
Eric Lippmann bcc02f50ec lib: Optimize imports in webrouter 2015-08-28 09:42:49 +02:00
Eric Lippmann 4070f6c75b Merge branch 'master' into feature/namespaced-controllers-5786 2015-08-27 15:05:44 +02:00
Eric Lippmann ba09b02f5c lib: Fix PHPDoc of Version::get() 2015-08-27 13:06:49 +02:00
Eric Lippmann df66d0b0f5 lib: Add PHPDoc to Version 2015-08-27 13:06:31 +02:00
Eric Lippmann c294283636 Merge branch 'bugfix/service-grid-grouping-postgres-9333'
Conflicts:
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php

fixes #9333
fixes #9538
2015-08-27 12:58:49 +02:00
Eric Lippmann 96fb3b5d4b Merge branch 'master' into feature/api-9606 2015-08-25 09:25:59 +02:00
Eric Lippmann a20eef50e1 Set up the user backend factory before setting up the user
refs #9606
2015-08-24 15:37:55 +02:00