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

..

authentication

Merge remote-tracking branch 'upstream/master' into issue-714

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

collectd

…

front

…

geshi

…

graphs

Updated to fix scrut issues

2015-04-03 20:10:42 +01:00

jpgraph

…

modal

JS typo

2015-04-06 17:04:26 +00:00

reports

Updated alertlog to use bootgrid

2015-04-01 00:21:56 +01:00

Slim

…

table

Couple of small issues fixed on alerts page

2015-04-08 03:01:15 +01:00

.htaccess

…

api_functions.inc.php

Merge pull request #627 from laf/issue-laf-148

2015-03-23 16:29:32 +00:00

authenticate.inc.php

Updated the use of REMOTE_ADDR to a function then replaced its use

2015-03-18 19:14:51 +00:00

dev-overview-data.inc.php

…

device-header.inc.php

…

device-summary-horiz.inc.php

…

device-summary-vert.inc.php

…

error-no-perm.inc.php

…

functions.inc.php

Updated the use of REMOTE_ADDR to a function then replaced its use

2015-03-18 19:14:51 +00:00

hostbox-basic.inc.php

…

hostbox-menu.inc.php

Added title popovers to the device quick links (ssh/telnet/https)

2015-03-12 21:55:46 +00:00

hostbox-public.inc.php

…

hostbox.inc.php

…

javascript-interfacepicker.inc.php

…

object-cache.inc.php

…

PasswordHash.php

…

plugins.inc.php

…

port-edit.inc.php

…

print-accesspoint-graphs.inc.php

…

print-accesspoint.inc.php

…

print-alert-rules.php

Updated some of the main pages to no longer refresh

2015-03-21 21:30:55 +00:00

print-alert-templates.php

Updated some of the main pages to no longer refresh

2015-03-21 21:30:55 +00:00

print-alerts.inc.php

…

print-alerts.php

Updated alerts table to show status messages

2015-03-31 18:47:10 +01:00

print-debug.php

…

print-device-graph.php

…

print-event-short.inc.php

…

print-event.inc.php

…

print-graphrow.inc.php

…

print-interface-adsl.inc.php

…

print-interface-graphs.inc.php

…

print-interface.inc.php

…

print-map.inc.php

Fix for maps now working when devices hostname != the same in the links table

2015-03-29 02:11:55 +01:00

print-menubar.php

Device-Groups Draft

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

print-service.inc.php

…

print-syslog.inc.php

…

print-vlan.inc.php

…

print-vm.inc.php

…

print-vrf.inc.php

…

service-delete.inc.php

…