Commit Graph

9562 Commits

Author SHA1 Message Date
Neil Lathwood
d3132a190b Merge pull request #2690 from vitalisator/stp
add basic STP/RSTP support
2016-01-10 22:45:24 +00:00
Neil Lathwood
72cc180184 Merge pull request #2719 from SaaldjorMike/del-utime-func
Replaced custom utime() function with microtime(true)
2016-01-10 22:43:31 +00:00
Neil Lathwood
6cfacabca1 Merge pull request #2720 from ekoyle/nos_fix
Remove some detection logic from Brocade NOS foo
2016-01-10 22:40:42 +00:00
Søren Rosiak
7ac249bc2a Merge pull request #2743 from laf/issue-2469 2016-01-10 22:58:39 +01:00
Mike Rostermund
d3248f8100 Merge pull request #2744 from laf/issue-2667
Removed onClick from ports list
2016-01-10 18:39:39 +01:00
Neil Lathwood
6d076fc5d3 Merge pull request #2742 from Rosiak/issue-2736
Basic HWGroup Poseidon Discovery
2016-01-10 17:25:03 +00:00
laf
802d0993d9 Removed onClick from ports list 2016-01-10 17:19:58 +00:00
laf
cc2dfafffa Fix polling issue for AirFibre 2016-01-10 16:46:31 +00:00
Rosiak
b1e962b673 Copy paste fix 2016-01-10 17:41:43 +01:00
Neil Lathwood
e3e1b5f6ab Merge pull request #2729 from davehope/master
Create zyxelgs.inc.php
2016-01-10 16:29:18 +00:00
Neil Lathwood
44456aa58d Merge pull request #2741 from arjitc/patch-23
Add missing titles/headers
2016-01-10 16:21:24 +00:00
Rosiak
a265f9a8dc Basic HWGroup Poseidon Discovery
Initial PR
2016-01-10 14:58:56 +01:00
Arjit Chaudhary
68a4acd717 Update device.inc.php 2016-01-10 19:01:59 +05:30
Arjit Chaudhary
3b09f8b955 Update ports.inc.php 2016-01-10 19:01:42 +05:30
Arjit Chaudhary
03051d455f Update apps.inc.php 2016-01-10 19:01:24 +05:30
Arjit Chaudhary
6a652b72fa Update alerts.inc.php 2016-01-10 19:01:08 +05:30
Arjit Chaudhary
659d4e0172 Update alert-rules.inc.php 2016-01-10 19:00:49 +05:30
Arjit Chaudhary
eedc30aae5 Add missing titles/headers 2016-01-10 19:00:04 +05:30
Daniel Preussker
cce8bc5f26 Merge pull request #2697 from laf/versions
Centralised version info + used in output
2016-01-10 13:28:10 +00:00
Dave Hope
7fbdb5e440 Merged changes for Zyxel ES and GS series switches under 'Zynos'. 2016-01-10 10:39:12 +00:00
Daniel Preussker
feb524f0da Merge pull request #2739 from paulgear/dash-typo-fix
Fix typo & clarify location of edit dashboard button
2016-01-10 10:08:44 +00:00
Paul Gear
f123502730 Fix typo & clarify location of edit dashboard button 2016-01-10 15:18:25 +10:00
laf
63444e2f39 Rebased 2016-01-10 00:41:20 +00:00
Neil Lathwood
a3e972f86a Merge pull request #2730 from arjitc/patch-22
Fixes #2724 -- Added mysqli to install.php if PHP 7
2016-01-10 00:33:26 +00:00
Arjit Chaudhary
815a3e72e6 Fixes #2724 -- Added mysqli to install.php if PHP 7 2016-01-10 03:23:34 +05:30
Dave Hope
152c45bc36 Create zyxelgs.inc.php
Add support for Zyxel GS1910-24HP (And likely others)
2016-01-09 18:24:13 +00:00
Daniel Preussker
af95e46a50 Merge pull request #2727 from nguillaumin/fix-pear-comment-install
Fixes #2725: Wrong suggestion to install PEAR
2016-01-09 13:18:05 +01:00
Daniel Preussker
57414979ca Merge pull request #2726 from nguillaumin/contributor-agreement
I agree to the conditions of the Contributor Agreement
2016-01-09 12:58:01 +01:00
nguillaumin
49e183a72f I agree to the conditions of the Contributor Agreement
contained in doc/General/Contributing.md.
2016-01-09 22:54:41 +11:00
nguillaumin
ceb2d15b9d Fixes #2725: Wrong suggestion to install PEAR 2016-01-09 22:50:47 +11:00
Neil Lathwood
867a3f6406 Merge pull request #2721 from Rosiak/issue-2709
Fix notification links
2016-01-09 00:28:59 +00:00
Rosiak
730588776e Correction 2016-01-09 00:28:58 +01:00
Rosiak
82a302e135 Fix 2709
#2709
2016-01-09 00:03:09 +01:00
Eldon Koyle
5835fe6b77 Remove some detection logic from Brocade NOS foo
Remove one overly-broad and one overly-narrow detection check for nos
devices.
2016-01-08 14:30:55 -07:00
Søren Rosiak
89a22efda3 Merge pull request #2469 from thomseddon/feature/sub10-support 2016-01-08 15:07:01 +01:00
Neil Lathwood
4e127af323 Merge pull request #2696 from SaaldjorMike/vmware-vminfo-discovery-perf
Fixed discovery+poller performance of VMware virtual machines.
2016-01-08 13:35:15 +00:00
Neil Lathwood
7d94baefd2 Merge pull request #2718 from thomseddon/fix/graph-unit-clarification
Explicitly show units for total in bit graphs
2016-01-08 13:34:46 +00:00
Mike Rostermund
e2d1a8e7d9 Replaced custom utime() function with microtime(true) 2016-01-08 13:33:32 +01:00
Mike Rostermund
6ac4a5c232 Merge pull request #2717 from thomseddon/contrib-agreement
I agree to the conditions of the Contributor Agreement
2016-01-08 13:22:20 +01:00
Thom Seddon
a36204400e Explicitly show units for total in bit graphs
Previously the rest of the graph was in "bps", as indicated in the
legend, however the unit for the totals is "B" (bytes) - as only
the prefix (M, G, T) was shown for the totals it was not clear that
the unit was different.
2016-01-08 11:52:50 +00:00
Thom Seddon
9593473549 Add sub10RadioLclDataRate graph 2016-01-08 10:51:25 +00:00
Thom Seddon
89a76ef673 Add comprehensive Sub10 support 2016-01-08 10:51:25 +00:00
Thom Seddon
23665fec8c I agree to the conditions of the Contributor Agreement
contained in doc/General/Contributing.md.
2016-01-08 10:48:34 +00:00
Vitali Kari
e20f114a95 Update device.inc.php 2016-01-08 11:12:49 +01:00
Daniel Preussker
f0098d7d07 Merge pull request #2704 from Rosiak/issue-2685
Fix 2685
2016-01-08 10:05:25 +01:00
Daniel Preussker
19471a3b73 Merge pull request #2713 from SaaldjorMike/print-runtimes
Print runtimes for each individual polling and discovery module.
2016-01-08 10:03:58 +01:00
Mike Rostermund
a1261a0aeb Replace utime() for microtime(true) 2016-01-08 08:41:12 +01:00
Neil Lathwood
14518714fd Merge pull request #2714 from Rosiak/spell-stuff
Fix some spellings.
2016-01-07 22:14:48 +00:00
Rosiak
c3ce59124e Fix some spellings. 2016-01-07 23:02:18 +01:00
Vitali Kari
4223a15fe8 Update 086.sql 2016-01-07 21:48:16 +01:00