3d50729847
Merge pull request #3091 from Icinga/fix/disable-stacktraces
...
Fix that disabled stack straces via user prefs had no effect
2017-11-16 20:23:18 +01:00
5c1d67a1ec
Merge pull request #3092 from Icinga/fix/postgresql-groupby
...
pogsql: Group by custom variables when querying them
2017-11-16 20:23:06 +01:00
6f9e18cd34
Merge pull request #3096 from Icinga/feature/role-all-users
...
Apply role to all users if the role is defined with users=*
2017-11-16 20:22:52 +01:00
f495b390da
Apply role to all users if the role is defined with users=*
...
If the users directive contains at least one single asterisk, the role is applied to all users.
So, this supports roles which define users=username, ..., * and users=*
refs #3095
2017-11-16 12:02:41 +01:00
d11519ac49
pogsql: Group by custom variables when querying them
...
Custom variables added via the URL parameters addColumns or sort must be added to the GROUP BY list when using PostgreSQL.
Credits to @nbuchwitz who came up with the initial fix for this.
refs #1873
2017-11-16 09:20:22 +01:00
af64ca8fc8
Fix that disabled stack straces via user prefs had no effect
...
Web::setupFrontController() took the user object into account when checking for disabled stacktraces.
But we changed our bootstrap order some time ago so we did not have a user in this method anymore.
Now, Web::setupUser() checks for disabled stacktaces in the user prefs instead.
refs #2595
2017-11-15 17:22:54 +01:00
166f27b947
CSS: Optimize monitoring status bar spacing
2017-11-13 15:02:06 +01:00
226efe2e16
Merge pull request #3079 from cstegm/patch-1
...
Detect UP and DOWN in plugin output to colorize output
2017-11-10 11:35:36 +01:00
bb794d6993
Detect UP and DOWN in plugin output to colorize output
...
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-11-10 11:33:52 +01:00
905ea06f53
Merge pull request #3026 from jrgensen/master
...
Fix php fatal error on monitoring/health/info when asking for json
2017-11-10 11:30:07 +01:00
fa9b2981d7
Fix PHP fatal error on monitoring/health/info when asking for JSON
...
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-11-10 11:16:33 +01:00
37a9450a0f
Merge pull request #3083 from Icinga/fix/unhandled-service-count-for-hosts
...
Fix wrong unhandled services count in host views when restrictions ar…
2017-11-10 11:14:13 +01:00
928185a144
Fix wrong unhandled services count in host views when restrictions are used
...
The query for fetching the unhandled services count utilises the hosts query as subquery.
Restrictions are applied to both the hosts query and the query for the unhandled services count.
This leads to wrong results since the restrictions are already in place for the unhandled services count because we're using the hosts query as subquery.
refs #2822
2017-11-10 10:17:32 +01:00
fd1ee57a93
Merge pull request #2752 from Icinga/bugfix/configform-transformemptyvaluestonull-does-not-handle-values-correctly-2751
...
ConfigForm: transformEmptyValuesToNull does not handle values correctly
2017-11-10 10:11:37 +01:00
f0ad3d5188
Add more test cases to the transformEmptyValuesToNull() test
...
refs #2751
2017-11-09 12:06:15 +01:00
9ed5685849
ConfigForm: Use transformEmptyValuesToNull() also in onSuccess()
...
refs #2751
2017-11-09 12:06:12 +01:00
9791e6ffb8
ConfigForm: Do not ignore false while transforming to null
...
refs #2751
2017-11-09 11:57:59 +01:00
bd6e65374d
Add test for method transformEmptyValuesToNull
...
refs #2751
2017-11-09 11:57:59 +01:00
bf20611fd4
ConfigForm: Fix that empty values are not handled correctly
...
refs #2751
2017-11-09 11:57:59 +01:00
e41f4504a1
mixedPagination: Utilize the url() helper instead of the Url class directly
2017-11-09 08:33:18 +01:00
71b1671b1f
Merge pull request #3074 from Icinga/fix/search-for-host-and-servicegroups
...
Allow to search for host and servicegroups by their case insensitive …
2017-11-08 15:42:07 +01:00
121fdaadb0
Allow to search for host and servicegroups by their case insensitive names too
...
refs #2971
2017-11-08 15:40:43 +01:00
2731027200
Merge pull request #3073 from Icinga/remove-packages-debian-directory
...
Remove packages/debian
2017-11-08 14:22:56 +01:00
a2900afc6f
Remove packages/debian
...
Have a look at the icinga-packaging repository for debian packaging.
refs #3011
2017-11-08 14:21:50 +01:00
99297a20da
Merge pull request #2962 from Icinga/travis
...
Enable PHP CodeSniffer in travis testing
2017-11-08 12:25:45 +01:00
f4ce2a5d82
Fix code style issues
2017-11-08 11:29:33 +01:00
73a6750489
Make phpcs and PhpStorm happy w/ intentional switch, case fall-throughs
...
Unfortunately, PhpStorm does not regonise PSR2 fall-through comments.
On the other hand, phpcs does not support the @noinspection phpdoc comment (/**).
The fix is a mix of PSR2 comments and @noinspection tags in code comments.
2017-11-08 10:25:28 +01:00
9921ebc2f8
test: Align icingacli test commands with default settings
...
We cleaned the default settings for travis, the CLI commands now
use the same default.
The following issue should be fixed for issues:
https://github.com/Icinga/icinga-packaging/issues/50
2017-11-08 10:07:37 +01:00
5ba3ff3c4d
travis: Update build matrix
...
* Only generate locales on precise
* Pin version of phpcs for PHP 5.3
2017-11-08 10:06:48 +01:00
c3ef50978a
style: Fix minor styleguide issues for PHPCS
2017-11-08 10:06:45 +01:00
4bffcf1ba5
style: Update icingaweb2.ruleset.xml
...
So allow common style in our code base.
2017-11-08 09:59:33 +01:00
cf4c83011f
travis: Update phpcs to 3.0.2
...
And install phpcbf
2017-11-08 09:59:33 +01:00
3412fdfac1
Enable PHP CodeSniffer in travis testing
2017-11-08 09:59:33 +01:00
cc4fcaefad
Merge pull request #2845 from Icinga/fix/translation-excludes
...
GetTextTranslationHelper: Make sure we ignore any dotfile or vendor dir
2017-11-08 09:53:54 +01:00
389b23af81
GettextTranslationHelper: Avoid descending into symlinks
...
This basically avoids loops...
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-11-08 09:53:19 +01:00
43423f9453
GetTextTranslationHelper: Make sure we ignore any dotfile or vendor dir
...
If you are using composer, or ship any other code in dotfile or vendor
directories, we should not parse that for translation.
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-11-08 09:53:19 +01:00
1a86c61c2d
Merge pull request #2843 from Icinga/bugfix/cannot-disable-missing-module-2811
...
Handle enabled, but deleted modules properly
2017-11-08 09:49:51 +01:00
cbfbb3a162
Handle enabled, but deleted modules properly
...
refs #2811
2017-11-08 09:48:58 +01:00
3fc410b8c1
Merge pull request #3068 from Icinga/feature/sort-announcements-by-date
...
Sort announcements by date
2017-11-08 09:48:09 +01:00
cd05d00b63
Sort announcements descending by start time
...
refs #2987
2017-11-08 09:46:14 +01:00
1f5f610b04
Add newlines to AnnouncementIniRepository.php
2017-11-07 14:48:46 +01:00
5ec14bdb9d
Remove inheritdoc tags in AnnouncementIniRepository.php
2017-11-07 12:50:30 +01:00
26032a0413
Merge pull request #2984 from deric/solarized
...
Solarized dark theme
2017-11-07 09:13:30 +01:00
0a188740d3
Solazired theme: Improve colors and module styles
...
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-11-07 09:10:20 +01:00
751da3c762
Add solarized dark theme
...
Signed-off-by: Eric Lippmann <eric.lippmann@icinga.com>
2017-11-07 09:10:20 +01:00
37275ee799
Merge pull request #3034 from Icinga/bugfix/doc-module-sends-wrong-content-type-for-images-2918
...
ModulesController: use setter for headers and response code
2017-11-07 09:05:11 +01:00
94922ade25
Merge pull request #3061 from ss23/crypt_fix
...
Modify authentication function to support alternative algorithms
2017-11-06 11:06:06 +01:00
c196a7c7c4
Modify authentication function to support alternative algorithms
...
The existing usage of crypt() was borderline incorrect. This simplified
function will allow hashes of other types (e.g. bcrypt) and thus
mitigate #2954 (use password_hash) until this can be implemented.
The getSalt protected method was also removed as this is no longer
required, though this can be added again in future.
2017-11-06 22:48:42 +13:00
2d9b6ea538
Merge pull request #3022 from Icinga/feature/wip-file-storage-abstraction
...
[WIP] Add file storage abstraction
2017-11-06 10:34:54 +01:00
2cced5fe13
Implement local file storage
2017-11-06 10:33:54 +01:00
lippserd
Eric Lippmann
Florian Strohmaier
cstegm
Klaus Jrgensen
Noah Hilverling
Johannes Meyer
Markus Frosch
Alexander A. Klimov
Tomas Barton
ss23