Eric Lippmann
2ff822c2ac
Merge branch 'master' into feature/ipv6-addresses-9645-9826
2015-09-28 13:09:30 +02:00
Johannes Meyer
7a8ac9796b
ArrayDatasource: Make it cloning itself when creating a new query
...
Quickfix only. The actual issue is that the datasource caches indifferently
the result of the first evaluated query. This should be done by the query.
2015-09-28 12:26:33 +02:00
Johannes Meyer
2ef36e2a92
Merge branch 'master' into bugfix/ldap-group-to-roles-assignment-not-working-9950
2015-09-28 11:05:00 +02:00
Johannes Meyer
e7e3520375
LdapUserGroupBackend: Fix method getMemberships()
...
refs #9950
2015-09-28 10:57:17 +02:00
Johannes Meyer
d7655972ed
LdapRepository: Add method isAmbiguous()
...
refs #9950
2015-09-28 10:56:15 +02:00
Johannes Meyer
e1aab183e3
LdapRepository: Add a bunch of additional well known attribute names
2015-09-28 10:55:41 +02:00
Johannes Meyer
ee7e7a1a78
Merge branch 'bugfix/Prettify-page-layout-when-accessing-a-non-existent-route-while-not-being-authenticated-10009'
...
fixes #10009
2015-09-28 09:57:27 +02:00
Johannes Meyer
2f9bd78721
Merge branch 'master' into bugfix/Prettify-page-layout-when-accessing-a-non-existent-route-while-not-being-authenticated-10009
2015-09-28 09:55:07 +02:00
Johannes Meyer
4889e63e95
Do not fade-in the logo for error pages and fix some coding style issues
...
refs #10009
2015-09-28 09:53:38 +02:00
Johannes Meyer
d627f419ef
Fix that an object's notes and action url label is escaped twice
...
fixes #10218
2015-09-28 09:05:17 +02:00
Eric Lippmann
5008537683
lib: Fix PHPDoc of SimpleQuery::getOrder()
2015-09-27 12:57:47 +02:00
Eric Lippmann
747c6f9b0b
monitoring: Move instance_name from query to filter columns in the comment data view
...
We don't select but filter for this column.
2015-09-27 12:57:35 +02:00
Eric Lippmann
463fa45f20
monitoring: Move instance_name from query to filter columns in the downtime data view
...
We don't select but filter for this column
2015-09-27 12:57:35 +02:00
Eric Lippmann
30904056f1
monitoring: Make instance_name filterable for service downtimes
2015-09-27 12:57:35 +02:00
Eric Lippmann
5ca1e76524
monitoring: Make instance_name filterable for service comments
2015-09-27 12:57:34 +02:00
Eric Lippmann
395d285b9d
monitoring: Make instance_name filterable for host downtimes
2015-09-27 12:57:34 +02:00
Eric Lippmann
e46fbe37af
monitoring: Make instance_name filterable for host comments
2015-09-27 12:57:34 +02:00
Eric Lippmann
7ed7343587
monitoring: Reorder query columns in the ContactQuery
2015-09-27 12:57:34 +02:00
Eric Lippmann
faa9b41fb8
monitoring: Clear order of the HoststatusQuery used in the HostserviceproblemsummaryQuery
2015-09-27 12:57:34 +02:00
Eric Lippmann
78989c0aad
lib: Add SimpleQuery::clearOrder()
2015-09-27 12:56:48 +02:00
Alexander A. Klimov
a99430ec6d
Merge branch 'feature/list-installed-modules-versions-and-state-in-the-about-page-9381' into feature/show-icinga-web-2-s-version-in-the-frontend-9247
2015-09-25 18:06:38 +02:00
Alexander A. Klimov
8e29fe92a5
Use a login-like layout for error messages displayed to non-authenticated users
...
refs #10009
2015-09-25 17:40:00 +02:00
Alexander A. Klimov
426f64e32a
CSS: rename .form to .below-logo
...
refs #10009
2015-09-25 16:41:07 +02:00
Johannes Meyer
e5f2174c1e
LdapUserGroupBackend: Restore method requireTable()
...
refs #9950
2015-09-25 16:24:16 +02:00
Johannes Meyer
fe9ee48d65
LdapUserGroupBackend: Fix incorrect table name initialization
...
refs #9950
2015-09-25 16:23:13 +02:00
Johannes Meyer
b19ecbfb43
LdapUserGroupBackend: Remove the remaining code duplicates
...
refs #9950
refs #9772
2015-09-25 16:21:33 +02:00
Alexander A. Klimov
ed935696ac
CSS: outsource .logo related rules into a new .less file `logo.less'
...
refs #10009
2015-09-25 15:31:39 +02:00
Aaron Collins
23631c8f39
changed order of posix check
...
refs #9950
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-09-25 14:35:08 +02:00
Aaron Collins
73715c94b1
Fixes for ldap group auth
...
The current LdapUserGroupBackend was incomplete and suffered from a little over zealous copy pasta. It had over written certain functions that where unnecessary such as the constructor and a table validator. This patch aims to clean those up. Additionally it also makes this group auth work with posixGroup that use the username as the member identifier and not just inetGroups that use the full dn
refs #9950
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-09-25 14:34:33 +02:00
Johannes Meyer
d4c1ca9e18
Merge branch 'feature/custom-menu-items-5600'
...
resolves #5600
fixes #10169
fixes #10046
fixes #10082
2015-09-25 14:17:34 +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
Johannes Meyer
f17c185aed
js: Improve logging when pushing history states
2015-09-25 14:08:10 +02:00
Johannes Meyer
67a28a4b47
js: Do not re-open the detail url if it's the origin of a redirect
...
refs #5600
2015-09-25 13:58:52 +02:00
Alexander A. Klimov
a9ec0eebef
Merge branch 'bugfix/don-t-use-parse_ini_file-in-Config-10150'
...
fixes #10150
2015-09-25 12:19:38 +02:00
Alexander A. Klimov
812545c04b
IniStore::load(): use IniParser::parseIniFile() instead of parse_ini_file()
...
refs #10150
2015-09-25 12:15:47 +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
a090907373
Conform to coding guidelines
2015-09-25 11:37:06 +02:00
Johannes Meyer
086579b254
NavigationController: Rerender the layout when removing menu entries
...
refs #5600
2015-09-25 10:51:44 +02:00
Johannes Meyer
2952eaefcd
NavigationController: Rerender the layout when unsharing menu entries
...
refs #5600
2015-09-25 10:51:16 +02:00
Alexander A. Klimov
4a85e112d2
Don't link to loaded modules in the about page if the user doesn't have the required permission
...
refs #9381
2015-09-25 10:45:17 +02:00
Alexander A. Klimov
f64db890d2
Show loaded modules in the about page
...
refs #9381
2015-09-24 19:23:49 +02:00
Alexander A. Klimov
52221dd10a
Add doc and social media links to the about page
...
refs #9247
2015-09-24 15:54:56 +02:00
Johannes Meyer
e8f93e8ea1
NavigationConfigForm: Translate non-translated error messages
...
refs #5600
2015-09-24 15:50:40 +02:00
Johannes Meyer
3f22469c18
NavigationConfigForm: Fix name validation when adding or editing items
...
refs #5600
2015-09-24 15:50:19 +02:00
Johannes Meyer
cd1510d846
NavigationConfigForm: Set a "name" as default key column for nav configs
...
refs #5600
2015-09-24 15:49:04 +02:00
Johannes Meyer
b7ef951e57
NavigationController: Rerender the layout when editing a menu entry
...
refs #5600
2015-09-24 14:05:57 +02:00
Johannes Meyer
c4df7e05be
NavigationController: Rerender the layout when adding a menu entry
...
refs #5600
2015-09-24 14:05:28 +02:00
Johannes Meyer
165dc00fad
Url: Do not throw ProgrammingError if there is no relative url available
...
refs #5600
2015-09-24 14:03:15 +02:00
Alexander A. Klimov
bfc2738fe5
Translate license statement
...
refs #9247
2015-09-24 13:07:31 +02:00
Johannes Meyer
338c0680e0
NavigationConfigForm: Consider a user's config and the share config as one
...
Actually, we need a more sophisticated solution for this, but I guess this is a
proper quickfix to avoid any conflicts when switching between shared and
non-shared.
refs #5600
2015-09-24 12:58:11 +02:00