4357 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Paul Gear	de37b355ed	Merge pull request #575 from laf/issue-laf-144 ... Merged hp and comware poll/disco	2015-03-10 10:46:05 +10:00
laf	583043a6c4	Merged hp and comware poll/disco	2015-03-10 00:06:09 +00:00
Neil Lathwood	076cb24065	Merge pull request #574 from tisoft/patch-1 ... Fix display of icons in Devices menu bar	2015-03-09 21:37:25 +00:00
Markus Heberling	aeecf4a97a	Fix display of icons in Devices menu bar	2015-03-09 22:29:28 +01:00
Neil Lathwood	1d8375b836	Merge pull request #573 from KFleshman/issue-572 ... Add version detection for 3Com Baseline switches (and possibly others)	2015-03-09 20:34:33 +00:00
Kevin Fleshman	1dd4a2deff	Add version detection for 3Com Baseline switches (and possibly others)	2015-03-09 13:02:46 -07:00
Daniel Preussker	8f96d43aa6	Merge pull request #565 from laf/issue-560 ... Updated docs on removing default site	2015-03-09 19:44:42 +00:00
Daniel Preussker	00881134d3	Merge pull request #571 from KFleshman/issue-569 ... Fixed bug in includes/discovery/os/hp.inc.php	2015-03-09 19:43:33 +00:00
Kevin Fleshman	246b95eb50	Whoops, $string isn't a useful thing to run a RegEx on!	2015-03-09 12:32:08 -07:00
Neil Lathwood	ac6f77791b	Merge pull request #570 from KFleshman/issue-569 ... Issue 569	2015-03-09 19:28:50 +00:00
Kevin Fleshman	728b9abd54	More generic detection from laf	2015-03-09 12:11:40 -07:00
Kevin Fleshman	5c7ee6aad1	sysDescr is two lines	2015-03-09 11:29:35 -07:00
Neil Lathwood	c50a70d235	Merge pull request #568 from KFleshman/issue-567 ... Add detection for 3com Baseline switches	2015-03-09 18:14:30 +00:00
Kevin Fleshman	ab9c432b36	Add support for HP V1910 switches	2015-03-09 10:38:03 -07:00
Kevin Fleshman	0a547f5492	Add detection of HP V1910 switches	2015-03-09 10:36:59 -07:00
Neil Lathwood	9b0abde4cb	Merge pull request #566 from KFleshman/agreement ... I agree to the conditions of the Contributor Agreement	2015-03-09 17:13:58 +00:00
Kevin Fleshman	9b940bdba4	Add detection for 3com Baseline switches	2015-03-09 10:07:01 -07:00
Kevin Fleshman	3bdb888575	I agree to the conditions of the Contributor Agreement ... contained in doc/General/Contributing.md.	2015-03-09 09:52:35 -07:00
laf	cedd13e14b	Added docs on removing default site	2015-03-09 15:26:40 +00:00
Daniel Preussker	25508a3d03	Merge pull request #564 from laf/issue-563 ... Updated CISCO-PRODUCTS-MIB	2015-03-09 14:31:26 +00:00
Daniel Preussker	bacdbfe6f9	Merge pull request #562 from laf/issue-laf-143 ... Added polling support for NXOS	2015-03-09 13:28:49 +00:00
laf	d67880e3df	Updated CISCO-PRODUCTS-MIB	2015-03-09 13:13:14 +00:00
laf	eed7f90638	Remove spacing	2015-03-09 12:50:40 +00:00
laf	a2f951a386	Added polling support for NXOS	2015-03-09 12:49:43 +00:00
Paul Gear	e03934dffd	Merge pull request #470 from laf/issue-laf-117 ... Added telnet/ssh/https links to device pages	2015-03-09 08:53:28 +10:00
Neil Lathwood	81644242eb	Merge pull request #559 from paulgear/master ... Minor reformats on documentation; remove no-longer-relevant sections	2015-03-08 22:46:55 +00:00
Paul Gear	9a71270275	Merge pull request #557 from laf/issue-552 ... Adds a jquery refresh / pause option to the System menu so you can pause pages	2015-03-09 08:39:10 +10:00
Paul Gear	f6789d4940	Merge pull request #558 from laf/issue-555 ... Removed cycle2 .map reference	2015-03-09 08:26:43 +10:00
Paul Gear	7d94985c3c	Fix typo	2015-03-09 08:17:28 +10:00
Paul Gear	f647c43d81	Minor reformats on documentation; remove no-longer-relevant sections	2015-03-09 08:09:53 +10:00
laf	32cc575bdb	Removed cycle2 .map reference	2015-03-08 21:50:17 +00:00
laf	fa3944cd8f	Final version of jquery pause / resume for page refresh	2015-03-08 21:33:40 +00:00
Daniel Preussker	30bc941653	Merge pull request #553 from laf/issue-laf-142 ... Moved search box back to the right and aligned dropdown	2015-03-06 17:14:37 +00:00
laf	7fd470925b	Moved search box back to the right and aligned dropdown	2015-03-06 15:52:54 +00:00
laf	01a8b97900	Moved to jquery for refresh	2015-03-06 15:49:35 +00:00
Daniel Preussker	e535b7ddda	Merge pull request #551 from laf/issue-laf-141 ... Updated new_alert_rule modal to not die and instead only return the page for admins	2015-03-05 13:55:59 +01:00
Daniel Preussker	de5eda322d	Merge pull request #550 from laf/issue-laf-140 ... Added @ to split rule for alerts	2015-03-05 13:55:22 +01:00
laf	1238498696	Updated new_alert_rule modal to not die and instead only return the page for admins	2015-03-05 11:40:02 +00:00
laf	12da6984cc	Added @ to split rule for alerts	2015-03-05 11:35:54 +00:00
Neil Lathwood	71bdf65dfa	Merge pull request #543 from mchasteen/issue-542 ... Added temperature support for APC portable AC units.	2015-03-04 22:50:34 +00:00
mchasteen	0df4a86a0a	Cleaned up for scrutinizer.	2015-03-04 14:24:31 -07:00
Daniel Preussker	17db6d78ff	Merge pull request #546 from laf/issue-laf-139 ... Fixed array_unique key issue for alerts	2015-03-04 16:35:52 +01:00
laf	851a998954	Fixed array_unique key issue for alerts	2015-03-04 15:33:18 +00:00
Neil Lathwood	1bbb70c901	Merge pull request #545 from mchasteen/issue-544 ... Fixed some formatting for generic sensors.	2015-03-04 07:51:31 +00:00
mchasteen	4013ca3a5a	Fixed some formatting for generic sensors.	2015-03-03 17:06:49 -07:00
mchasteen	0bb26b9800	Added temperature support for APC portable AC units.	2015-03-03 16:55:30 -07:00
Neil Lathwood	fe9f1abd39	Merge pull request #541 from Rosiak/master ... Print alert state and a matching glyphic	2015-03-03 20:15:27 +00:00
Søren Rosiak	dbf0107827	Update print-alerts.inc.php ... - Changed using lafwoods suggested changes.	2015-03-03 19:25:20 +01:00
Rosiak	d0997d09d4	Print alert state and a matching glyphic ... - Print alert state on default front page and on alert-log page. Prints the state and a matching glyphicon.	2015-03-03 18:48:40 +01:00
Neil Lathwood	7c1b6f4fbc	Merge pull request #540 from laf/issue-laf-138 ... Bug fix to make devices search box work again!	2015-03-03 15:19:42 +00:00