Commit Graph

7448 Commits

Author SHA1 Message Date
Michael Friedrich bba7cb1463 Vagrant: Use centos71 base box from icinga.org
refs #9453
2015-07-24 14:34:13 +02:00
Michael Friedrich f0fc8b8e90 Vagrant: slapd must be running, add provision hint to docs
For some reason the initial ldap provisioning might fail even
after ensuring that slapd is running. Yet another `vagrant provision`
will fix the issue.

refs #9453
2015-07-24 14:33:06 +02:00
Johannes Meyer e06281a427 Merge branch 'feature/ldap-auth-backend-discovery-9602'
resolves #9602
2015-07-24 10:52:32 +02:00
Johannes Meyer 56759e7f21 Merge branch 'master' into feature/ldap-auth-backend-discovery-9602 2015-07-24 10:52:14 +02:00
Johannes Meyer 75a48a3b35 Drop LdapBackendFormTest
It's redundant now, we should test the inspection code directly instead.
2015-07-24 10:51:46 +02:00
Johannes Meyer f8f8a4c848 Drop DbBackendFormTest
It's redundant now, we should test the inspection code directly instead.
2015-07-24 10:51:33 +02:00
Johannes Meyer 216b762d12 Wizard: Fix layout of form hints 2015-07-24 10:28:14 +02:00
Johannes Meyer 624309774b Fix style of buttons used for reordering user backends 2015-07-24 10:14:18 +02:00
Johannes Meyer 3b4bb6d890 ifont: Add new icons up|down|right|left-small 2015-07-24 10:13:26 +02:00
Johannes Meyer ce1cab53c8 css: Move button styles from the setup module into the framework 2015-07-24 10:11:31 +02:00
Eric Lippmann 12856da971 Merge branch 'bugfix/filter-custom-variables-9692'
fixes #9692
2015-07-24 09:27:05 +02:00
Johannes Meyer 760c7e4374 LdapBackendForm: Allow to discover a connection's default settings
refs #9602
2015-07-23 17:42:02 +02:00
Johannes Meyer f06be5c9bc LdapConnection: Let self::bind() return $this 2015-07-23 17:34:09 +02:00
Johannes Meyer 8ed816002b forms.less: Remove redundant margin from form elements in control groups
refs #9602
2015-07-23 17:33:29 +02:00
Johannes Meyer 44643a6c4b PreferenceForm: Improve button placement 2015-07-23 16:49:50 +02:00
Johannes Meyer 073243364d forms.less: Re-introduce class control-groups
refs #9602
2015-07-23 16:49:19 +02:00
Johannes Meyer 0448323697 InstanceConfigForm: Translate exceptions shown to the user 2015-07-23 16:18:44 +02:00
Johannes Meyer 666c401a40 BackendConfigForm: Translate exceptions shown to the user 2015-07-23 16:18:35 +02:00
Johannes Meyer 4e3da3a6eb UserBackendConfigForm: Adjust how to process requests...
...and use sub-forms, finally.

refs #9602
2015-07-23 16:18:09 +02:00
Thomas Gelf 727a2d7141 Paginator: relax requirements to Paginatable
* we need no full query interface here
* introduced new interface "Paginatable"

fixes #9483
2015-07-23 13:48:49 +02:00
Eric Lippmann 593f90f330 Puppet: Fix that the LDAP server is empty when using CentOS 7 2015-07-23 12:40:51 +02:00
Eric Lippmann b4861fe689 Puppet: Set date.timezone for PHP in a separate INI file 2015-07-23 12:40:12 +02:00
Eric Lippmann af6def7d7f Puppet: Use strings for file modes 2015-07-23 12:39:36 +02:00
Eric Lippmann 67af7b5135 Puppet: Don't install icinga2-debuginfo 2015-07-23 12:39:12 +02:00
Eric Lippmann 3ffe657f71 Puppet: Use future parser 2015-07-23 12:37:23 +02:00
Johannes Meyer 1d3a0f63eb BackendConfigForm: Fix that skipping the schema validation is not possible
fixes #9719
2015-07-23 12:25:30 +02:00
Eric Lippmann 910dee199f Fix form test 2015-07-22 14:21:53 +02:00
Eric Lippmann a75b1a35c6 monitoring: Don't fail when selecting custom variables while having a group by clause
refs #9692
2015-07-22 13:47:52 +02:00
Eric Lippmann 63c51c01e0 monitoring: Auto-refresh tactical overview every 15 seconds
fixes #9626
2015-07-22 13:40:50 +02:00
Eric Lippmann 13d954a956 Fix rawurlencode call 2015-07-22 13:36:25 +02:00
Eric Lippmann b8c2c33086 Merge branch 'feature/vagrant-centos-7-9453'
resolves #9453
2015-07-22 13:35:18 +02:00
Eric Lippmann 52e352751e Revert "ModuleActionController: fix forward/X-Icinga-Module"
This reverts commit bf82bd4ce1.

