Johannes Meyer
3b8ab42baf
Merge branch 'master' into feature/ldap-user-group-backend-7343
2015-06-05 16:26:43 +02:00
Johannes Meyer
ce7e9f69e3
Merge branch 'master' into feature/ldap-user-group-backend-7343
2015-06-05 16:25:16 +02:00
Alexander A. Klimov
34992c2841
Merge branch 'bugfix/indicate-that-nothing-was-found-in-the-docs-when-searching-8847'
...
fixes #8847
2015-06-05 16:22:37 +02:00
Johannes Meyer
e910a5a254
LdapUserGroupBackendForm: Do not disable base_dn' and
user_base_dn'
...
refs #7343
2015-06-05 16:16:35 +02:00
Johannes Meyer
797e9de629
LdapUserGroupBackendForm: Do not disable group configuration..
...
..when no user backend has been linked and it's not a ActiveDirectory.
refs #7343
2015-06-05 16:07:27 +02:00
Johannes Meyer
24cb6bfc6e
Form: Preserve defaults for subforms as well
2015-06-05 16:01:52 +02:00
Alexander A. Klimov
05b7c3aa6a
Replace <h1> w/ <h2>
...
refs #8847
2015-06-05 16:01:37 +02:00
Johannes Meyer
975edbe548
UserGroupBackendForm: Do not persist null values, really
...
Revert this once #9376 has been fixed.
refs #9376
2015-06-05 15:45:33 +02:00
Johannes Meyer
e6837cf9e9
UsergroupbackendController: Do not persist empty configuration values
...
refs #7343
2015-06-05 15:42:35 +02:00
Johannes Meyer
e9e97cb1b3
UserGroupBackendForm: Unset the `name' property, always
...
refs #7343
2015-06-05 15:41:24 +02:00
Alexander A. Klimov
6dedb48444
Indicate that nothing was found in the docs when searching
...
refs #8847
2015-06-05 15:37:31 +02:00
Eric Lippmann
3e29046f56
Merge branch 'bugfix/monitoring-remove-services-tab-7998'
...
fixes #7998
2015-06-05 15:28:39 +02:00
Eric Lippmann
11a006681b
Merge branch 'master' into bugfix/monitoring-remove-services-tab-7998
...
Conflicts:
application/controllers/ConfigController.php
library/Icinga/Web/Widget/FilterEditor.php
modules/monitoring/application/controllers/HostsController.php
2015-06-05 15:27:42 +02:00
Johannes Meyer
5688f0cb85
Allow to configure user group backends of type LDAP
...
refs #7343
2015-06-05 14:53:29 +02:00
Johannes Meyer
447088af22
Introduce form LdapUserGroupBackendForm
...
refs #7343
2015-06-05 14:52:46 +02:00
Johannes Meyer
7ebf185036
UserGroupBackendForm: Fix that autosubmit do not have any effect
...
refs #7343
2015-06-05 13:07:16 +02:00
Thomas Gelf
cd20ec385c
header-elements.less: remove obsolete user style
2015-06-05 12:59:18 +02:00
Thomas Gelf
edeb24792e
CSS: move monitoring styles to monitoring module
2015-06-05 12:49:07 +02:00
Thomas Gelf
21d3e64ff0
defaults.less: attempt to use more global variables
2015-06-05 12:43:35 +02:00
Thomas Gelf
44742a83a8
main-content.less: remove exceptional header styles
2015-06-05 12:43:03 +02:00
Thomas Gelf
9795617e4d
defaults.less: new header styling
2015-06-05 12:42:32 +02:00
Thomas Gelf
6c5c153fed
monitoring/css: temporarily disable header styling
2015-06-05 12:41:11 +02:00
Alexander A. Klimov
6b14195809
Rename .fileNotReadable to .message-error
...
refs #9247
2015-06-05 12:38:55 +02:00
Alexander A. Klimov
0a5dcd2c8f
Include VERSION in the RPM package
...
refs #9247
2015-06-05 12:03:23 +02:00
Alexander A. Klimov
67322e0b36
Show an error message rather than just "unknown version"
...
refs #9247
2015-06-05 11:56:15 +02:00
Johannes Meyer
cacd97fb46
LdapUserGroupBackend: Make default configuration providers public
...
I'd like to access these when preparing a config form.
refs #7343
2015-06-05 11:09:31 +02:00
Johannes Meyer
02d2ea682e
LdapUserGroupBackend: Do not permit to link different directories
...
I cannot think of a valid usecase right now. In case someone got one,
revert this commit and make use of the backend itself and not only
its configuration.
refs #7343
2015-06-05 10:51:54 +02:00
Johannes Meyer
0ab192cd1f
LdapUserGroupBackend: Allow to link a user backend
...
refs #7343
2015-06-05 10:41:47 +02:00
Johannes Meyer
127489ca20
UserBackend: Allow to only pass a backend's name
2015-06-05 10:40:47 +02:00
Alexander A. Klimov
cbc731034a
Don't throw any exception
...
refs #9247
2015-06-05 10:23:17 +02:00
Johannes Meyer
ee2462a6b2
LdapUserGroupBackend: Let the backend decide which defaults to use
...
refs #7343
2015-06-05 10:19:28 +02:00
Alexander A. Klimov
602f0cf755
Move Version to Icinga\Application\
...
refs #9247
2015-06-05 10:18:24 +02:00
Thomas Gelf
c857a3de76
monitoring/css: change section title styling
...
* white on gray
* temporarily disabled autosubmit hint
2015-06-05 10:15:54 +02:00
Thomas Gelf
a1c1ca13e9
monitoring/css: align feature commands
2015-06-05 10:06:43 +02:00
Johannes Meyer
3fd0d99db2
LdapUserGroupBackend: Add support for custom query filters
...
refs #7343
2015-06-05 09:57:40 +02:00
Alexander A. Klimov
7577b37cdb
Change VERSION's format
...
refs #9247
2015-06-03 18:08:54 +02:00
Johannes Meyer
90d946f149
LdapUserGroupBackend: We need a datasource, actually
...
Forgot to add this when disabling LdapRepository inheritance...
refs #7343
2015-06-03 16:40:14 +02:00
Johannes Meyer
d9eb8f9e8d
LdapUserGroupBackend: Do not extend LdapRepository
...
Selecting groups works, but not memberships. Does not make sense
until both things work...
refs #7343
2015-06-03 16:33:22 +02:00
Johannes Meyer
89d992278b
Introduce class LdapUserGroupBackend
...
refs #743
2015-06-03 16:27:50 +02:00
Johannes Meyer
e65cf954e6
LdapRepository: Add normed attribute `gid'
...
refs #7343
2015-06-03 16:08:29 +02:00
Thomas Gelf
9c8752844f
main-content-less: no border for controls title
2015-06-03 15:35:51 +02:00
Thomas Gelf
b5769d2f4b
layout-structure.less: fix missing bracket
2015-06-03 15:35:51 +02:00
Thomas Gelf
7a20432b6b
main-content.less: no left margin for icons
2015-06-03 15:35:51 +02:00
Thomas Gelf
c785b61874
layout-structure.less: style separated controls
2015-06-03 15:35:51 +02:00
Thomas Gelf
2318eaf4c3
monitoring/module.less: highlight plugin output
2015-06-03 15:35:51 +02:00
Thomas Gelf
6e1ba30acc
Styling: re-organize and style comments
2015-06-03 15:35:50 +02:00
Thomas Gelf
d4a9f4fd98
controls: introduce new "separated" class
...
Controls defined as "separated" will be separated by space/border/shadow
or similar
2015-06-03 15:35:50 +02:00
Thomas Gelf
421cd1fdd8
main-content.less: no border for new sections
2015-06-03 15:35:50 +02:00
Thomas Gelf
38a88d129c
DeleteCommentCommandForm: choose another icon
2015-06-03 15:35:50 +02:00
Thomas Gelf
5b19f9474c
CheckNowCommandForm: remove visible whitespace
2015-06-03 15:35:50 +02:00