6104 Commits

Author SHA1 Message Date
Eric Lippmann
77cd48e6fe We do not use the @package tag 2015-03-12 18:11:33 +01:00
Eric Lippmann
6c5a6215ef Render search results based on their priority
refs #8668
2015-03-12 18:11:06 +01:00
Eric Lippmann
3970d7dec2 Lower doc modules search priority
refs #8668
2015-03-12 18:09:43 +01:00
Eric Lippmann
c1d5231619 Add priority param to Module::provideSearchUrl()
refs #8668
2015-03-12 17:55:29 +01:00
Eric Lippmann
5749ff72b1 Fix typo in configuration.php 2015-03-12 16:48:29 +01:00
Eric Lippmann
29d5fd351b Merge branch 'bugfix/logout-external-8626'
fixes #8626
2015-03-12 16:47:49 +01:00
Eric Lippmann
be041435d3 Merge branch 'bugfix/unnecessary-joins-8614'
fixes #8614
2015-03-12 16:47:10 +01:00
Marius Hein
31d0641658 Merge branch 'feature/custom-notification-command-8644'
resolves #8644
2015-03-12 16:46:10 +01:00
Marius Hein
cb28f00c4d Merge branch 'master' into feature/custom-notification-command-8644 2015-03-12 16:45:57 +01:00
Marius Hein
ddd280d57b Fix permission send-custom-notification
refs #8644
2015-03-12 16:40:32 +01:00
Eric Lippmann
53626ccfeb Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-12 16:40:16 +01:00
Eric Lippmann
7156bd7dfb Fetch object comments by host_name and service_description
refs #8614
2015-03-12 16:39:20 +01:00
Eric Lippmann
29b5e4fd43 Add host_name and service_description columns w/o collation to the comment query
refs #8614
2015-03-12 16:38:32 +01:00
Eric Lippmann
112f8eb2f9 Remove COLLATE from host_name and service_description in the Contactgroup query
refs #8614
refs #8613
2015-03-12 16:33:28 +01:00
Eric Lippmann
7212434856 Remove COLLATE from host_name and service_description in the Contact query
refs #8614
refs #8613
2015-03-12 16:32:05 +01:00
Marius Hein
df3d81e181 SendCustomNotificationCommand: Update phpdoc strings
refs #8644
2015-03-12 16:30:11 +01:00
Johannes Meyer
b37757ca6e Disable the LdapDiscoveryConfirmPage
As long as the discovery code does not report multiple results, as it should,
actually, it's useless to demand the user to confirm the result.

resolves #8602
refs #8725
refs #8708
2015-03-12 16:14:58 +01:00
Eric Lippmann
8b7250bfa6 JS: Focus the element referenced by the anchor on anchor navigation ...
... instead of looking for any heading.
2015-03-12 16:08:47 +01:00
Eric Lippmann
77b99552a4 Add JSDoc to Icinga.Events.prototype.handleAnchor() 2015-03-12 16:08:47 +01:00
Eric Lippmann
b74ef2527a CSS: Remove .sort-box ...
... because we don't use it
2015-03-12 16:08:47 +01:00
Eric Lippmann
8563d5ed3f PHPDoc: Use @var instead of @type
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
2015-03-12 16:08:47 +01:00
Eric Lippmann
6dc48fe9d3 CSS: Remove .skip-links-inline ...
... because we don't use it.
2015-03-12 16:08:47 +01:00
Eric Lippmann
90971f2caf Revert "Merge branch 'feature/organize-headings-7976'"
This reverts commit ea2a17a76c4c4b1a3df13c44016a009694026e00, reversing
changes made to e72de8dfe1456cbb50852d8b7910e0013cab3aaa.

refs #7976
fixes #8647
2015-03-12 16:08:34 +01:00
Marius Hein
ddc8dd5d4c Add command send custom notification to monitoring module
refs #8644
2015-03-12 16:08:22 +01:00
Eric Lippmann
093dfd627e Security: Hide config menu items if the user lacks the required permission
refs #8720
2015-03-12 15:45:33 +01:00
Eric Lippmann
da16bfcef3 Security: Use PermittedMenuItemFilter in the MenuRenderer
refs #8720
2015-03-12 15:45:30 +01:00
Eric Lippmann
e6a60e214c lib: Add PermittedMenuItemFilter ...
... for iterating over menu items the user is allowed to display

