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

7718 Commits

Author SHA1 Message Date
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
Johannes Meyer 93fbb0231c loader.js: Split processRedirectHeader() to allow partly reuse 
refs #8758
 2015-07-21 16:37:21 +02:00
Johannes Meyer 7c89887773 Form: Provide an absolute url as redirect url for successful frame uploads 
refs #8758
 2015-07-21 16:35:56 +02:00
Johannes Meyer 6c9819204d Form: Only work with a single type when handling redirect urls 
$form->setRedirectUrl('some/url') still works, but $form->getRedirectUrl()
will only return instances of Icinga\Web\Url now.
 2015-07-21 16:33:24 +02:00
Johannes Meyer 9471c3c574 js: Make use of the _frameUpload parameter when submitting a form.. 
..to an iframe. This ensures that stuff like notifications are immediately
visible to the user after successful form submission.

refs #8758
 2015-07-21 15:43:47 +02:00
Eric Lippmann 4522cf5090 Add missing return to IdoQuery::getCustomvarColumnName() 
Some filter combinations still seem to not work properly.

refs #9692
 2015-07-21 15:27:01 +02:00
Johannes Meyer fc481e527b Form: Process request parameter _frameUpload 
This parameter is being used to flag a request as form submission issued
by utilizing an iframe. Appending it to a form's action causes no redirection
to take place in case of successful submission and a reduced but still valid
layout to be printed in any way. Redirection must be handled by the client
regarding the meta tag "redirectUrl".

refs #8758
 2015-07-21 15:22:24 +02:00
Johannes Meyer 0a9a066749 Form: Do not create a new instance of Url when returning the redirect url 
We're shifting parameters and by creating a new instance we'll lose
such changes.

refs #8758
 2015-07-21 15:13:56 +02:00
Johannes Meyer 570dada0d8 js: Manually submit the form if it's being automatically submitted... 
...in case we're submitting a multipart/form-data form using the iframe
fallback. The form wouldn't be submitted otherwise.

refs #8758
 2015-07-21 14:15:12 +02:00
Eric Lippmann 9dc4dbf24b Vagrant: Use CentOS 7 base boxes 
refs #9453
 2015-07-20 16:49:17 +02:00
Eric Lippmann cd4caf769b Puppet: Fix indent in puppet.sh 
refs #9453
 2015-07-20 16:48:40 +02:00
Eric Lippmann a9bb42029c Puppet: Don't fail on createlang for PostgreSQL databases 
refs #9453
 2015-07-20 16:48:02 +02:00
Eric Lippmann af4dbadd36 Puppet: Use mariadb on RHEL/CentOS >= 7 
refs #9453
 2015-07-20 16:47:29 +02:00
Eric Lippmann 2ac27e3325 Puppet: Fix icinga_packages to use the major release version of the OS 
refs #9453
 2015-07-20 16:46:25 +02:00
Eric Lippmann 7f8c589cdb Puppet: Fix epel to use the major release version of the OS 
refs #9453
 2015-07-20 16:45:21 +02:00
Eric Lippmann b74b10a6d0 Puppet: Disable api feature of Icinga 2 
refs #9453
 2015-07-20 16:44:48 +02:00
Eric Lippmann 33aa78d8b7 Puppet: Support Apache 2.4 
refs #9453
 2015-07-20 16:44:00 +02:00
Johannes Meyer c9a532a2b1 Merge branch 'bugfix/improve-form-notifications-8983' 
fixes #8983
 2015-07-20 15:54:14 +02:00
Johannes Meyer 47fbc24f17 Merge branch 'master' into bugfix/improve-form-notifications-8983 
Conflicts:
	library/Icinga/Web/Form.php
	modules/setup/application/forms/AdminAccountPage.php
 2015-07-20 15:52:10 +02:00
Johannes Meyer 37b87eb284 js: Add fallback in case XHR file uploads are not possible 
refs #8758
 2015-07-20 10:52:28 +02:00
Johannes Meyer be88683c19 layout.phtml: Add hidden iframe for non-xhr file uploads 
refs #8758
 2015-07-20 10:14:55 +02:00
Johannes Meyer 95bcb95cb5 events.js: Prevent default form submission as late as possible 2015-07-20 10:13:48 +02:00
Matthias Jentsch 5478027855 Bring back user count in ldap backend inspection 
We already use count later in the wizard anyways.

refs #9630
 2015-07-16 16:52:56 +02:00
Matthias Jentsch 67f46bab27 Merge branch 'feature/add-inspectable-api-to-db-connections-9641' 
resolves #9641
 2015-07-16 16:30:46 +02:00
Matthias Jentsch 9ba4189617 fix coding guideline violations 2015-07-16 16:27:28 +02:00
Matthias Jentsch 6d209ee203 Fix unit DB Form unit tests broken by inspection 
refs #9641
 2015-07-16 16:22:13 +02:00
Matthias Jentsch e357960d1e Add Inspection API to DB backend 
refs #9641
 2015-07-16 16:16:55 +02:00
Matthias Jentsch 31618ce2cf Fix unit DB Form unit tests broken by inspection 
refs #9641
 2015-07-16 16:15:27 +02:00
Matthias Jentsch f4054d575b Add Inspection API to db connection 
refs #9641
 2015-07-16 15:29:45 +02:00
Matthias Jentsch 3cd6d2e490 Merge branch 'feature/add-inspectable-api-to-db-and-ldap-connections-9630' 
resolves #9630
 2015-07-16 13:56:56 +02:00
Matthias Jentsch c55ba6dff4 fix coding guideline violations 2015-07-16 13:51:35 +02:00