tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,898 Commits 117 Branches 71 Tags 80 MiB
Commit Graph

2320 Commits

Author SHA1 Message Date
Thomas Gelf 3462f0ee9a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 
Conflicts:
	modules/monitoring/application/views/scripts/host/history.phtml
	modules/monitoring/application/views/scripts/list/services.phtml
 2015-06-18 11:26:51 +02:00
Johannes Meyer 4d06bff5e8 Merge branch 'master' into feature/Move-notifications-to-the-bottom-of-the-page-8247 2015-06-17 12:47:58 +02:00
Johannes Meyer ba4dd255ec Tabs: Merge the action's params into the current request url's params 2015-06-16 16:02:32 +02:00
Johannes Meyer 68be11b929 UrlParams: Allow conversion to an associative array 2015-06-16 16:01:42 +02:00
Thomas Gelf b3028e9988 Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-16 11:49:03 +02:00
Thomas Gelf 7a18638504 Revert "Web/Menu: move "About" to config section" 
Has been fixed in current master.
This reverts commit 56d67def00.
 2015-06-16 11:48:40 +02:00
Johannes Meyer aa0b1d43ef Menu: Move about page into the system menu as sub-entry 2015-06-16 11:43:58 +02:00
Thomas Gelf 56d67def00 Web/Menu: move "About" to config section 
This is IMO never worth a main menu entry, at least not in it's current
implementation and look-a-like.
 2015-06-16 00:18:31 +02:00
Thomas Gelf 0170d9941a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-15 23:08:17 +02:00
Matthias Jentsch 42de13a2b9 Merge branch 'feature/ssh-remote-connection-resource-configuration-7595' 
resolves #7595
 2015-06-15 17:30:42 +02:00
Paul Richards aac5d49eed IIS: use 'config' folder within icingaweb root instead of '/etc/icingaweb2' on Windows 
Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Make use of Platform::isWindows()
Call ::setupAutoloader() before that

fixes #8916
 2015-06-12 14:46:00 +02:00
Paul Richards edd8f5738f Windows: Fix webrouter on IIS 
Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Remove unneeded whitespace

fixes #8914
 2015-06-12 14:05:40 +02:00
Paul Richards e8cdcce61d Fix PHP warning on Windows due to LC_MESSAGES not defined 
Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Don't define LC_MESSAGES globally as only 2 methods would need that
Use LC_ALL rather than 6

fixes #8912
 2015-06-12 13:49:38 +02:00
Alexander A. Klimov 7ea6eeb20d Revert "Don't use /etc/icingaweb2 as config path on Windows" 
This reverts commit 48870bb7e2.
 2015-06-12 13:29:36 +02:00
Alexander A. Klimov b58ffbe034 Revert "Translator: fall back to LC_ALL if LC_MESSAGES is not defined" 
This reverts commit 9fe2d4928d.
 2015-06-12 13:29:31 +02:00
Alexander A. Klimov 9fe2d4928d Translator: fall back to LC_ALL if LC_MESSAGES is not defined 
fixes #8912
 2015-06-12 12:28:30 +02:00
Alexander A. Klimov 48870bb7e2 Don't use /etc/icingaweb2 as config path on Windows 
fixes #8916
 2015-06-12 11:57:44 +02:00
Alexander A. Klimov 0bce5e83ad Revert "Fix PHP warning on windows due to LC_MESSAGES not defined." 
This reverts commit 5b18ff7965.
 2015-06-12 10:38:25 +02:00
Alexander A. Klimov 1e0219f697 Revert "IIS: use 'config' folder within icingaweb root on windows" 
This reverts commit 4607a85cf5.
 2015-06-12 10:38:11 +02:00
Paul Richards 4607a85cf5 IIS: use 'config' folder within icingaweb root on windows 
fixes #8916
 2015-06-11 18:10:37 +02:00
Paul Richards 5b18ff7965 Fix PHP warning on windows due to LC_MESSAGES not defined. 
fixes #8912
 2015-06-11 17:28:50 +02:00
Alexander A. Klimov 392047b2ee Add support for command line arguments in the format --arg=<value> 
refs #8472
 2015-06-10 17:19:49 +02:00
Johannes Meyer eba862a290 view->url(): Clone $path if it's already of type Icinga\Web\Url 
Avoids side effects in case of url params adjustments.

fixes #9351
 2015-06-09 09:21:12 +02:00
Matthias Jentsch 3600e1088c Fix key and value sanitazion in ini writer 2015-06-08 13:11:40 +02:00
Matthias Jentsch ddba1d86fa Fix spacing in ini files 
refs #8706
 2015-06-08 13:11:40 +02:00
Alexander A. Klimov 1bd18c5adb Merge branch 'feature/Show-Icinga-Web-2-s-version-in-the-frontend-9247' 
resolves #9247
 2015-06-08 12:40:14 +02:00
Alexander A. Klimov 6a914dc25b Merge branch 'bugfix/Show-all-shell-commands-required-to-get-ready-in-the-setup-wizard-8705' 
fixes #8705
 2015-06-05 18:40:07 +02:00
Alexander A. Klimov 76e748c483 Don't throw any exception 
refs #8705
 2015-06-05 17:12:32 +02:00
Johannes Meyer 24cb6bfc6e Form: Preserve defaults for subforms as well 2015-06-05 16:01:52 +02:00
Johannes Meyer 5688f0cb85 Allow to configure user group backends of type LDAP 
refs #7343
 2015-06-05 14:53:29 +02:00
Thomas Gelf edeb24792e CSS: move monitoring styles to monitoring module 2015-06-05 12:49:07 +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
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
Johannes Meyer 86c63ec913 Introduce class LdapRepository 
refs #7343
 2015-06-03 15:28:07 +02:00
Alexander A. Klimov 757e993871 Outsource version-getting logic to Version::get() 
refs #9247
 2015-06-03 15:23:05 +02:00
Johannes Meyer 96f5f8fd49 LdapUserBackend: Do not fetch a user's groups 
refs #7343
 2015-06-03 15:16:54 +02:00
Johannes Meyer e0c0e9c874 LdapUserBackend: Move function retrieveGeneralizedTime into its parent 
refs #7343
 2015-06-03 14:36:46 +02:00
Johannes Meyer 5dd3950594 Ldap\Connection: Disable server side sorting as it's not working 
refs #9364
 2015-06-03 14:24:48 +02:00
Johannes Meyer 1a0d1702c9 Ldap\Connection: Do not sort *after* the result has been limited 
fixes #9352
 2015-06-03 14:22:38 +02:00