Ultra2D 6f299a9679 Merge remote-tracking branch 'upstream/master' into issue-714 ...

Conflicts:
	html/includes/authentication/ldap.inc.php

2015-04-08 08:43:24 +02:00

..

alerts

add new hipchat transport for alerts

2015-03-26 20:18:15 -07:00

db

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

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

discovery

Merge pull request #670 from supertylerc/feat/f5-detection

2015-04-08 08:49:53 +10:00

phpmailer

Upgrade of PHPMailer

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

polling

Merge pull request #670 from supertylerc/feat/f5-detection

2015-04-08 08:49:53 +10: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

Use functions defined in authentication-modules to obtain contact-list

2015-04-05 12:50:38 +00:00

billing.php

Fixed the scrut coding style issues

2015-02-22 16:45:40 +00:00

cisco-entities.php

/// -> //

2012-05-25 12:24:34 +00:00

common.php

Resolved a large number index issues and update Console_Color to V2

2015-03-01 18:04:57 +00:00

console_colour.php

Resolved a large number index issues and update Console_Color to V2

2015-03-01 18:04:57 +00:00

console_table.php

Fixed spelling mistake

2015-02-22 17:53:25 +00:00

dbFacile.php

Resolved a large number index issues and update Console_Color to V2

2015-03-01 18:04:57 +00:00

defaults.inc.php

Add email address for LDAP users.

2015-04-07 09:52:21 +02:00

definitions.inc.php

Merge pull request #670 from supertylerc/feat/f5-detection

2015-04-08 08:49:53 +10:00

device-groups.inc.php

Device-Groups Draft

2015-04-03 18:22:29 +00:00

functions.php

Moved the check for $force_add so that we do not suffer icmp and snmp timeouts - thanks f0o

2015-03-23 16:14:31 +00:00

include-dir.inc.php

/// -> //

2012-05-25 12:24:34 +00:00

port-descr-parser.inc.php

/// -> //

2012-05-25 12:24:34 +00:00

rewrites.php

update foundry mibs

2012-05-29 13:08:01 +00:00

rrdtool.inc.php

Added some more examples

2015-03-27 22:22:11 +00:00

services.inc.php

improvements to services

2012-05-06 23:02:18 +00:00

snmp.inc.php

Added a hard limit for explode on oid

2015-03-31 21:18:43 +01:00

snom-graphing.php

/// -> //

2012-05-25 12:24:34 +00:00

static-config.php

phpDocumentator headers. retire static-config. IF YOU ARE READING THIS, REMOVE IT FROM THE BOTTOM YOUR CONFIG.PHP. YES. YOU.

2012-05-09 10:01:42 +00:00

syslog.php

process_syslog: remove debugging statements

2014-01-11 17:34:45 +02:00

versioncheck.inc.php

Remove user-facing references to Observium

2013-11-05 09:33:32 +10:00

vmware_guestid.inc.php

…