4135 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Neil Lathwood	89f9a1ddf5	Merge pull request #448 from paulgear/master ... Super big important merge	2015-02-12 09:25:51 +00:00
Neil Lathwood	498e4c3fd7	Merge pull request #422 from tuomari/wlc ... Add cisco wireless controller detection	2015-02-12 09:25:40 +00:00
Tuomas Riihimäki	b438fd131a	Add cisco wireless controller detection and airespace-mibs	2015-02-12 10:33:01 +02:00
Paul Gear	4bc8cdbca2	Merge branch 'master' of git://github.com/librenms/librenms	2015-02-12 09:40:34 +10:00
Neil Lathwood	47f599400d	Merge pull request #447 from tuomari/agreement ... I agree to the conditions of the Contributor Agreement	2015-02-11 23:33:06 +00:00
Tuomas Riihimäki	d65fcf3243	I agree to the conditions of the Contributor Agreement contained in doc/General/Contributing.md	2015-02-12 01:18:44 +02:00
Neil Lathwood	05199e7712	Merge pull request #446 from f0o/alerting-dirty ... Update Alerting-Docs	2015-02-10 10:32:57 +00:00
f0o	04cb44e913	Update Docs	2015-02-09 07:36:18 +00:00
Paul Gear	bd17de8eb7	Provide local junk dir; ignore contents	2015-02-06 08:59:42 +10:00
Paul Gear	78d7158d25	Merge pull request #441 from laf/issue-laf-41 ... Updated sub-menu to be icons	2015-02-04 08:47:40 +10:00
laf	1c14179406	Updated sub-menu to be icons	2015-02-03 22:25:28 +00:00
Paul Gear	93d7ddaf2a	Merge pull request #440 from laf/issue-laf-41 ... Added a sub-menu on the device list page to enable quick access to features	2015-02-04 08:17:59 +10:00
laf	6e7c095bde	Added a sub-menu on the device list page to enable quick access to features	2015-02-03 21:35:34 +00:00
Neil Lathwood	e77daabeb5	Merge pull request #439 from laf/issue-laf-45 ... Added extra scrut excludes for js libraries	2015-02-03 16:10:05 +00:00
Neil Lathwood	f889582e90	Added extra scrut excludes for js libraries	2015-02-03 15:57:03 +00:00
Paul Gear	cfa445b117	Merge pull request #436 from laf/issue-laf-33 ... Removed un-needed header redirect	2015-02-02 13:58:33 +10:00
Paul Gear	48facb15c9	Merge pull request #435 from laf/issue-laf-114 ... Added message box when devices haven't been polled for 15 minutes or more but marked as up still	2015-02-02 13:58:28 +10:00
laf	12fc20f8a2	Removed un-needed header redirect	2015-02-01 17:34:06 +00:00
laf	6192649756	Defined variable	2015-02-01 16:52:26 +00:00
laf	49ab697863	Added message box when devices haven't been polled for 15 minutes or more but are marked as up	2015-02-01 16:42:09 +00:00
Neil Lathwood	ded516a450	Merge pull request #434 from f0o/issue-433 ... Updated IRC-Bot to follow Alerting changes	2015-01-31 19:51:17 +00:00
f0o	38b929942c	Updated irc.php ... Added Alert-Channels to irc.php	2015-01-31 17:25:18 +00:00
Neil Lathwood	292ab1f50c	Merge pull request #430 from laf/issue-laf-111 ... Updated alerts interface to support inverted rules, worse/better alerts	2015-01-31 14:25:47 +00:00
Neil Lathwood	836a91457c	Merge pull request #429 from f0o/alerting-dirty ... Alerting Update	2015-01-31 14:25:38 +00:00
f0o	e15a16d689	Ignore queued alerts if device changed to 'ignore' or 'disabled' after alert entered queue.	2015-01-31 11:06:11 +00:00
lafandf0o	d0aec7d23a	Removed extra d from alert to match up with rest of ui	2015-01-31 11:06:11 +00:00
Neil Lathwood	1109885cda	Merge pull request #432 from laf/issue-laf-113 ... Removed extra d from alert to match up with rest of ui	2015-01-31 10:58:16 +00:00
laf	42f9d488ff	Removed extra d from alert to match up with rest of ui	2015-01-31 10:57:43 +00:00
laf	ddbc2a7304	Updated alerts interface to support inverted rules, worse/better alerts	2015-01-26 22:07:42 +00:00
f0o	0ada4f129c	Fix variable declaration	2015-01-26 08:13:41 +00:00
lafandf0o	f3f27b7856	Fixed bug when mute was selected for an alert rule	2015-01-26 08:13:41 +00:00
f0o	fa86e9308d	Added: ... Follow-Up notifications when a situation betters/worsens Inverted Alerts Nested Control-tags Extended variable-scope for incidents	2015-01-25 21:39:33 +00:00
Neil Lathwood	d58e975ca2	Merge pull request #428 from laf/issue-laf-112 ... Fixed bug when mute was selected for an alert rule	2015-01-25 21:39:14 +00:00
laf	9b94548039	Fixed bug when mute was selected for an alert rule	2015-01-25 21:05:36 +00:00
Neil Lathwood	df46673cfc	Merge pull request #427 from f0o/issue-326 ... Followup to CentOS7 Docs	2015-01-24 16:21:42 +00:00
f0o	db02fa5a2c	Added mod_authz_core fix	2015-01-24 15:00:50 +00:00
Paul Gear	1c0cd78841	Move Observium welcome out of top level docs and update	2015-01-24 21:01:25 +10:00
Neil Lathwood	c704fa5ce3	Merge pull request #425 from paulgear/master ... Remove individual contributor names from about page	2015-01-24 10:44:02 +00:00
Paul Gear	4352ec72c5	Fix link	2015-01-24 20:42:48 +10:00
Paul Gear	6f9fc954e8	Point to the correct location of AUTHORS.md	2015-01-24 20:42:21 +10:00
Paul Gear	061baf6f1c	Remove individual contributor names from about page	2015-01-24 20:36:19 +10:00
Paul Gear	9c3621b3ef	Update Contributing.md ... Fix document title	2015-01-24 19:53:24 +10:00
Neil Lathwood	98c6f159c5	Merge pull request #424 from f0o/issue-326 ... Added updated Docs for CentOS	2015-01-24 09:12:35 +00:00
f0o	3bcb7e8b9c	Added updated Docs for CentOS	2015-01-24 06:44:26 +00:00
Neil Lathwood	e634be7f2b	Merge pull request #423 from tuomari/autodiscover ... Autodiscovery $config['mydomain'] variable check	2015-01-23 17:32:51 +00:00
Tuomas Riihimäki	ec802efd3b	Do not add empty $config['mydomain'] when autodiscovering ... When \$config['mydomain'] variable is empty, '.' is appended to the device hostname. This patch adds a check to prevent that."	2015-01-23 18:49:19 +02:00
Neil Lathwood	f114d557f2	Merge pull request #420 from f0o/issue-419 ... Use bootstrap's progressbar to display bars	2015-01-22 20:36:44 +00:00
f0o	c0d3d73f01	Use bootstrap's progressbar to display bars	2015-01-22 16:22:19 +00:00
Paul Gear	7e12067e61	Merge master; resolve doc/Extensions/Agent-Setup.md conflict	2015-01-22 20:40:27 +10:00
Paul Gear	220cb5e034	Merge branch 'laf-issue-99' ... (Changed doc/General/Contributing.md to use Unix file format instead of DOS.)	2015-01-22 20:37:39 +10:00