Oliver Gorwits 269cbf8708 Merge branch 'master' into em-device-ports-json ...

Conflicts:
	Netdisco/lib/App/Netdisco/Web/Device.pm

2014-11-16 21:59:35 +00:00

..

admintask

get rid of device_ports and self_options template vars

2014-11-03 19:59:42 +00:00

device

Merge branch 'master' into em-device-ports-json

2014-11-16 21:59:35 +00:00

report

Merge branch 'master' into em-device-ports-json

2014-11-13 21:35:41 +00:00

search

get rid of device_ports and self_options template vars

2014-11-03 19:59:42 +00:00

datatabledefaults.tt

save sidebar settings when Update View; fix bugs

2014-11-01 12:26:04 +00:00

statistics.tt

Move system information to the Netdisco "home" page

2014-02-22 17:43:22 +00:00