5476 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
laf	57b1ce7f33	Fix scrut bug	2015-06-09 15:04:07 +01:00
f0o	8c670f1d9e	Fix type fatal on reload	2015-06-09 14:00:16 +00:00
laf	851b7eb46f	Fixed merge conflict	2015-06-09 14:36:45 +01:00
laf	d24a79f2ba	Webui updates for BGP	2015-06-09 14:30:31 +01:00
laf	f2cf1ca850	Updated snmp response from array to string	2015-06-09 14:30:28 +01:00
laf	3c77c920c5	Updated bgpPeers_cbgp	2015-06-09 14:30:25 +01:00
laf	01a71320e2	Updated bgp polling	2015-06-09 14:30:22 +01:00
laf	77b9adabc2	More updates to bgp polling/disco and webui	2015-06-09 14:30:19 +01:00
Neil Lathwood	56a53c98b3	Merge pull request #1219 from librenms/f0o-patch-syslog-includes ... Update syslog.php	2015-06-09 14:29:04 +01:00
Daniel Preussker	0ca2b393f6	Update syslog.php ... Include_Once all files that define functions	2015-06-09 11:56:11 +00:00
Neil Lathwood	fe95301f43	Merge pull request #1217 from laf/changelog ... Updated changelog 08/06/15 201506	2015-06-08 21:17:53 +01:00
laf	51f50861fc	Updated changelog 08/06/15	2015-06-08 21:18:31 +01:00
Neil Lathwood	29a60c882c	Merge pull request #1215 from vitalisator/issue-1212 ... Added Basic OS Support for Multimatic USV	2015-06-08 21:17:07 +01:00
laf	802d1466a9	Updated changelog 08/06/15	2015-06-08 21:16:52 +01:00
vitalisator	a059ed1809	Added Basic OS Support for Multimatic USV	2015-06-08 21:46:36 +02:00
Daniel Preussker	225a84d597	Merge pull request #1210 from SaaldjorMike/fix-memory ... Fixed entry count on memory page	2015-06-08 14:03:48 +00:00
Daniel Preussker	d89525f3dd	Merge pull request #1209 from SaaldjorMike/fix-storage ... Fixed entry count on storage page	2015-06-08 14:03:43 +00:00
Neil Lathwood	21d2846212	Merge pull request #1211 from vitalisator/issue-1206 ... Added Basic Support für Enterasys Devices	2015-06-08 14:39:37 +01:00
vitalisator	267f07e1b2	Added Basic Support für Enterasys Devices	2015-06-08 14:27:33 +02:00
Mike Rostermund	f1c13d1e3d	Fixed entry count on memory page	2015-06-08 13:19:40 +02:00
Mike Rostermund	ed86171d0a	Fixed entry count on storage page	2015-06-08 13:14:39 +02:00
Daniel Preussker	f3cebbcfba	Merge pull request #1208 from SaaldjorMike/fix-bills ... Fixed percentagebar on /bills/	2015-06-08 10:56:36 +00:00
Mike Rostermund	3489476ad6	Fixed percentagebar on /bills/	2015-06-08 12:52:38 +02:00
Neil Lathwood	aa6ffa137b	Merge pull request #1207 from SaaldjorMike/typo1 ... Fixed typo in changelog	2015-06-08 11:05:46 +01:00
Mike Rostermund	8fc70931ae	Fixed typo in changelog	2015-06-08 12:02:49 +02:00
Neil Lathwood	70c9d13544	Merge pull request #1205 from SaaldjorMike/syslog-name ... Fix heading of syslog table for devices	2015-06-07 21:32:33 +01:00
Mike Rostermund	516bc43234	Fix heading of syslog table for devices	2015-06-07 22:07:36 +02:00
f0o	c64345bd5d	Merge branch 'laf-issue-laf-110-new'	2015-06-07 10:44:47 +00:00
f0o	2467b11290	Merge branch 'issue-laf-110-new' of git://github.com/laf/librenms into laf-issue-laf-110-new ... Conflicts: html/pages/health/mempool.inc.php includes/defaults.inc.php	2015-06-07 10:44:39 +00:00
Daniel Preussker	d121fed936	Merge pull request #1202 from paulgear/minor-tidies ... Minor tidies	2015-06-07 07:32:04 +00:00
Daniel Preussker	a80e4cd87b	Merge pull request #1203 from librenms/f0o-hotfix-1 ... Fix fatal in scripts/shoutcast.php	2015-06-06 17:55:54 +00:00
Daniel Preussker	0a9d8c92c3	Fix fatal in scripts/shoutcast.php ... [lint] PHP Fatal error: Call-time pass-by-reference has been removed in /var/lib/jenkins/jobs/librenms/workspace/scripts/shoutcast.php on line 43	2015-06-06 17:55:40 +00:00
Paul Gear	49833273e7	Make comment reflect code	2015-06-06 07:50:23 +10:00
Paul Gear	c149b0f47c	Remove unused os type	2015-06-06 07:47:14 +10:00
Paul Gear	418416457b	Make source layout consistent with all the other aruba files	2015-06-06 07:46:16 +10:00
Paul Gear	c27cb9d803	Source tree has files with spaces in their names now	2015-06-06 07:45:36 +10:00
Daniel Preussker	960da3c8b8	Merge pull request #1194 from neokjames/master ... Issued alerts add to the eventlog	2015-06-05 08:38:35 +00:00
James Campbell	f56c8c4425	Fixed indentation	2015-06-04 22:15:22 +10:00
James Campbell	45d7ff0a73	Added log_event for issued alerts	2015-06-04 22:13:45 +10:00
James Campbell	719c2bc63e	Testing log_event for issued alerts	2015-06-04 21:55:26 +10:00
Neil Lathwood	ae2f7eb98f	Merge pull request #1193 from SaaldjorMike/syslog-style	2015-06-04 11:41:01 +01:00
Mike Rostermund	cdd597a17e	Fixed same height for input fields on /syslog/	2015-06-04 12:27:49 +02:00
Neil Lathwood	b71ae21054	Merge pull request #1191 from SaaldjorMike/syslog-perms	2015-06-04 10:25:31 +01:00
Mike Rostermund	61d77e72c5	Hide link to syslog for device if syslog is disabled.	2015-06-04 09:19:48 +02:00
Neil Lathwood	455c619290	Merge pull request #1192 from Rosiak/mempool-bootgrid ... Convert memory page to use bootgrid	2015-06-04 00:56:47 +01:00
Rosiak	250b58ea8b	Minor corrections to memory bootgrid	2015-06-04 00:08:53 +02:00
Rosiak	f9322a29c6	Convert memory page to use bootgrid	2015-06-03 23:39:54 +02:00
Neil Lathwood	a903cd4fb1	Merge pull request #1190 from neokjames/master ... Improved Pushover transport code	2015-06-03 16:32:22 +01:00
laf	702b75c0b7	Updates	2015-06-03 15:41:10 +01:00
James Campbell	d99eca8137	Merge remote-tracking branch 'upstream/master'	2015-06-03 21:55:20 +10:00