We have a not merged branch for this.

refs #9349
2015-07-22 13:34:44 +02:00
Markus Frosch ab8e775188 Fix duplicate headers on forward() inside a controller
This avoids that the JS loader flattening arrays.

refs #9349
2015-07-22 13:34:44 +02:00
Johannes Meyer 1e9ce1d0d5 Merge branch 'feature/support-for-file-uploads-8758'
resolves #8758
2015-07-22 13:32:17 +02:00
Johannes Meyer 54a77b7253 Merge branch 'master' into feature/support-for-file-uploads-8758 2015-07-22 13:30:56 +02:00
Johannes Meyer 0f2351ff1d js: Fix XHR loading of URLs in case window.FormData is not supported
refs #8758
2015-07-22 13:29:44 +02:00
Johannes Meyer a199d36207 Stylesheet: Disable extendend @import statements provided by LESS
fixes #9687
2015-07-22 12:45:10 +02:00
Eric Lippmann 15cb24c6dc Throw an exception in IdoQuery::getCustomvarColumnName() in case the custom variable has not been joined
Queries extending IdoQuery and using the method getCustomvarColumnName() must be notified in case the custom variable has not been joined.

refs #9692
2015-07-22 12:03:34 +02:00
Eric Lippmann 3ed13366a8 Remove duplicate line in IdoQuery
I introduced this w/ 4522cf5090.
2015-07-22 12:03:34 +02:00
Thomas Gelf c5d68995ec forms.less: top-align field lables and related...
...items like icons. They used to be bottom-aligned, resulting in
slightly confusing form layouts when text areas where involved.
2015-07-22 11:03:01 +02:00
Thomas Gelf d44547e469 forms.less: textarea should look like other inputs 2015-07-22 10:57:14 +02:00
Thomas Gelf bf82bd4ce1 ModuleActionController: fix forward/X-Icinga-Module 2015-07-22 10:53:42 +02:00
Johannes Meyer cecd94be50 Merge branch 'master' into feature/support-for-file-uploads-8758 2015-07-22 08:47:24 +02:00
Johannes Meyer c0de2e6ee3 Form: Add missing use statement for the ProgrammingError exception 2015-07-22 08:39:24 +02:00
Eric Lippmann 45ef285e3d RPM: Let php-Icinga require Zend and Zend's MySQL and PostgreSQL adapters
This installs both the MySQL and PostgreSQL libs even if the user only wants to use either MySQL or PostgreSQL. But the depencies installed--mysql-libs and postgresql-libs respectively--are so minimal that this is a good trade off for managing our dependencies atm.

fixes #9314
2015-07-21 17:32:17 +02:00
Eric Lippmann ce2b686252 Add file and line of logged menu item renderer exceptions
fixes #9696
2015-07-21 16:54:23 +02:00
Johannes Meyer b4214dcf32 FormTest: getRedirectUrl now returns an instance of Icinga\Web\Url 2015-07-21 16:49:59 +02:00
Johannes Meyer 8f2849f32a Form: Improve code readability..
..and avoid the necessity to provide another mock when testing
Form::handleRequest().

refs #8758
2015-07-21 16:48:56 +02:00
Eric Lippmann 163911ffd7 Indicate empty icinga_programstatus table as problem
fixes #9695
2015-07-21 16:47:17 +02:00
Johannes Meyer 5e1ea958b4 js: Correctly process the redirectUrl-meta tag for successful frame uploads
refs #8758
2015-07-21 16:38:52 +02:00