tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 00:04:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,062 Commits 126 Branches 76 Tags
Commit Graph

6062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
2f752ed1ac Respond with HTTP status code 403 when an XHR requires authentication 
refs #8626
 2015-03-11 22:32:04 +01:00
Eric Lippmann
0806ab3ec9 Remove strict equality for $auth->isAuthenticated() 2015-03-11 22:26:03 +01:00
Eric Lippmann
7288f2e92b Use space after the boolean negotiation operator 2015-03-11 22:25:52 +01:00
Eric Lippmann
4570151b4b Fix indentation for strings spanning multiple lines in our auth controller 2015-03-11 22:11:10 +01:00
Eric Lippmann
64ad54ebd6 Optimize imports in Web.php 2015-03-11 22:08:28 +01:00
Eric Lippmann
a835cad31f Remove a nonsense TODO from Web.php 
TODOs for replacing Zend classes are unnecessary.
 2015-03-11 22:06:23 +01:00
Eric Lippmann
c54648244e Remove newlines from Web.php 2015-03-11 22:05:23 +01:00
Eric Lippmann
c47164601a Don't alias Zend_Controller_Action_HelperBroker in Web.php 2015-03-11 22:03:49 +01:00
Eric Lippmann
dfa7e20b74 Don't use Icinga\Authentication\Manager twice 2015-03-11 22:01:41 +01:00
Eric Lippmann
9e81370551 Removed unused use ... in Web.php 2015-03-11 22:00:09 +01:00
Eric Lippmann
32ca28bc46 Use @return $this for documenting fluent interfaces 2015-03-11 21:58:41 +01:00
Eric Lippmann
ac2522af20 Merge branch 'master' into bugfix/logout-external-8626 2015-03-11 21:55:52 +01:00
Eric Lippmann
7fe4b3d7ab Fix PHPDoc of Web::detectLocale() 2015-03-11 21:55:04 +01:00
Eric Lippmann
29d4ad69b9 Remove // @codeCoverageIgnoreEnd 
This is obsolete.
 2015-03-11 21:50:41 +01:00
Eric Lippmann
bc1336b6f9 Fix stupid code in ActionController::redirectToLogin() 
refs #8626
 2015-03-11 21:49:20 +01:00
Eric Lippmann
4ebfbf83ab Leave note about __SELF__ in our action controller 
refs #8626
 2015-03-11 21:40:14 +01:00
Eric Lippmann
7f94858b8d Add JSDoc to Icinga.Loader.prototype.processRedirectHeader() 
refs #8626
 2015-03-11 21:26:44 +01:00
Eric Lippmann
031f9ddc84 Don't always redirect to the current window's URL if the redirect URL is __SELF__ 
Please see code comments for an explanation.

refs #8626
 2015-03-11 21:24:56 +01:00
Eric Lippmann
d102a61e22 Fix Undefined index: HTTP_ACCEPT_LANGUAGE 
fixes #8370
 2015-03-11 20:50:05 +01:00
Eric Lippmann
846a22e7a1 Don't use jQuery in the logout view script 
jQuery is not available here because JavaScript is loaded after the content.
This was no problem before because the logout action was submitted using XHR and thus having JavaScript.

refs #8626
 2015-03-11 15:35:44 +01:00
Eric Lippmann
0ff8416efb Use View::translate() instead of t() in the logout view script 
refs #8626
 2015-03-11 15:33:14 +01:00
Eric Lippmann
8df9520497 Fix getXMLHttpRequest vs new XMLHttpRequest 
I have never ever heard of getXMLHttpRequest.

refs #8626
 2015-03-11 15:33:14 +01:00
Eric Lippmann
84348151ce Strings spanning multiple lines continue on the next line ... 
... not on the same line

refs #8626
 2015-03-11 15:33:14 +01:00
Eric Lippmann
f44d5ec20a Use <br> instead of <br /> in the logout view script 
refs #8626
 2015-03-11 15:33:14 +01:00
Eric Lippmann
7220d781d8 Fix implicit declaration of variable msg in the logout view script 
refs #8626
 2015-03-11 15:33:12 +01:00
Eric Lippmann
815dc8a5fa Replace /** with /* for non PHPDoc in the logout script 
refs #8626
 2015-03-11 14:51:59 +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