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

151 Commits

Author SHA1 Message Date
Eric Lippmann 5fa2e3cfdc Revert "Add license header" 
This reverts commit 338d067aba.
 2015-02-03 16:16:26 +01:00
Eric Lippmann 338d067aba Add license header 
fixes #7788
 2015-02-03 15:51:04 +01:00
Eric Lippmann 2faf5f0ca1 Throw SecurityException in ActionController::assertPermission() 2015-01-30 09:34:19 +01:00
Eric Lippmann 6da3cb8403 lib: Reorder auth related functions in the ActionController 2015-01-23 09:36:05 +01:00
Eric Lippmann ef0a7c0e77 Revert "Security: Temporary grant all permissions" 
This reverts commit 9b7e75a616.

Patching function hasPermission is not enough. A fix will follow.
 2015-01-22 17:11:53 +01:00
Eric Lippmann 0f13c0428c Controller: Introduce method assertHttpMethod() 
We have actions where only certain HTTP methods, e.g. POST are allowed but they are not restricted yet.
Controller::assertHttpMethod() takes a number of allowed HTTP methods and responds with HTTP 405 in case
the current request's method is not one of the given methods.
 2015-01-22 15:47:16 +01:00
Eric Lippmann 9b7e75a616 Security: Temporary grant all permissions 
We'll introduce permissions and restrictions in the next hours. Because our web setup
does not configure permissions yet, all permissions are granted for all users from now on.
 2015-01-22 15:20:38 +01:00
Matthias Jentsch a1950aabba Fix some obsolete or wrong docstrings 2014-12-29 16:27:28 +01:00
Thomas Gelf cddb68bffb ActionController: shift global parameters globally 2014-12-03 10:40:48 +01:00
Gunnar Beutner 9a79cd58e9 Re-enable auto-refresh 2014-11-18 10:48:33 +01:00
Bernd Erk ac8cc0613c Merge branch 'master' into feature/redesign-7144 
Conflicts:
	application/views/scripts/authentication/login.phtml
	public/css/icinga/login.less
 2014-11-12 17:21:54 +01:00
Bernd Erk f9e8cc84b9 Design: headline and main menu 2014-11-06 00:09:14 +01:00
Johannes Meyer 38ee467603 Fix that the session is written too early when post-dispatching 2014-10-15 13:15:30 +02:00
Johannes Meyer cbadaa78d6 Merge branch 'master' into feature/setup-wizard-7163 2014-09-29 15:35:52 +02:00
Alexander Fuhr c8a24f72b8 Introduce getValue() in Preferences and fix the loading of values 2014-09-26 14:15:50 +02:00
Johannes Meyer c00dbf9f46 Write session on response 
There should not be any necessity to write the session once changes are
being made to it. We now track whether changes were made and write
the session when responding to the user's request if so.
 2014-09-24 10:46:35 +02:00
Eric Lippmann 264d818133 Do not save config references in the `ActionController' 
This is redundant because our `Config' class already caches loaded configs.
 2014-09-19 14:44:21 +02:00
Eric Lippmann c51b05296e Merge branch 'master' into bugfix/commands-6593 2014-09-19 13:18:47 +02:00
Eric Lippmann d091e2150c Fix `ActionController::prepareInit()' php doc 2014-09-16 18:43:14 +02:00
Alexander Fuhr b38ef9c0bd Implement plural and context based translation functionality 
refs #6982
 2014-09-16 15:19:23 +02:00
Eric Lippmann 5c647719e4 lib/ModuleActionController: Fix stupid code 2014-09-16 09:29:03 +02:00
Eric Lippmann f8edb4f220 lib: Add method `ActionController::prepareInit()' 
As it should not be required for controllers to call the parent's init() method, base controllers should use
prepareInit() in order to prepare the controller initialization.
 2014-09-16 09:28:10 +02:00
Alexander Fuhr e2b5e05f21 Implement plural translation (testing) 2014-09-15 14:11:42 +02:00
Alexander Fuhr 583fd46f15 Experimental Plural Translation Implementation 
Personal BACKUP
 2014-09-11 18:04:10 +02:00
Johannes Meyer ae9e5a40cc Merge branch 'master' into bugfix/rebuild-form-builder-5525 
Conflicts:
	application/forms/Preference/GeneralForm.php
 2014-09-08 08:46:53 +02:00
Johannes Meyer fc72ddfbc8 Adjust Preferences/GeneralForm to use handleRequest() &. Co. 
refs #5525
 2014-09-05 10:21:24 +02:00
Thomas Gelf 6faedf5733 ActionController: no benchmark for no renderer 
Benchmarks should not be shown when the renderer is no longer available.
 2014-09-02 16:49:28 +02:00
Johannes Meyer 1ba3df310c Remove BaseConfigController, User\Message and Widget\AlertMesageBox 
refs #6758
 2014-09-02 16:25:03 +02:00
