1b7dc1098c
DbUserGroupBackend: Use LEFT JOIN to join the group_membership table
...
Fixes the issue that groups are not found if they do not have any members
even though they meet the where clause
2015-10-16 13:10:39 +02:00
7ef76932d4
DbRepository: Validate the table when inserting, updating and deleting
2015-10-16 12:36:47 +02:00
33037eebbb
Revert "Fix group base DN is erroneously used in place of user base DN"
...
This reverts commit ac7546d9f2
2015-10-16 10:08:14 +02:00
e2e802ef96
Merge branch 'master' into bugfix/broken-user-and-group-management-10367
2015-10-15 17:23:08 +02:00
8db123ffa0
MacroTest: Remove obsolete tests
...
The macro resolver does not know anymore about customvars, just plain
object attributes, which are now covered by testFaultyMacros()
2015-10-15 17:22:47 +02:00
9ccd6cd953
user/list.phtml: Fix coding style, link targets, css, etc
...
refs #10367
2015-10-15 17:06:02 +02:00
1144c86936
group/list.phtml: Fix coding style, link targets, css, etc
...
refs #10367
2015-10-15 16:14:19 +02:00
0ee73f2560
group/show.phtml: Fix coding style, link targets, css, etc
...
refs #10367
2015-10-15 15:47:38 +02:00
32955dea50
user/show.phtml: Fix some minor issues
...
refs #10367
2015-10-15 15:46:04 +02:00
34bf0c3cb0
Add method getUserBackendName() to UserGroupBackendInterface
...
refs #10367
refs #10373
2015-10-15 15:28:03 +02:00
635bb3eec6
user/show.phtml: Improve layout
...
refs #10367
2015-10-15 14:39:25 +02:00
4d5fde768a
user/show.phtml: Fix presentation and behaviour of the membership link
...
* Removed base target _next, _self feels more natural
* Removed obsolete link title, it has already a sufficient label
* Restored previous link label, we're using the term membership everywhere else, so why should we make an exception here?
refs #10367
2015-10-15 14:02:14 +02:00
f6e5fac23e
user/show.phtml: Pass through a user's name when creating memberships
...
refs #10367
2015-10-15 13:46:34 +02:00
2168839349
user/show.phtml: Fix coding style
...
refs #10367
2015-10-15 13:45:43 +02:00
331822ad15
Merge pull request #47 from anenviousguest/master
2015-10-15 12:53:10 +02:00
ac7546d9f2
Fix group base DN is erroneously used in place of user base DN
...
refs #10340
refs #10367
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-10-15 12:52:17 +02:00
81aac2f6aa
Revert "Rename manifest file"
...
This reverts commit eed1959223
2015-10-15 11:01:58 +02:00
34f4eb9321
Revert "iframe: Do not escape the url"
...
This reverts commit bd424a7cbd#10321
2015-10-15 11:01:04 +02:00
eed1959223
Rename manifest file
2015-10-14 12:31:46 +02:00
bd424a7cbd
iframe: Do not escape the url
...
The url is already escaped.
fixes #10321
2015-10-10 20:53:09 +02:00
d6432cd881
LdapUserGroupBackend: Fix invalid query column initialization, again
...
I've mistakenly reverted a change from Aaron Collins that would have
prevented this issue from occuring.
fixes #10318
2015-10-09 03:53:22 +02:00
883608b09b
Merge branch 'bugfix/make-host-customvars-accessible-from-service-objects-10304'
...
fixes #10304
2015-10-05 14:09:26 +02:00
b582146def
Merge branch 'master' into bugfix/make-host-customvars-accessible-from-service-objects-10304
2015-10-05 14:09:10 +02:00
125ecb2f0a
ActionForm: Allow contact_name and contactgroup_name as filter column
...
Because it works now.
2015-10-05 14:05:17 +02:00
6a68d25bc3
MonitoredObject: Deprecate method matches()
...
It's now possible to achieve the same by passing the object directly to a
filter.
refs #10304
2015-10-05 14:04:40 +02:00
65e7f7a8ca
FilterExpression: Give the row a chance to dynamically return a value
...
refs #10304
2015-10-05 14:01:03 +02:00
07e5664fbe
MonitoredObject: Allow to access a set-value by name
...
$object->contact|contactgroup|hostgroup|servicegroup + _name
is now allowed and returns an array of strings
refs #10304
2015-10-05 13:59:57 +02:00
610325eebd
monitoring/CSS: Set line-height for plugin output
2015-10-05 13:21:11 +02:00
c6814e9f93
CSS: Don't set line-height on body
...
refs #10295
2015-10-05 13:20:12 +02:00
499a7d628f
Macro: Resolve prefixed custom vars and object attributes
...
refs #10304
2015-10-05 13:18:10 +02:00
0ed6e08175
MonitoredObject: Allow to access custom variables by property
...
refs #10304
2015-10-05 13:16:41 +02:00
996959b65e
MonitoredObject: Fix object_type condition in method fetchHostVariables
...
refs #10304
2015-10-05 12:54:30 +02:00
7696172249
Logger: Also use the utility method for non-solitary exception arguments
2015-10-05 12:54:04 +02:00
7419c9e87c
MonitoredObject: Allow to fetch a host's customvariables for services
...
refs #10304
2015-10-05 11:57:31 +02:00
98e0081d81
Limiter: Use the limit also as priority
...
fixes #10288
2015-10-05 10:54:43 +02:00
5fa423cf03
Merge branch 'feature/vagrant-parallels-10167'
...
resolves #10167
2015-10-02 14:13:16 +02:00
ee1ee5af84
Update README.md with latest screenshot
2015-10-02 12:16:57 +02:00
1de8199e44
Fix specfile
2015-10-02 12:14:25 +02:00
bf5f9f038c
setup module: Translate a single string
...
Wohooo! (..)
2015-10-02 12:11:18 +02:00
6a8f970685
it_IT: ...
2015-10-02 12:10:56 +02:00
6a7d9fc4e3
it_IT: a few more strings
2015-10-02 12:09:35 +02:00
29eeec585a
locale: Update de_DE
2015-10-02 12:07:41 +02:00
f203d8624e
locale: Update de_DE
2015-10-02 12:07:41 +02:00
4b85ab985c
monitoring/locale: Update de_De
2015-10-02 12:07:41 +02:00
4f45e107d5
login.less: broader label for translated strings
2015-10-02 12:05:21 +02:00
dbb8b10f2f
it_IT: refreshed a couple of translation strings
2015-10-02 12:01:54 +02:00
68297f0630
Revert "loader.js: Do not push redirects to history"
...
This reverts commit e99cdb66ef
2015-10-02 11:46:44 +02:00
8e94f3e58e
Revert "Revert "Fix logout loop (testing), #2""
...
This reverts commit 967c3552e5
2015-10-02 11:46:44 +02:00
8a1f6059d8
locale: Update de_DE
2015-10-02 11:38:50 +02:00
967c3552e5
Revert "Fix logout loop (testing), #2"
...
This reverts commit 6affad6895
2015-10-02 11:36:06 +02:00
Johannes Meyer
Eric Lippmann
Vladislav Ponomarev
Marius Hein
Michael Friedrich
Thomas Gelf