Commit Graph

9380 Commits

Author SHA1 Message Date
Johannes Meyer 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
Johannes Meyer f6e5fac23e user/show.phtml: Pass through a user's name when creating memberships
refs #10367
2015-10-15 13:46:34 +02:00
Johannes Meyer 2168839349 user/show.phtml: Fix coding style
refs #10367
2015-10-15 13:45:43 +02:00
Eric Lippmann 331822ad15 Merge pull request #47 from anenviousguest/master 2015-10-15 12:53:10 +02:00
Vladislav Ponomarev 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
Eric Lippmann 81aac2f6aa Revert "Rename manifest file"
This reverts commit eed1959223.

There's a pull request on GitHub open for that one.
2015-10-15 11:01:58 +02:00
Eric Lippmann 34f4eb9321 Revert "iframe: Do not escape the url"
This reverts commit bd424a7cbd.

refs #10321
2015-10-15 11:01:04 +02:00
Marius Hein eed1959223 Rename manifest file 2015-10-14 12:31:46 +02:00
Johannes Meyer bd424a7cbd iframe: Do not escape the url
The url is already escaped.

fixes #10321
2015-10-10 20:53:09 +02:00
Johannes Meyer 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
Johannes Meyer 883608b09b Merge branch 'bugfix/make-host-customvars-accessible-from-service-objects-10304'
fixes #10304
2015-10-05 14:09:26 +02:00
Johannes Meyer b582146def Merge branch 'master' into bugfix/make-host-customvars-accessible-from-service-objects-10304 2015-10-05 14:09:10 +02:00
Johannes Meyer 125ecb2f0a ActionForm: Allow contact_name and contactgroup_name as filter column
Because it works now.
2015-10-05 14:05:17 +02:00
Johannes Meyer 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
Johannes Meyer 65e7f7a8ca FilterExpression: Give the row a chance to dynamically return a value
refs #10304
2015-10-05 14:01:03 +02:00
Johannes Meyer 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
Eric Lippmann 610325eebd monitoring/CSS: Set line-height for plugin output 2015-10-05 13:21:11 +02:00
Eric Lippmann c6814e9f93 CSS: Don't set line-height on body
refs #10295
2015-10-05 13:20:12 +02:00
Johannes Meyer 499a7d628f Macro: Resolve prefixed custom vars and object attributes
refs #10304
2015-10-05 13:18:10 +02:00
Johannes Meyer 0ed6e08175 MonitoredObject: Allow to access custom variables by property
refs #10304
2015-10-05 13:16:41 +02:00
Johannes Meyer 996959b65e MonitoredObject: Fix object_type condition in method fetchHostVariables
refs #10304
2015-10-05 12:54:30 +02:00
Johannes Meyer 7696172249 Logger: Also use the utility method for non-solitary exception arguments 2015-10-05 12:54:04 +02:00
Johannes Meyer 7419c9e87c MonitoredObject: Allow to fetch a host's customvariables for services
refs #10304
2015-10-05 11:57:31 +02:00
Johannes Meyer 98e0081d81 Limiter: Use the limit also as priority
fixes #10288
2015-10-05 10:54:43 +02:00
Eric Lippmann 5fa423cf03 Merge branch 'feature/vagrant-parallels-10167'
resolves #10167
2015-10-02 14:13:16 +02:00
Michael Friedrich ee1ee5af84 Update README.md with latest screenshot 2015-10-02 12:16:57 +02:00
Eric Lippmann 1de8199e44 Fix specfile 2015-10-02 12:14:25 +02:00
Johannes Meyer bf5f9f038c setup module: Translate a single string
Wohooo! (..)
2015-10-02 12:11:18 +02:00
Thomas Gelf 6a8f970685 it_IT: ... 2015-10-02 12:10:56 +02:00
Thomas Gelf 6a7d9fc4e3 it_IT: a few more strings 2015-10-02 12:09:35 +02:00
Eric Lippmann 29eeec585a locale: Update de_DE 2015-10-02 12:07:41 +02:00
Eric Lippmann f203d8624e locale: Update de_DE 2015-10-02 12:07:41 +02:00
Eric Lippmann 4b85ab985c monitoring/locale: Update de_De 2015-10-02 12:07:41 +02:00
Thomas Gelf 4f45e107d5 login.less: broader label for translated strings 2015-10-02 12:05:21 +02:00
Thomas Gelf dbb8b10f2f it_IT: refreshed a couple of translation strings 2015-10-02 12:01:54 +02:00
Johannes Meyer 68297f0630 Revert "loader.js: Do not push redirects to history"
This reverts commit e99cdb66ef.
2015-10-02 11:46:44 +02:00
Johannes Meyer 8e94f3e58e Revert "Revert "Fix logout loop (testing), #2""
This reverts commit 967c3552e5.
2015-10-02 11:46:44 +02:00
Eric Lippmann 8a1f6059d8 locale: Update de_DE 2015-10-02 11:38:50 +02:00
Johannes Meyer 967c3552e5 Revert "Fix logout loop (testing), #2"
This reverts commit 6affad6895.
2015-10-02 11:36:06 +02:00
Johannes Meyer e99cdb66ef loader.js: Do not push redirects to history 2015-10-02 11:36:06 +02:00
Eric Lippmann 7e2c47e26b monitoring: Fix table header in the contact groups overview 2015-10-02 11:35:00 +02:00
Eric Lippmann 54bb99a96d Merge branch 'feature/dope-layout-5543'
refs #5543
2015-10-02 11:16:35 +02:00
Michael Friedrich 9a28855cc0 Merge branch 'feature/doc-7153'
refs #7153
2015-10-02 10:44:33 +02:00
Michael Friedrich c3b5d8ab51 Doc: Fix typo
refs #7153
2015-10-02 10:36:39 +02:00
Johannes Meyer 53f29131af ActionController: Use a controller's inner layout script instead of "body"
"body" is still the default inner layout script.
2015-10-02 10:18:37 +02:00
Thomas Gelf 3bb2238ec8 translation.md: fix img urls, must be relative 2015-10-02 10:02:36 +02:00
Michael Friedrich 5a14a3c4ea Merge branch 'feature/doc-7153'
refs #7153
2015-10-02 09:51:15 +02:00
Michael Friedrich ded631b589 Document example commands for installing from source
That also adds all the details we use for automated deployments
and manual installations (e.g. mysql db setup, user creation, manual
config files).

Maybe this could be split into installation-from-source.md
somewhere in the future, but for now it should help anyone
out there to deploy Icinga Web 2 w/o running the setup wizard
in automated environments.

fixes #8407
refs #9595
refs #7153
2015-10-02 09:50:52 +02:00
Michael Friedrich f077f45b20 Fix wrong anchor 2015-10-02 09:50:52 +02:00
Michael Friedrich 73dfb286f5 Move upgrading to a dedicated section and add a link
refs #7153
2015-10-02 09:50:52 +02:00