Johannes Meyer fb5685bac3 Merge branch 'master' into bugfix/rebuild-form-builder-5525 
Conflicts:
	application/forms/Config/Authentication/BaseBackendForm.php
	application/forms/Config/Authentication/DbBackendForm.php
	application/forms/Config/Authentication/LdapBackendForm.php
	application/forms/Config/Authentication/ReorderForm.php
	application/forms/Config/LoggingForm.php
	application/forms/Config/ResourceForm.php
	application/forms/Preference/GeneralForm.php
	library/Icinga/Application/Config.php
	library/Icinga/Web/Form.php
	modules/monitoring/application/controllers/ConfigController.php
	modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
	modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
	modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
	modules/monitoring/application/forms/Config/SecurityForm.php
 2014-08-29 16:05:56 +02:00
Alexander Klimov 45638b218c Throw IcingaException rather than Exception 
fixes #7014
 2014-08-27 16:03:15 +02:00
Johannes Meyer bb7972aa39 Merge branch 'master' into bugfix/rebuild-form-builder-5525 
Conflicts:
	application/controllers/AuthenticationController.php
	application/controllers/ConfigController.php
	application/forms/Authentication/LoginForm.php
	application/forms/Preference/GeneralForm.php
	modules/monitoring/application/controllers/ChartController.php
 2014-08-20 13:13:50 +02:00
Thomas Gelf db3ef8fbd0 ActionController: remove redirectToLogin default 
The redirectOnLogin function now doesn't have any predefined default.
This also leads to the behaviour that "Logout" will not redirect you
anywhere on a new login while "forcibly being logged out" (e.g. by
logging out in another browser tab) will bring you back to where you
came from.
 2014-08-19 12:28:24 +02:00
Thomas Gelf 9d4a4f49c9 ActionController: JS should redirect to __SELF__... 
...once you lost your session. That's the only way to do this in a
smooth way. When the server get's an unauthenticated request for a
single container, redirecting to auth/login?redir=<that-container>
was not what you expect.

Together with JS handling __SELF__ in redirection URLs this will
play fine.

refs #6935
 2014-08-19 09:57:24 +02:00
Thomas Gelf 8f729bfb65 ActionController: set a default window title 
In case a controller action didn't set a view title this fix restores
the default title on XHR requests.

fixes #6797
 2014-07-31 17:04:26 +02:00
Johannes Meyer c3731fa79e Adjust removeresource-action to suit the new resource form interface 
refs #5525
 2014-07-24 16:17:30 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files 
refs #6309
 2014-07-15 13:43:52 +02:00
Johannes Meyer bb2c85f90b Remove forgotten ActionController::requiresConfig() call 
Should have been reverted by last commit but was not.
 2014-07-07 16:12:26 +02:00
Johannes Meyer 82d2f5ac9b Revert "Merge branch 'feature/install-wizard-6136'" 
This reverts commit 88d4262e7c, reversing
changes made to 6fae333048.

Conflicts:

	application/controllers/InstallController.php
	library/Icinga/Web/Controller/ActionController.php
 2014-07-07 15:09:03 +02:00
Thomas Gelf 0d4166b1bd ModuleActionController: fix reference, var removed 2014-07-04 12:39:23 +02:00
Thomas Gelf 3772b9c16f ActionController: set layout module name early 
Didn't work correctly before
 2014-07-04 12:33:49 +02:00
Johannes Meyer f2e5d8afa5 Remove @codeCoverageIgnoreStart/-Stop annotations 
refs #6091
 2014-06-30 13:58:37 +02:00
Thomas Gelf 59dd80ed32 ActionController: benchmark should measure rendering 
We have been cheating a little bit, now the measurement should be more
precise.
 2014-06-25 20:37:17 +02:00
Thomas Gelf 2746b5ff9f ConfigController: switch over to new config tabs 
Module configuration now takes place in module detail view and does no
longer pollute our config tabs. Modules are now able to provide a bunch
of own config tabs, we don't really care what they use them for.
 2014-06-24 21:31:59 +02:00
Thomas Gelf 3f9f4bb9e1 ModuleActionController: module object shortcut 
This helps modules with the need to know more about themselves. No
more App -> Module Manager -> Module voodoo.
 2014-06-24 20:54:39 +02:00
Thomas Gelf ea44de8698 ActionController/translate: detect domain only once 2014-06-22 20:09:23 +02:00
Thomas Gelf 23ed744747 params/_render: replace it everywhere 
Cleaning up controllers and JS, using headers only and respecting
history.
 2014-06-22 20:07:44 +02:00
Thomas Gelf 61600ae2d4 ModuleActionController: fix typo 2014-06-22 19:39:54 +02:00
Thomas Gelf 216f0f3f55 isIframe: clean up, load less html and js 
We use isIframe only when we have no JS, therefore it makes no sense
to load JS files in an iFrame. Also removed sidebar.
 2014-06-22 16:30:06 +02:00
Thomas Gelf bb23d0636c ModuleActionController: use isXhr() 2014-06-22 16:04:55 +02:00
Thomas Gelf 3774eb6889 ActionController: add isXhr() method 
Makes things easier as we use this a lot
 2014-06-22 15:36:41 +02:00