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

..

addresses_csv.tt

table_pagesize option to set default size of table pages

2014-06-30 12:38:43 +01:00

addresses.tt

get rid of device_ports and self_options template vars

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

details.tt

[#170] Show device SNMP::Info class in web interface

2014-11-16 21:49:36 +00:00

modules.tt

Provide links from device module tab to module inventory report

2014-02-16 23:41:26 -05:00

netmap.tt

Change from ?tab=tabname param to .../tabname path

2014-10-25 14:51:15 +01:00

ports_csv.tt

[#66] Fix display of vlan membership

2014-01-11 09:44:35 +00:00

ports.tt

get rid of device_ports and self_options template vars

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