99719bec7d
Merge branch 'master' into bugfix/broken-user-and-group-management-10367
...
Conflicts:
library/Icinga/Authentication/User/LdapUserBackend.php
library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
2015-10-29 08:52:07 +01:00
da744caaef
Repair redirect after login
...
fixes #10287
2015-10-22 16:57:01 +02:00
fdb186ec56
Revert "Repair redirect after login"
...
This reverts commit 6b0b7fbeea
2015-10-22 16:55:40 +02:00
6b0b7fbeea
Repair redirect after login
...
fixes #10287
2015-10-22 16:29:37 +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
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
dbb8b10f2f
it_IT: refreshed a couple of translation strings
2015-10-02 12:01:54 +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
54bb99a96d
Merge branch 'feature/dope-layout-5543'
...
refs #5543
2015-10-02 11:16:35 +02:00
3efd713283
reorder-authbackend: fix typo
2015-10-02 09:39:25 +02:00
f8ac2c8b40
Add Finnish translation (WIP)
...
refs #8557
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-10-01 23:11:13 +02:00
56ed92a8e6
Merge branch 'master' into feature/dope-layout-5543
2015-10-01 21:29:35 +02:00
786db6666e
ErrorController: Respect $this->compact
...
refs #5543
2015-10-01 17:56:44 +02:00
e788682c19
Enforce the standard nav item renderer for the main menu by default
2015-10-01 17:44:37 +02:00
3d2521abf0
Merge branch 'master' into feature/dope-layout-5543
2015-10-01 17:42:24 +02:00
fe72a1c36e
body.phtml: img urls are now allowed in icon()
...
No no more need for ../ hacks :)
2015-10-01 17:12:26 +02:00
0bf13383b6
Fix control layout in the module overview
...
refs #5543
2015-10-01 16:35:43 +02:00
08ab0befcd
CSS: compat.less and monitoring detail
...
refs #5543
2015-10-01 16:31:25 +02:00
ba3172fb9c
Fix controls layout in some list views
...
refs #5543
2015-10-01 16:10:16 +02:00
2e5e2b3133
login: Fix layout of the config warning
...
refs #5543
2015-10-01 15:44:28 +02:00
f3531ca6df
Use the new social network icons on the login page
...
refs #5543
2015-10-01 14:57:54 +02:00
b80cfe7cdc
NavigationController: Pass through the default url without creating the form
2015-10-01 13:55:12 +02:00
aa3bff532e
NavigationConfigForm: Make sure to return the correct configuration
2015-10-01 10:57:10 +02:00
09985e3d4b
Style group/show
...
refs #5543
2015-10-01 10:50:59 +02:00
6affad6895
Fix logout loop (testing), #2
...
Quick and dirty fix.
2015-10-01 10:50:33 +02:00
27524feda1
Fix error when showing a group from a database backend
2015-10-01 10:12:28 +02:00
380c8743c0
Add tab for create, update and remove user group
...
refs #5543
2015-10-01 10:03:29 +02:00
4b06d47705
Restore state of the login view script prior to #10009
2015-10-01 09:58:41 +02:00
631f5d8071
Add tab for create, update and remove user
...
refs #5543
2015-10-01 09:39:21 +02:00
cb46af8e9c
Rearrange menu entries
...
refs #5543
2015-10-01 09:01:03 +02:00
d6774a0f64
CSS: Use link-button for reorder auth btns
...
refs #5543
2015-10-01 02:56:38 +02:00
917d5fccce
CSS: Use control-button for the ldap discovery btn
...
refs #5543
2015-10-01 02:53:27 +02:00
90b64d4cc3
Don't translate empty strings in the login form
...
refs #5543
2015-10-01 02:53:04 +02:00
591ccd0378
CSS: Use form-errors instead of config-note in the login view script
...
refs #5543
2015-10-01 02:50:48 +02:00
b137c4f5b8
Add icon-twitter and icon-facebook-squared
...
refs #5543
2015-10-01 00:56:12 +02:00
05904de5d5
Fix about markup
...
refs #5543
2015-10-01 00:55:49 +02:00
8cff607b5d
Add tab for new, update and remove navigation item
...
refs #5543
2015-10-01 00:40:54 +02:00
f3f7fa381b
Add tab for new, update and remove user group backend
...
refs #5543
2015-10-01 00:36:32 +02:00
2059a06105
Add tab for new, update and remove user backend
...
refs #5543
2015-10-01 00:32:16 +02:00
Johannes Meyer
Alexander A. Klimov
Eric Lippmann
Thomas Gelf
Mikko Peltokangas