ec556edc65
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-26 09:28:35 +02:00
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
fb07f0b94c
Merge branch 'master' into feature/user-and-group-management-8826
...
Conflicts:
library/Icinga/Authentication/Backend/LdapUserBackend.php
library/Icinga/Protocol/Ldap/Query.php
2015-05-19 14:14:03 +02:00
5b3957baca
Drop the DateTimeRendererTest
...
refs #6778
2015-05-19 12:46:33 +02:00
15b2e873b2
Drop the DateTimeFactoryTest
...
refs #6778
2015-05-19 11:27:56 +02:00
82ee1d6e60
Merge branch 'master' into bugfix/significant-whitespaces-8777
...
Conflicts:
library/Icinga/Web/Widget/FilterEditor.php
2015-05-18 13:35:28 +02:00
c91d3e52ac
Merge branch 'master' into feature/user-and-group-management-8826
2015-05-12 15:39:02 +02:00
891ce0fe57
UserTest: Fix wrong assert condition for wildcard
2015-05-07 17:19:00 +02:00
e228404bf4
Adjust ConfigObjectTest as ConfigObjects are not countable anymore
...
They are of course still indirectly countable, by using Config::count() or
ConfigObject::select()::count().
2015-05-05 15:36:15 +02:00
612fefba9c
Fix the permission wildcards assertion
...
fixes #9202
2015-05-05 12:36:26 +02:00
9163fb0f0f
Drop Icinga\Protocol\Ldap\ConnectionTest
...
...located at *test*/php/library/Icinga/Protocol/Ldap/.
2015-05-04 13:40:54 +02:00
100d475b58
Fix ldap ConnectionTest
...
If I ever have to look at this test again, I'll drop it.
refs #8826
2015-05-04 13:25:07 +02:00
c441117324
LdapUserBackend: Extend Repository and implement UserBackendInterface
...
refs #8826
2015-05-04 12:18:25 +02:00
99ac0b78ea
DbUserBackend: Extend DbRepository and implement UserBackendInterface
...
refs #8826
2015-05-04 12:15:05 +02:00
5baa0590b1
Ldap\Query: Extend SimpleQuery and add missing documentation
...
refs #8826
refs #8955
2015-05-04 11:26:27 +02:00
d09ea2845d
Merge branch 'master' into feature/user-and-group-management-8826
2015-04-30 15:20:40 +02:00
034421d0cb
Fix form tests utilizing Mockery's partial mock functionality
...
Since an update of Mockery, partial mocks do not call the constructor
of their mocked classes anymore without explicitly passing a non empty
array. This is a regression of the following bug:
https://github.com/padraic/mockery/issues/144
2015-04-30 15:20:19 +02:00
adae7b34c1
Fix DbBackendFormTest and LdapBackendFormTest
...
refs #8826
2015-04-22 10:36:37 +02:00
09acddb3b7
Fix filter tests not taking whitespaces into account
...
refs #8777
2015-04-08 10:18:42 +02:00
083c1a9e6b
Fix some spelling errors in comments and messages
...
fixes #8633
Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
2015-03-08 15:32:22 +01:00
5c371a6d0b
Fix form tests
2015-03-04 09:43:37 +01:00
e4f71eacd6
Add unit tests for ldap connection behavior
...
It is important that we test handling of protocol extensions properly, to prohibit errors that are difficult to reproduce like this in the future.
fixes #7993
2015-02-27 17:11:12 +01:00
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
5b4fab0750
Add license header
...
This time without syntax errors hopefully :)
2015-02-03 16:27:59 +01:00
5fa2e3cfdc
Revert "Add license header"
...
This reverts commit 338d067aba
2015-02-03 16:16:26 +01:00
338d067aba
Add license header
...
fixes #7788
2015-02-03 15:51:04 +01:00
625fa4d738
Use shipped Zend framework in the testsuite as well
2014-11-27 11:37:18 +01:00
a3fa31c35a
PHP tests: don't require Hamcrest
2014-11-26 13:51:48 +01:00
bfa7320d85
Dashboard: Fix tests
...
refs #7751
2014-11-20 12:48:05 +01:00
8c3dbb2b45
Dashbosrd: Fix tests
...
refs #4537
2014-11-18 17:26:28 +01:00
7621f6642d
Adjust usages of Icinga\Application\Config
...
refs #7147
2014-11-18 13:11:52 +01:00
0c84bf614d
Split config functionality into two classes
...
There is now Icinga\Application\Config as our ini configuration handler and
Icinga\Data\ConfigObject as our general configuration container.
refs #7147
2014-11-18 13:02:56 +01:00
ddf2ef5cc9
Remove $request parameter from Form::onSuccess and Form::onRequest
...
fixes #7552
2014-11-14 14:59:29 +01:00
586b4f463b
Let our module autloader know that we renamed our form namespaces
...
refs #7553
2014-11-14 11:30:44 +01:00
775c20d9ad
Rename namespace Icinga\Form to Icinga\Forms
...
refs #7553
2014-11-14 10:57:14 +01:00
ac2ec83852
Merge branch 'master' into feature/localization-form-6073
...
Conflicts:
library/Icinga/Application/ApplicationBootstrap.php
test/php/library/Icinga/User/Store/DbStoreTest.php
2014-11-13 17:03:41 +01:00
b8113b688b
Update User\Store\IniStoreTest
2014-11-12 17:13:15 +01:00
8bb318eb72
Update User\Store\DbStoreTest
2014-11-12 17:12:05 +01:00
7aae291f69
Merge branch 'master' into feature/setup-wizard-7163
2014-11-12 10:08:28 +01:00
a6af51f402
Fix that Config::fromSection cannot return the actual value
...
refs #7147
2014-11-11 15:51:54 +01:00
fdfad34e5c
Do not normalize configuration keys to nested arrays in IniWriter
...
More than one nesting level (the section) is no longer allowed in configuration files. Dots in keys are now
part of the key and will not lead to a nested configuration.
fixes #7120
2014-11-11 15:05:34 +01:00
af99f62843
Prefer Icinga\Application\Config over Zend_Config
...
refs #7163
2014-11-11 12:11:14 +01:00
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
7b99b74ae1
Prefer Icinga\Application\Config instead of Zend_Config
...
refs #7147
2014-11-07 13:53:03 +01:00
4537b2932e
Fix that current(), key(), etc does not work with Config objects
2014-11-07 13:37:09 +01:00
83f386f92a
Do not extend Zend_Config in Icinga\Application\Config
...
refs #7147
fixes #7580
2014-11-06 15:41:31 +01:00
170ded6510
Merge branch 'master' into feature/setup-wizard-7163
...
Conflicts:
library/Icinga/Authentication/Backend/LdapUserBackend.php
library/Icinga/File/Ini/IniWriter.php
2014-11-04 14:22:53 +01:00
b38e3affb9
Move INI writer classes to the File namespace
...
fixes #7150
2014-10-31 10:54:53 +01:00
16352fc10c
Move Logger to the Application namespace
...
fixes #7148
2014-10-31 10:27:17 +01:00
c1bff9a26e
Merge branch 'master' into feature/setup-wizard-7163
2014-10-30 10:38:21 +01:00
Johannes Meyer
Eric Lippmann
Alexander Fuhr
Louis Sautier
Matthias Jentsch
Alexander Klimov
Marius Hein