Aaron Daniels 70a05369fb Merge branch 'master' into issue-3550 ...

Conflicts:
	html/includes/graphs/device/sla.inc.php
	includes/polling/cisco-sla.inc.php

- Use standardised RRD functions

2016-08-12 08:22:40 +10:00

..

application

Remove useless global calls and add docblocks

2015-09-01 10:14:15 +02:00

authentication

reduce regress

2016-06-15 20:06:36 +02:00

collectd

Added Signal Sensor

2016-03-22 10:37:07 -04:00

common

Update syslog page

2016-08-05 14:30:06 +02:00

forms

Updated form update

2016-07-01 17:55:55 +01:00

front

…

geshi

Import GeSHi diff type.

2016-02-10 19:31:31 -06:00

graphs

Merge branch 'master' into issue-3550

2016-08-12 08:22:40 +10:00

jpgraph

Fix silly JpGraph version compare

2015-12-15 08:56:14 +00:00

modal

Merge pull request #3652 from laf/issue-3544

2016-06-14 19:01:28 +02:00

reports

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

Slim

…

table

Add filter by priority to syslog

2016-08-05 13:34:23 +02:00

.htaccess

…

api_functions.inc.php

Use Exceptions

2016-08-07 12:16:40 -05:00

authenticate.inc.php

Removed gc_maxlifetime setting

2016-05-03 22:53:09 +00:00

dev-overview-data.inc.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

device-header.inc.php

Added link back to hardware node for VMs

2016-01-25 22:04:12 +00:00

error-no-perm.inc.php

…

functions.inc.php

fix indentation in functions.inc.php

2016-08-05 17:11:01 +03:00

hostbox-menu.inc.php

…

hostbox-public.inc.php

…

javascript-interfacepicker.inc.php

…

object-cache.inc.php

…

PasswordHash.php

…

plugins.inc.php

…

print-accesspoint-graphs.inc.php

…

print-accesspoint.inc.php

…

print-alert-rules.php

Added additional default alert rule

2016-07-03 19:47:12 +01:00

print-alert-templates.php

…

print-alerts.inc.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

print-date-selector.inc.php

Centralised the date selector for graphs for re-use

2015-10-20 21:35:08 +00:00

print-debug.php

…

print-device-graph.php

Add row class

2015-12-21 18:34:02 +05:30

print-event-short.inc.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

print-event.inc.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

print-graph-alerts.inc.php

…

print-graphrow.inc.php

Clear $graph_array after graph is printed

2016-01-17 12:13:45 +10:00

print-interface-adsl.inc.php

…

print-interface-graphs.inc.php

…

print-interface.inc.php

Update graph and port pages to use new RRD naming schema.

2016-01-26 13:49:54 +01:00

print-map.inc.php

Fixed invalid query to get devices in networkmap when XDP is used.

2016-06-28 11:44:35 +02:00

print-menubar.php

use existings webui option (global_search_result_limit) to set typeahead limit instead of introducing new config option

2016-04-21 12:56:45 +02:00

print-service-add.inc.php

Few small changes

2015-11-04 19:23:39 +00:00

print-stp.inc.php

some bugfixing

2016-01-28 13:07:33 +01:00

print-syslog.inc.php

Revert "[WIP] Sanity!"

2016-02-17 13:59:58 +00:00

print-vlan.inc.php

…

print-vm.inc.php

Set min-width

2016-01-02 02:06:19 +01:00

print-vrf.inc.php

…

vars.inc.php

Fix: Use of undefined constant yes - assumed 'yes'

2016-08-07 15:39:03 +02:00