Thomas Gelf
57caacb93f
Merge branch 'feature/fanzzzy-5481' into feature/master-1
...
Conflicts:
application/controllers/AuthenticationController.php
application/controllers/ErrorController.php
application/views/scripts/authentication/login.phtml
library/Icinga/Application/ApplicationBootstrap.php
library/Icinga/Web/Controller/ActionController.php
library/Icinga/Web/Hook.php
library/Icinga/Web/Widget/Dashboard.php
2014-03-04 09:42:25 +00:00
Eric Lippmann
07d04628cf
Merge branch 'feature/installation-and-configuration-cleanup-5638'
...
Conflicts:
config/config.ini.in
library/Icinga/Application/ApplicationBootstrap.php
library/Icinga/Application/Cli.php
library/Icinga/Application/EmbeddedWeb.php
library/Icinga/Application/Logger.php
library/Icinga/Application/Modules/Manager.php
library/Icinga/Application/Web.php
library/Icinga/Authentication/Backend/DbUserBackend.php
library/Icinga/Authentication/Manager.php
library/Icinga/User/Preferences/IniStore.php
test/php/library/Icinga/Application/LoggerTest.php
2014-03-03 19:03:39 +01:00
Eric Lippmann
7bf888a554
Vagrant: Add monitoring module config
2014-03-03 18:16:07 +01:00
Thomas Gelf
75b12ddaab
Replaced 'Add ...' with a plus in dashboard, shall be a dropdown
2014-02-21 14:03:48 +00:00
Thomas Gelf
585b3aa506
Workaround for default tab issue on Dashboard, should be fixed elsewhere
2014-02-14 14:09:10 +00:00
Eric Lippmann
ca1d50ae53
Rename Icinga 2 Web to Icinga Web 2
2013-10-23 15:11:06 +02:00
Eric Lippmann
aff2398c81
Application/Controllers: Follow our Coding Standards
...
refs #4512
2013-08-16 15:08:28 +02:00
Jannis Moßhammer
be29b8ff8f
Make ConfigController and PreferenceController extensible by convention
...
- Rename ConfigurationController to ConfigController
- ConfigController and PreferenceController are now subclasses of
BaseConfigController and BasePreferenceController
- Module and Application Config/Preference Tabs are detected via
the ControllerTabCollector
- Moved Controller classes to Icinga/Web/Controller (this is why
so many files are modified)
refs #4530
2013-08-14 16:08:15 +02:00
Eric Lippmann
93ae6d6811
Framework: mv Icinga\Config\Config to Icinga\Application\Config
...
refs #4543
2013-08-12 15:02:25 +02:00
Jannis Moßhammer
886da7d0cb
Fix codestyle, change wrong 'dashboard' parameter to pane causing pane switching to fail
...
- Fixed concatenation
- Added license header where missing
- Fixed the index controller fetching the wrong parameter ('dashboard' instead of 'pane')
refs #4192
2013-08-08 17:42:34 +02:00
Jannis Moßhammer
6e68826da6
Fix PSR compliance of code
...
refs #4192
2013-08-07 18:10:39 +02:00
Jannis Moßhammer
2a2966fc56
Fix Config.php relocation, fix header.phtml crashing due to old tab rendering
...
refs #4192
2013-08-07 17:51:52 +02:00
Jannis Moßhammer
488310df37
Fix style and docstrings, exception when removing the last tab
...
refs #4192
2013-08-07 17:45:09 +02:00
Jannis Moßhammer
2b25757e20
Add documentation, add errorhandling and sizing
...
The optional width/height parameter can be set in the ini to change the dashboard components
size, documentation has been added and in the error case a message with the configuration is shown
refs #4192
2013-08-07 17:44:30 +02:00
Jannis Moßhammer
f8bb478f0e
Update dashboard implementation
...
fix javascript naming (icinga-url to icingaurl), fix add form, add remove
button, code style changes
refs #4192
2013-08-07 17:43:37 +02:00