Johannes Meyer
625fa4d738
Use shipped Zend framework in the testsuite as well
2014-11-27 11:37:18 +01:00
Alexander Klimov
ecc49d3f86
Merge branch 'bugfix/History-grid-should-allow-filters-6638'
...
fixes #6638
2014-11-26 16:31:55 +01:00
Alexander Klimov
0b3e306b8a
Event history: display filter editor
...
refs #6638
2014-11-26 16:13:02 +01:00
Alexander Klimov
badad1df44
Event history: move sort control to the right
...
refs #6638
2014-11-26 16:13:02 +01:00
Alexander Klimov
fb6b2a7273
icingaweb2_dev: install Mockery
2014-11-26 14:03:04 +01:00
Alexander Klimov
003567fae8
Merge branch 'master' into feature/deduplicate-puppet-code-6842
2014-11-26 13:53:46 +01:00
Alexander Klimov
a3fa31c35a
PHP tests: don't require Hamcrest
2014-11-26 13:51:48 +01:00
Alexander Klimov
9e23ca0920
icingaweb2_dev: add default user `icingaadmin'
2014-11-26 12:32:22 +01:00
Johannes Meyer
ca1dafeec3
Add hint to the requirements page's refresh button to restart the webserver
...
fixes #7839
2014-11-26 10:42:44 +01:00
Johannes Meyer
d25a3a1704
Show path to the php.ini on the wizard's requirements page
...
refs #7839
2014-11-26 10:38:39 +01:00
Johannes Meyer
e82cc35043
Re-add a description to the setup wizard
...
If someone has a better alternative don't hesitate
to replace this with a valid description.
fixes #7836
2014-11-26 08:58:09 +01:00
Johannes Meyer
ff19696429
Add --path argument to the setup's welcome page examples if necessary
...
refs #7581
2014-11-26 08:58:08 +01:00
Alexander Klimov
0bec42930b
icingaweb2_dev: enable LDAP authentication
2014-11-25 18:11:25 +01:00
Alexander Klimov
ef2758125b
icingaweb2_dev: populate openldap
2014-11-25 17:50:33 +01:00
Alexander Klimov
777ced392f
icingaweb2_dev: change default log level to `DEBUG'
2014-11-25 17:46:29 +01:00
Alexander Klimov
13059aa236
icinga2_dev: use module `icinga2_pgsql'
2014-11-25 16:53:29 +01:00
Alexander Klimov
94869bff5e
Add module `icinga2_pgsql'
2014-11-25 16:53:29 +01:00
Eric Lippmann
1502b489cd
Auto-refresh display of a host's services
2014-11-25 16:35:09 +01:00
Alexander Klimov
2cf7563f2e
icingaweb2_dev: drop backend `localfile'
2014-11-25 16:25:11 +01:00
Eric Lippmann
3c16db3b0d
Roles: Fix header position
2014-11-25 16:16:31 +01:00
Alexander Klimov
8959fa3602
icingaweb2_dev: add resource for PgSQL
2014-11-25 16:15:37 +01:00
Eric Lippmann
9aa2f6f555
Roles: Speak of 'roles' not 'permissions'
2014-11-25 16:11:02 +01:00
Eric Lippmann
bc339e927b
Roles: Fix redirect URL
2014-11-25 16:11:02 +01:00
Eric Lippmann
d226126b6c
Roles: Fix tab activation
2014-11-25 16:11:02 +01:00
Eric Lippmann
381b3b9a19
Move the permissions view scripts beneath roles
2014-11-25 16:11:01 +01:00
Eric Lippmann
0a1668acf6
Fix tab names in the RolesController
2014-11-25 16:11:01 +01:00
Eric Lippmann
2f02ac2f01
Fix the RolesController's class name
2014-11-25 16:11:01 +01:00
Eric Lippmann
e5d8fc7208
Rename the 'Permissions' tab to 'Roles'
2014-11-25 16:11:01 +01:00
Eric Lippmann
974357c84f
Rename /permissions to /roles
2014-11-25 16:11:01 +01:00
Eric Lippmann
f0ece3d88a
Revert "Remove permissions and restrictions for now"
...
This reverts commit 8335bdcb32063549b8b7dec1c32edc1d7c457b96.
Readd permissions and restrictions.
2014-11-25 16:11:01 +01:00
Eric Lippmann
df42eba69a
Revert "Use /usr/bin/env instead of hard-coding paths"
...
This reverts commit 42b0469a96a17fc2f0eac200b94f46990008ee60.
Packaged verions of our scripts must use a system installation of the interpreter for obvious reasons.
I also disapprove using env in our Git. We want to use a system installation of the interpreter too. Not something that's supposed to be the interpreter.
Also, potential incomplete or defective local versions of the interpreter must not be our concern.
That installations from source using /usr/bin/php do not work out of the box on FreeBSD for example is of course an issue. But that should not be fixed by blindly using env.
refs #7789
2014-11-25 16:11:01 +01:00
Eric Lippmann
d41602a67c
Rearrange imports in Menu.php
2014-11-25 16:11:01 +01:00
Johannes Meyer
a288535347
Use the host' and port' directives when using a zend adapter in DbTool
...
fixes #7781
fixes #7798
2014-11-25 16:03:06 +01:00
Alexander Klimov
dbf8527fc9
git_cmmi: don't clone a git repo more than once
2014-11-25 15:42:15 +01:00
Alexander Klimov
31a49a7c95
Don't start ido2db-*sql
2014-11-25 15:24:32 +01:00
Alexander Klimov
c737f18162
Don't install jQuery
2014-11-25 15:07:43 +01:00
Alexander Klimov
fbe603c23f
Merge branch 'master' into feature/deduplicate-puppet-code-6842
2014-11-25 13:58:35 +01:00
Gunnar Beutner
b2ba8e3576
Update example config for 2.3
2014-11-25 13:54:43 +01:00
Alexander Klimov
edd8eced5d
icingaweb2_dev: update SQL schema file paths
2014-11-25 12:55:51 +01:00
Alexander Klimov
1ce99d277a
Merge branch 'master' into feature/deduplicate-puppet-code-6842
...
Conflicts:
.vagrant-puppet/manifests/default.pp
packages/rpm/etc/icingaweb2/resources.ini
2014-11-25 12:29:42 +01:00
Alexander Klimov
ba7fa85cff
Vagrantfile: complete puppet.module_path
2014-11-25 12:17:00 +01:00
Alexander Klimov
de8dc64b69
Rename successor.pp -> default.pp
2014-11-25 11:49:59 +01:00
Alexander Klimov
a1ccd01776
Rename default.pp -> default.pp.old
2014-11-25 11:48:12 +01:00
Alexander Klimov
c982ef4f9a
Add successor for '.vagrant-puppet/manifests/default.pp'
...
refs #7321
2014-11-25 11:45:05 +01:00
Alexander Klimov
607b0fc0c4
icingaweb2_dev: include and require Class[icinga_packages]
...
refs #6842
2014-11-24 14:44:17 +01:00
Alexander Klimov
30ee6c9411
Ensure that every package's latest version is installed
...
refs #6842
2014-11-24 14:42:07 +01:00
Gunnar Beutner
42b0469a96
Use /usr/bin/env instead of hard-coding paths
...
fixes #7789
2014-11-21 21:59:14 +01:00
Eric Lippmann
eed10159fd
Menu: Don't render sub menus when a dot appears in the label
...
I guess this was intended to be a feature. Turns out to be a bug though :)
fixes #7772
2014-11-21 17:39:18 +01:00
Eric Lippmann
d84318d8b8
Fix Menu's PHPDoc
...
Don't use @var and don't use @return self for fluent interfaces.
2014-11-21 17:13:39 +01:00
Eric Lippmann
2843490250
monitoring: Translate "Plugin Output"
2014-11-21 16:45:39 +01:00
