Commit Graph

3716 Commits

Author SHA1 Message Date
f0o
dcbe31fe6b Added last-check on services 2016-02-22 08:38:51 +00:00
Neil Lathwood
46a17eabf0 Merge pull request #2957 from Rosiak/issue-2557
Make Global Search Limit Configurable
2016-02-20 10:30:48 +00:00
Eldon Koyle
70712dafab Use instead of 2016-02-18 17:18:30 -07:00
Eldon Koyle
22a81e0424 Use unique id for bootgrid table in alert widget so there can be more than one 2016-02-17 15:04:50 -07:00
Daniel Preussker
b5ebaf3135 Merge pull request #3019 from pblasquez/pblasquez-unauth_graph
skip graph.php authentication if configured
2016-02-17 21:47:33 +00:00
pblasquez
823177e877 Update graph.php 2016-02-17 13:06:46 -08:00
Daniel Preussker
731e43bc66 Revert "[WIP] Sanity!" 2016-02-17 13:59:58 +00:00
laf
371f561b9e Removed content-type 2016-02-17 13:31:28 +00:00
pblasquez
adedd872ae Update graph.php 2016-02-16 19:46:22 -08:00
Neil Lathwood
633ac101eb Merge pull request #2979 from f0o/sanity
[WIP] Sanity!
2016-02-16 21:44:10 +00:00
Morrvick
7aa2b1fa28 Ignore devices that do not provide an uptime statistic.
Hundreds of my devices do not supply an uptime in their data.  This causes lots of useless warnings in my availability map.  This tweak corrects that.
2016-02-15 11:44:05 -06:00
Rosiak
1c630b0b8d Move function to WebUI
Based on Neil’s suggestion.
2016-02-13 21:09:45 +01:00
Tony Murray
f824fd123e Always define $config_total. Default is 1. 2016-02-12 14:44:32 -06:00
Tony Murray
564146dc8c Fix inverted diff. 2016-02-12 14:40:04 -06:00
Tony Murray
31897758e5 Restore $config['oxidized']['features']['versioning']. 2016-02-12 14:27:55 -06:00
Tony Murray
cc344bf3c3 Use Oxidized's built in diffing capability. Drops the need for xdiff and one http call. 2016-02-12 14:21:55 -06:00
Tony Murray
28216f67b0 Merge branch 'master' into config_diff 2016-02-12 10:36:18 -06:00
Tony Murray
aa9d4798dc Remove $config['oxidized']['features']['versioning']. I did not update the schema to remove the entry from the config table.
Update the documentation a bit.

Issue #2812
2016-02-12 10:23:49 -06:00
Daniel Preussker
e064d7ddff Merge pull request #2988 from laf/issue-2947
Added show/hide line numbers button to show config page
2016-02-12 08:12:41 +00:00
laf
6b7030c082 Added show/hide line numbers button to show config page 2016-02-11 23:19:56 +00:00
laf
4aaf4d8a7b Added missing from email settings field 2016-02-11 22:11:07 +00:00
Neil Lathwood
a9e81c2bfb Merge pull request #2955 from arjitc/patch-24
Merge launch, SSH, telnet and settings into 1 dropdown
2016-02-11 21:43:26 +00:00
f0o
568875ad83 reset array pointers 2016-02-11 07:42:00 +00:00
Tony Murray
3eddfd46bd Import GeSHi diff type. 2016-02-10 19:31:31 -06:00
Tony Murray
9a2d22df0a Remove array_column() use, it requires php 5.5 2016-02-10 19:24:13 -06:00
Tony Murray
0e8ea8b6b2 Mark displayed diffs. 2016-02-10 17:16:59 -06:00
Neil Lathwood
9cca64de4c Merge pull request #2961 from pblasquez/pblasquez-application_json_patch
Missed one file for application/json headers
2016-02-10 21:27:52 +00:00
pblasquez
c53e4de20c Update ajax_setresolution.php 2016-02-10 13:22:22 -08:00
Tony Murray
b5106f4e17 Generate and display diffs between versions. Clicking show diff generates a diff between the shown version and the selected version. 2016-02-10 14:51:40 -06:00
Neil Lathwood
fa783dc07e Merge pull request #2841 from adaniels21487/issue-2665
Cisco OTV
2016-02-10 19:49:59 +00:00
f0o
c767a26732 more bulk sanity 2016-02-10 16:02:13 +00:00
f0o
f606369309 Bulk cosmetic fixes 2016-02-10 15:40:50 +00:00
f0o
2e59ada075 Eventlog cosmetic fixes 2016-02-10 15:31:37 +00:00
f0o
375d7ca4af Cosmetic fix on Alert-Rules 2016-02-10 15:26:17 +00:00
f0o
21e94b3e3a Sanity! 2016-02-10 15:21:31 +00:00
Daniel Preussker
2b55c06d9e Revert "Variable/Environment sanity" 2016-02-10 14:31:16 +00:00
f0o
8d9b522bdb Remove redundant calls 2016-02-10 13:54:22 +00:00
f0o
a6bca987bf Enforce sanity before returning from database 2016-02-10 13:52:43 +00:00
f0o
37dccb3932 First effort in bringing some sanity 2016-02-10 13:42:55 +00:00
Tony Murray
8849cee3f4 Missed this while fixing sensor data with 0 values. 2016-02-09 15:42:46 -06:00
Neil Lathwood
29f3dac9be Merge pull request #2972 from murrant/issue-2883
Deal with 0 value for sensor data better.
2016-02-09 21:11:26 +00:00
Tony Murray
e3ec42c06d Deal with 0 value for sensor data better.
Issue #2883
2016-02-09 14:20:36 -06:00
Neil Lathwood
3704ff2c67 Merge pull request #2964 from ohrensessel/correct-quotes
Fix usage of single quotes, double quotes needed
2016-02-09 20:10:51 +00:00
Neil Lathwood
758facd4bf Merge pull request #2958 from murrant/calix
Calix Support
2016-02-09 20:06:27 +00:00
Neil Lathwood
5f0c150d42 Merge pull request #2946 from murrant/oxidized_group_versions
Fix oxidized versioning + groups
2016-02-09 19:25:22 +00:00
ohrensessel
b016763007 Fix usage of single quotes, double quotes needed 2016-02-09 13:27:10 +01:00
pblasquez
2a98a2825f Update ajax_setresolution.php 2016-02-08 16:29:53 -08:00
Rosiak
f4d5e21dab Make Global Search Limit Configurable
#2557
2016-02-08 22:15:24 +01:00
Tony Murray
f177dd6608 Merge branch 'master' into calix 2016-02-08 14:20:14 -06:00
Arjit Chaudhary
9cd0820445 use bootstraps own pull-right so that the dropdown draws inside the page width 2016-02-08 22:55:18 +05:30