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

# Conflicts:
#	docs/CHANGELOG
#	lib/utility.php

2018-02-26 21:24:43 -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

1.2.x - issue #1347 - Update automation logging to work better (#1410)

2018-02-26 21:21:09 -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

Resolving Issue #1319

2018-02-08 18:51:57 -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

Merge branch 'develop' into feature/1.2.x

2018-02-25 20:12:19 -05: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

1.2.x - issue #1347 - Update automation logging to work better (#1410)

2018-02-26 21:21:09 -06:00

data_query.php

Additional Changes for #1380

2018-02-23 07:57:25 -06: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

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

2018-02-18 16:26:26 -06:00

export.php

Ensure all non-form objects are ignored on export

2018-02-11 06:55:30 -06:00

functions.php

Merge branch 'develop' into feature/1.2.x

2018-02-25 20:12:19 -05:00

graph_variables.php

Resolving Issue #114

2018-02-10 14:03:31 -06: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

Minor form formatting for errors

2018-02-19 17:02:48 -06:00

html_graph.php

Update copyright to 2018

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

html_reports.php

Merge branch 'develop' into feature/1.2.x

2018-02-25 20:12:19 -05: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

Resolving Issue #1386

2018-02-21 19:37:59 -06:00

html_validate.php

Minor update for html_validate.php for json logging.

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

html.php

Merge branch 'develop' into feature/1.2.x

2018-02-25 20:12:19 -05:00

import.php

Resolving Issue #1336

2018-02-14 17:34:29 -06: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 branch 'develop' into feature/1.2.x

2018-02-25 20:12:19 -05:00

poller.php

Merge branch 'develop' into feature/1.2.x

2018-02-25 20:12:19 -05:00

reports.php

Update copyright to 2018

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

rrd.php

Merge branch 'develop' into feature/1.2.x

2018-02-25 20:12:19 -05:00

snmp.php

Resolving Issue #1281

2018-02-11 06:55:29 -06:00

snmpagent.php

One more minor change for #1389

2018-02-22 06:02:16 -06:00

sort.php

Initialize $keys properly before call

2018-02-25 08:50:28 -06: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-26 21:24:43 -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