Commit Graph

102 Commits

Author SHA1 Message Date
Eric Lippmann e36c430bb3 Merge branch 'feature/protected-menu-8720'
resolves #8720
2015-03-13 04:26:19 +01:00
Eric Lippmann 8563d5ed3f PHPDoc: Use @var instead of @type
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
2015-03-12 16:08:47 +01:00
Eric Lippmann 90971f2caf Revert "Merge branch 'feature/organize-headings-7976'"
This reverts commit ea2a17a76c, reversing
changes made to e72de8dfe1.

refs #7976
fixes #8647
2015-03-12 16:08:34 +01:00
Eric Lippmann 195fe6f04b Security: Rename system/config/modules to config/modules
Module config permission and application config permission have to be separeted.
Application config related permissions were added beneath config/application and module
related config permissions will be config/modules for now.

refs #8720
2015-03-12 15:45:14 +01:00
Eric Lippmann f6e9551235 Security: Rename system/config/roles to config/application/roles
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
2015-03-12 15:45:10 +01:00
Eric Lippmann 08abbda152 Security: Rename system/config/resources to config/application/resources
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
2015-03-12 15:45:07 +01:00
Eric Lippmann a4e81c320a Security: Rename system/config/authentication to config/application/authentication
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
2015-03-12 15:45:04 +01:00
Eric Lippmann 956bc3c07a Security: Rename system/config/application to config/application/general
Module config permission and application config permission have to be separeted.
Application config related permissions will be added beneath config/application and module
related config permissions will be added beneath config/modules.

refs #8720
2015-03-12 15:44:58 +01:00
Johannes Meyer f45f00b022 Run a module's configuration script only in case it has been registered
fixes #8601
2015-03-06 13:25:04 +01:00
Johannes Meyer 4324385010 Do not load a module twice while enabling it 2015-03-06 13:22:51 +01:00
Johannes Meyer 4ba281e7e8 Config: Use native form title and description support where appropriate
refs #7947
refs #7976
2015-03-02 18:40:47 +01:00
Johannes Meyer f2259557c8 Fix missing tab labels
fixes #8518
2015-02-27 09:32:44 +01:00
Johannes Meyer 956efe5ef9 Merge branch 'master' into feature/link-labels-8458
Conflicts:
	application/views/scripts/config/application.phtml
	application/views/scripts/config/module.phtml
	application/views/scripts/config/modules.phtml
	library/Icinga/Web/Widget/Dashboard/Dashlet.php
	modules/monitoring/application/controllers/TimelineController.php
2015-02-24 08:42:36 +01:00
Johannes Meyer 64a4dc67bc Add proper titles to all config tabs
refs #8458
2015-02-23 16:50:31 +01:00
Marius Hein ce3a564de7 Header: Add header to tabs extension
refs #7976
2015-02-13 11:26:09 +01:00
Eric Lippmann 6bae2e0a53 Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Eric Lippmann 5b4fab0750 Add license header
This time without syntax errors hopefully :)
2015-02-03 16:27:59 +01:00
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 4bac5dfc37 security: Guard application and module configuration 2015-02-02 14:16:26 +01:00
Carlos Cesario 8d8b65473a Add translation to some strings
Thank you Carlos.

resolves #7787

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2014-12-03 10:00:54 +01:00
Eric Lippmann e5d8fc7208 Rename the 'Permissions' tab to 'Roles' 2014-11-25 16:11:01 +01:00
Eric Lippmann f0ece3d88a Revert "Remove permissions and restrictions for now"
This reverts commit 8335bdcb32.

Readd permissions and restrictions.
2014-11-25 16:11:01 +01:00
Eric Lippmann 8335bdcb32 Remove permissions and restrictions for now
Our first beta release will not include permissions and restrictions.
We'll better test it before making it public.
2014-11-20 16:14:00 +01:00
Eric Lippmann bfdf34b6bf Security: Add permissions as tab to config
refs #5647
2014-11-19 15:32:25 +01:00
Johannes Meyer 4ab5b2abf3 Fix anonymous onSuccess callbacks 2014-11-18 13:12:30 +01:00
Johannes Meyer 7621f6642d Adjust usages of Icinga\Application\Config
refs #7147
2014-11-18 13:11:52 +01:00
Johannes Meyer 775c20d9ad Rename namespace Icinga\Form to Icinga\Forms
refs #7553
2014-11-14 10:57:14 +01:00
Johannes Meyer 9d292269b1 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/LdapResourceForm.php
	test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
2014-11-11 09:44:11 +01:00
Johannes Meyer 7b99b74ae1 Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
2014-11-07 13:53:03 +01:00
Johannes Meyer ffc69c378c Fix typo in ConfigController::moduleenableAction() 2014-10-24 13:49:49 +02:00
Alexander Fuhr f7b7e0283a Translation: another bunch of translatable strings 2014-09-29 15:20:19 +02:00
Johannes Meyer f53519c54d Rename ConfigForm::setConfig() to ConfigForm::setIniConfig()
We do not want to override Zend_Form::setConfig() so this renaming is
required. set*Ini*Config() because ConfigForm::save() utilizes an ini-writer
to persist the configuration to disk.

refs #5525
2014-09-08 13:31:25 +02:00
Johannes Meyer 5464321a1b ConfigController: Remove obsolete functionality 2014-09-02 16:25:03 +02:00
Johannes Meyer 1ba3df310c Remove BaseConfigController, User\Message and Widget\AlertMesageBox
refs #6758
2014-09-02 16:25:03 +02:00
Johannes Meyer 2d86e6ba3b Rename ResourceForm and make it use handleRequest() & Co.
refs #5525
2014-09-02 16:25:03 +02:00
Johannes Meyer deebb64869 Adjust Icinga\Form\Config\General* to use handleRequest() & Co.
refs #5525
2014-09-01 16:16:56 +02:00
Johannes Meyer 0e63e36ec0 Move Icinga\Form\Config\ConfirmRemovalForm to Icinga\Form
This is a generic form not necessarily being used just for configuration
purposes.

refs #5525
2014-09-01 15:11:09 +02:00
Johannes Meyer ae35650c7e Adjust authentication backend forms to suit.. some form implementation
refs #5525
2014-08-29 15:16:13 +02:00
Johannes Meyer 403f745488 Remove obsolete loggingAction
refs #6933
2014-08-22 12:34:33 +02:00
Johannes Meyer bc05d2ee64 Merge LoggingForm into GeneralForm
fixes #6933
2014-08-22 11:05:20 +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
Alexander Fuhr 2f54ff4797 Fix the unrelated tabs
resolves #6934
2014-08-19 13:18:52 +02:00
Alexander Fuhr c69af6c5d2 Move "modules" to "System" menu
resolves #6934
2014-08-19 11:14:18 +02:00
Johannes Meyer e6bcda260d Redirect after a new resource has been created successfully
refs #5525
2014-08-12 10:42:28 +02:00
Alexander Klimov e07f2a2b0d Show an error message if a ConfigurationError is thrown 2014-07-29 12:25:48 +02:00
Alexander Klimov 644b3a1628 Make it possible to remove an authentication backend
refs #6434
2014-07-25 14:49:05 +02:00
Alexander Klimov c06db7495b Merge remote-tracking branch 'origin/bugfix/rebuild-form-builder-5525' into bugfix/autologin-backend-form-6434 2014-07-25 10:57:08 +02:00
Alexander Klimov 50de21e437 Make it possible to edit an authentication backend
refs #6434
2014-07-25 10:29:33 +02:00
Alexander Klimov af898cc2b3 Prefer switch rather than if - elseif 2014-07-24 17:35:26 +02:00