refs #8720
2015-03-12 15:45:27 +01:00
Eric Lippmann
7f010102f6 Add wildcard support to the permission passed to User::can()
refs #8720
2015-03-12 15:45:25 +01:00
Eric Lippmann
33112f6a18 Use {@inheritdoc} in the RoleForm
refs #8720
2015-03-12 15:45:22 +01:00
Eric Lippmann
517437eb1b Security: Add wildcard permissions to the config/ tree
refs #8720
2015-03-12 15:45:17 +01:00
Eric Lippmann
195fe6f04b Security: Rename system/config/modules to config/modules
Module config permission and application config permission have to be separeted.
Application config related permissions were added beneath config/application and module
related config permissions will be config/modules for now.

refs #8720
2015-03-12 15:45:14 +01:00
Eric Lippmann
f6e9551235 Security: Rename system/config/roles to config/application/roles
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
2015-03-12 15:45:10 +01:00
Eric Lippmann
08abbda152 Security: Rename system/config/resources to config/application/resources
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
2015-03-12 15:45:07 +01:00
Eric Lippmann
a4e81c320a Security: Rename system/config/authentication to config/application/authentication
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
2015-03-12 15:45:04 +01:00
Eric Lippmann
956bc3c07a Security: Rename system/config/application to config/application/general
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
2015-03-12 15:44:58 +01:00
Eric Lippmann
0c30356d52 Add Menu::getPermission() and Menu::setPermission()
Those two functions are required for filtering menu items based on a user's grants.

refs #8720
2015-03-12 15:44:43 +01:00
Johannes Meyer
8295d6d9b0 Do not require the `connection' directive when creating a LDAP resource 2015-03-12 15:36:52 +01:00
Johannes Meyer
7a4403f5a5 Merge branch 'feature/ldap-ssl-and-tls-support-7771'
resolves #7771
2015-03-12 15:19:34 +01:00
Johannes Meyer
359a5f54c3 Merge branch 'master' into feature/ldap-ssl-and-tls-support-7771 2015-03-12 15:18:53 +01:00
Johannes Meyer
5de5a65df0 Do not suppress errors when a LDAP capability query fails 2015-03-12 15:18:00 +01:00
Johannes Meyer
1b440a4f1b Make SSL/TLS configurable for LDAP resources
refs #7771
2015-03-12 15:17:19 +01:00
Johannes Meyer
4a982a382e Show exception message when LDAP connection validation fails, if any 2015-03-12 14:45:16 +01:00
Thomas Gelf
5270acd645 events.js: correctly detect form target container
This is for forms with no submit button.

fixes #8710
2015-03-12 11:30:21 +01:00
Thomas Gelf
3af36015ff dashboard: do not fix and hide any controls
It would be better if view scripts would care about this, but as we
failed so many times this might be the better option.

fixes #8697
2015-03-12 10:04:19 +01:00
Thomas Gelf
16ca8d0654 StatusQuery: fix join on wrong alias
Looks like a copy & paste error, resulted in hosts been shown multiple
times.

fixes #8699
2015-03-12 09:46:38 +01:00
Thomas Gelf
792a67c439 Revert "Remove Debian packaging from GIT"
This reverts commit e72e340faa9db5531ddc71131cf113862d22c72c.
2015-03-12 09:34:59 +01:00
Eric Lippmann
16c78c5cab Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-12 01:25:28 +01:00
Eric Lippmann
b50129ad2e Add renderLayout to the re-login URL for externally authenticated users
refs #8626
2015-03-12 01:14:47 +01:00
Eric Lippmann
54df9e4b3e Merge branch 'master' into bugfix/logout-external-8626 2015-03-12 00:57:52 +01:00
Eric Lippmann
749957c3b4 Fix too greedy __SELF__ login redirect on XHR
I introduced this bug some commits earlier. We only must redirect to __SELF__ on XHR
if a redirect URL was set.

refs #8626
2015-03-12 00:57:03 +01:00