f0o 3be0b85846 Resolved upstream-conflicts: ...

html/pages/apps.inc.php
	includes/polling/unix-agent.inc.php

2015-01-18 06:37:22 +00:00

..

alerts

Added Alerting

2014-12-15 11:10:26 +00:00

db

Updated console-ui.php to use new include file for data

2014-02-23 18:23:52 +00:00

discovery

Added Hikvision support

2015-01-05 21:06:49 +00:00

phpmailer

Upgrade of PHPMailer

2014-03-07 22:21:22 +01:00

polling

Resolved upstream-conflicts:

2015-01-18 06:37:22 +00:00

services

…

snmptrap

Fixes for dbInsert / dbUpdate queries

2014-06-10 22:21:10 +01:00

sql-schema

Updated most files to use dbFacile

2014-03-12 22:21:33 +00:00

alerts.inc.php

Merge branch 'alerting-dirty' of https://github.com/f0o/librenms into f0o-alerting-dirty

2014-12-21 12:56:29 +10:00

billing.php

…

cisco-entities.php

…

common.php

Revert "Merge pull request #158 from laf/issue-156"

2014-04-28 20:14:06 +10:00

console_colour.php

…

console_table.php

…

dbFacile.php

…

defaults.inc.php

Add option to clean old perf_times table entries #341

2014-11-03 18:25:45 +01:00

definitions.inc.php

Added Hikvision support

2015-01-05 21:06:49 +00:00

functions.php

Added Hikvision support

2015-01-05 21:06:49 +00:00

include-dir.inc.php

…

port-descr-parser.inc.php

…

rewrites.php

…

rrdtool.inc.php

…

services.inc.php

…

snmp.inc.php

Revert "Merge pull request #160 from laf/issue-159"

2014-04-28 20:10:36 +10:00

snom-graphing.php

…

static-config.php

…

syslog.php

…

versioncheck.inc.php

…

vmware_guestid.inc.php

…