cigamit 55f1eb8332 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x ...

# Conflicts:
#	lib/html_tree.php

2018-02-06 20:44:28 -06:00

..

aggregate.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

api_aggregate.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

api_automation_tools.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

api_automation.php

Make Travis Happy

2018-02-03 13:42:05 -06:00

api_data_source.php

feature: Make Graph and Data Source suggested naming more efficient

2018-01-21 11:28:03 -06:00

api_device.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-22 19:42:44 -06:00

api_graph.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

api_poller.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

api_tree.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

auth.php

Minor changes to lib/auth.php

2018-01-06 14:12:42 -06:00

boost.php

Fix for Issue #1257 - Boost logging corrected (#1272)

2018-01-26 17:58:30 -07:00

cdef.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

clog_webapi.php

Minor spacing problem with log

2018-02-06 19:53:21 -06:00

data_query.php

issue#1040: Correct sizeof() issues with get_data_query_array() and get_graph_group() results (#1299)

2018-02-03 06:59:20 -07:00

database.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

dsstats.php

Feature: add DDERIVE and DCOUNTER to Cacti

2018-01-22 19:45:57 -06:00

export.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

functions.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-02-06 08:08:43 -06:00

graph_variables.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

html_filter.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

html_form_template.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-21 12:00:03 -06:00

html_form.php

Additional check for logout relatedd to issue #1175

2018-01-06 20:57:45 -06:00

html_graph.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

html_reports.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

html_tree.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-02-06 20:44:28 -06:00

html_utility.php

Fix for Issue #1256 / #1268 - RFILTER and display corrections (#1269)

2018-01-26 17:56:24 -07:00

html_validate.php

Minor update for html_validate.php for json logging.

2018-02-04 10:30:34 -06:00

html.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-02-06 20:44:28 -06:00

import.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

index.php

Removed un-needed php closing tag

2017-08-12 23:56:08 -04:00

ldap.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

mib_cache.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-02-04 13:19:43 -06:00

ping.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

plugins.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

poller.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

reports.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

rrd.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-22 19:42:44 -06:00

snmp.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-02-04 13:19:43 -06:00

snmpagent.php

Make the snmpagent more consistent

2018-01-14 18:00:08 -06:00

sort.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

template.php

feature: Make Graph and Data Source suggested naming more efficient

2018-01-21 11:28:03 -06:00

time.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

timespan_settings.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

utility.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-02-03 13:36:09 -06:00

variables.php

Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x

2018-01-06 14:08:07 -06:00

vdef.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00

xml.php

Update copyright to 2018

2018-01-06 09:10:15 -05:00