Eric Lippmann
392eee5a1f
Merge branch 'master' into feature/namespaced-controllers-5786
...
Conflicts:
library/Icinga/Application/Web.php
2015-08-17 12:59:44 +02:00
Johannes Meyer
282aaa6e5b
Load additional static files for modules, really
...
Since we're only processing the config script upon calling
Module::hasJs/Css() if no module.js or module.css exists,
we need to ensure that it's processed when calling
Module::getJS/CssFiles().
refs #9702
2015-08-10 10:00:02 +02:00
Johannes Meyer
712d545f48
Module: Allow to define additional Javascript files
...
refs #9702
2015-08-06 15:10:54 +02:00
Johannes Meyer
51aa22d429
Module: Allow to define additional CSS/LESS files
...
refs #9702
2015-08-06 15:10:33 +02:00
Johannes Meyer
59ef54314a
Extend the Web bootstrapper from the EmbeddedWeb bootstrapper
...
In a embedded web environment we may also need a request and response.
refs #9702
2015-08-06 15:08:41 +02:00
Matthias Jentsch
60675979bc
Merge branch 'bugfix/creating-dashlet-with-parentheses-9530'
...
fixes #9530
2015-08-05 18:22:29 +02:00
Matthias Jentsch
f8e2dc850c
Drop IniEditor and clean up IniWriter
...
Replace the ini editor code with a new parser implementation that manipulates a DOM. Do not support capabillities that are no longer needed, like nested configurations, section inheritance, section-less properties.
2015-08-05 18:10:17 +02:00
Alexander Fuhr
c3fe14a205
Modules/Manager: Fix that non-existent modules can be disabled
...
fixes #9374
2015-08-04 14:34:30 +02:00
Johannes Meyer
316a4d8b82
Merge branch 'master' into bugfix/allow-to-configure-how-to-manage-groups-9609
2015-07-30 16:16:04 +02:00
Eric Lippmann
42d698a6b3
lib: Add Web::getResponse()
...
Use this method for retrieving the response object outside a controller.
refs #9660
2015-07-30 13:47:54 +02:00
Eric Lippmann
ce2a196c4a
lib/Web: Set up request before setting up the user
...
refs #9660
2015-07-29 17:22:10 +02:00
Eric Lippmann
db48a944e3
lib: Introduce Web::getRequest()
...
Basic auth will need the request before we set up the front controller.
refs #9660
2015-07-29 16:27:48 +02:00
Johannes Meyer
13edbf901d
UserBackend: Implement interface ConfigAwareFactory
...
refs #9609
2015-07-29 13:44:26 +02:00
Eric Lippmann
07849e0fea
lib: Rename Authentication/Manager to Authentication/Auth
...
refs #9660
2015-07-28 17:08:55 +02:00
Eric Lippmann
7cfc78558d
Merge branch 'master' into feature/secure-modules-9644
...
Conflicts:
library/Icinga/Exception/IcingaException.php
2015-07-28 13:42:02 +02:00
Johannes Meyer
982e226db0
IcingaException: Add utility method to format exceptions as one-liner
2015-07-24 16:19:20 +02:00
Eric Lippmann
149a974a44
Fix coding style in Module.php
...
refs #9644
2015-07-24 15:06:25 +02:00
Eric Lippmann
519d025de5
Allow to get permissions and restrictions from unloaded modules
...
refs #9644
2015-07-24 14:24:48 +02:00
Eric Lippmann
444fdadf13
Allow to get unloaded modules via Manager::getModule()
...
refs #9644
2015-07-24 14:23:48 +02:00
Eric Lippmann
ec1ddd82b3
Move Module::__construct to the top of the function list
...
refs #9664
2015-07-24 14:19:17 +02:00
Eric Lippmann
5dcc307e87
Add namespace for module permissions to the module manager
...
refs #9644
2015-07-22 14:59:35 +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
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
48870bb7e2
Don't use /etc/icingaweb2 as config path on Windows
...
fixes #8916
2015-06-12 11:57:44 +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
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
Alexander A. Klimov
cbc731034a
Don't throw any exception
...
refs #9247
2015-06-05 10:23:17 +02:00
Alexander A. Klimov
602f0cf755
Move Version to Icinga\Application\
...
refs #9247
2015-06-05 10:18:24 +02:00
Alexander A. Klimov
b842a39650
Implement ::getLinuxDistro()
...
refs #8705
2015-05-26 18:23:26 +02:00
Johannes Meyer
ec556edc65
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-26 09:28:35 +02:00
Eric Lippmann
53ca68903a
Merge branch 'bugfix/time-formatting-6778'
...
fixes #6778
2015-05-22 11:34:43 +02:00
Johannes Meyer
265725447d
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-22 10:06:31 +02:00
Eric Lippmann
54577d04bd
Merge branch 'master' into bugfix/time-formatting-6778
...
Conflicts:
modules/monitoring/application/views/scripts/list/comments.phtml
modules/monitoring/application/views/scripts/list/hostgroups.phtml
modules/monitoring/application/views/scripts/process/info.phtml
modules/monitoring/application/views/scripts/show/components/downtime.phtml
modules/monitoring/application/views/scripts/show/components/notifications.phtml
modules/monitoring/public/css/module.less
2015-05-21 14:57:01 +02:00
Marius Hein
0002c0be26
Provide default config name for Module::getConfig()
2015-05-21 14:40:52 +02:00
Eric Lippmann
ba258524a8
Don't setup the DateTimeFactory when bootstrapping Icinga Web 2
...
DateTimeFactory will be removed soon.
refs #6778
2015-05-19 11:23:50 +02:00
Johannes Meyer
0a387573f3
Logger: Fix substitution of exception messages
2015-05-13 10:46:34 +02:00
Johannes Meyer
f1f1710f47
Config: Add method getConfigObject to access the internal ConfigObject
2015-05-06 08:07:42 +02:00
Johannes Meyer
5cc7f26728
ConfigObject: Extend ArrayDatasource
...
This makes it possible to use a ini file as repository!!!1
One thing is missing: Section names are currently ignored and should be
mapped to a virtual column.
refs #8826
2015-05-05 15:21:34 +02:00
Johannes Meyer
d09ea2845d
Merge branch 'master' into feature/user-and-group-management-8826
2015-04-30 15:20:40 +02:00
Alexander A. Klimov
5ba539b7c1
SyslogWriter: replace \n w/ 4 spaces in multiline log messages
2015-04-24 10:28:45 +02:00
Alexander A. Klimov
a429617a95
Revert "Log each line of a multiline log message separatly"
...
This reverts commit 39042ab306
.
2015-04-24 10:17:35 +02:00
Alexander A. Klimov
39042ab306
Log each line of a multiline log message separatly
...
resolves #9000
2015-04-23 17:44:00 +02:00
Alexander A. Klimov
1daecbbca0
Don't use `false === ...' when `! ...' is enough
2015-04-22 17:04:31 +02:00
Alexander A. Klimov
9393d11c0b
Display an error message when enabled modules cannot be read because /etc/icingaweb2 is not readable
...
resolves #9141
2015-04-22 16:44:00 +02:00
Johannes Meyer
7960e911a6
UserGroupBackend: Add support for custom backends to fetch user groups
...
refs #8826
refs #9122
2015-04-22 09:52:08 +02:00
Johannes Meyer
847c02ed8e
UserBackend: Add support for custom authentication backends
...
refs #8826
refs #8877
2015-04-22 09:28:42 +02:00