tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-08-14 06:18:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,703 Commits 131 Branches 76 Tags
Commit Graph

5703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
83443a5dc4 Use -1 for last update of the menu 
We must not rely on the server time minus an offset for the last update of the menu
to trigger an immediate update of the menu because the server time may be behind the current time.

fixes #8694
 2015-03-12 00:52:19 +01:00
Eric Lippmann
7fe4b3d7ab Fix PHPDoc of Web::detectLocale() 2015-03-11 21:55:04 +01:00
Eric Lippmann
d102a61e22 Fix Undefined index: HTTP_ACCEPT_LANGUAGE 
fixes #8370
 2015-03-11 20:50:05 +01:00
Eric Lippmann
361afdcf13 Use ! empty in favor of count > 0 in the MonitoredObjectController 
refs #8614
 2015-03-11 14:08:43 +01:00
Eric Lippmann
2286ab1846 Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-11 13:38:07 +01:00
Eric Lippmann
0286641369 Don't fetch comments and downtimes twice in an object's detail view 
The controller counts comments and downtimes on the object, which will automatically fetch comments and downtimes.
After that came a call to MonitoredObject::populate() which again fetched comments and downtimes.
Now the object is populated before counting comments and dowtimes.

refs #8614
 2015-03-11 13:32:54 +01:00
Eric Lippmann
b501fef62b Rearrange columns in the Host object 
refs #8614
 2015-03-11 13:10:55 +01:00
Eric Lippmann
ef4970c0c1 Don't select host_process_performance_data twice in the host detail view 
refs #8614
 2015-03-11 13:08:53 +01:00
Eric Lippmann
84f56f4e51 Don't select host_problem in the host detail view 
The column host_problem is not used in the host detail view.

refs #8614
 2015-03-11 13:08:11 +01:00
Eric Lippmann
37d09511c6 Don't select host_modified_host_attributes in the host detail view 
The column host_modified_host_attributes is not used in the host detail view.

refs #8614
 2015-03-11 13:07:33 +01:00
Eric Lippmann
e72670cb75 Use default sorting for an object's event history 
refs #8614
 2015-03-11 13:01:14 +01:00
Eric Lippmann
ea32d3dfb3 Add PHPDoc to the EventHistory query 
refs #8614
 2015-03-11 13:01:14 +01:00
Eric Lippmann
c69a46d005 Add PHPDoc to the Downtime query 
refs #8614
 2015-03-11 13:01:14 +01:00
Eric Lippmann
132ae9e44c Use {@inheritdoc} in the Comment data view ... 
... instead of duplicating method documentation.

refs #8614
 2015-03-11 12:57:43 +01:00
Johannes Meyer
ba0154ab79 Tab: Use the title as caption if there is no label set yet 2015-03-11 10:21:06 +01:00
Johannes Meyer
4a5e6bfc7c Merge branch 'feature/custom-ldap-filter-8365' 
resolves #8365
 2015-03-11 09:56:31 +01:00
Johannes Meyer
39a74c4f3d LDAP-Auth backend config: Add support for custom LDAP filter rules 
refs #8365
 2015-03-11 09:52:14 +01:00
Johannes Meyer
0758be4af1 Add support for dynamic ldap filter expressions 
"Dynamic" is a more of a overstatement when describing this commit but
the current implementation is just the start. Once our ldap protocol stuff
supports our filter implementation this will be vastly improved.

refs #8365
 2015-03-11 09:50:41 +01:00
Johannes Meyer
2cf09ebc48 Revert "LdapResourceForm: Validate the host field and do not require a port" 
This reverts commit a34d6026b31a112922508e01f8aad46df47fd162.

refs #7990
 2015-03-11 08:00:20 +01:00
Johannes Meyer
e4e6c1cb28 Wizard: Fix that the wrong form element is used in case a user already exists 
fixes #8678
 2015-03-11 07:59:04 +01:00
Markus Frosch
e72e340faa Remove Debian packaging from GIT 
Refs #6402
 2015-03-10 18:25:21 +01:00
Johannes Meyer
a34d6026b3 LdapResourceForm: Validate the host field and do not require a port 
fixes #7990
 2015-03-10 15:03:48 +01:00
Eric Lippmann
5ed6838f50 Don't select host_display_name twice in the service detail view 
refs #8614
 2015-03-10 14:18:08 +01:00
Eric Lippmann
e6949eaab4 Reorder columns to select in the Service object 
refs #8614
 2015-03-10 14:17:09 +01:00
Eric Lippmann
fcb94af93c Don't select service_process_performance_data twice in the service detail view 
refs #8614
 2015-03-10 14:11:50 +01:00
Eric Lippmann
e0acebf474 Don't select service_host_name in the service detail view 
We already select the host_name.

refs #8614
 2015-03-10 14:09:53 +01:00
Eric Lippmann
62f0f5b6a4 Don't select service_modified_service_attributes in the service detail view 
The column service_modified_service_attributes is not used in the service detail view.

refs #8614
 2015-03-10 14:00:17 +01:00