Oliver Gorwits 97d1232860 Merge branch 'master' into em-device-ports-json ...

Conflicts:
	Netdisco/share/public/css/netdisco.css
	Netdisco/share/views/ajax/device/ports.tt

2014-09-16 19:29:41 +01:00

..

ajax

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

2014-09-16 19:29:41 +01:00

js

one more html_entity change caught

2014-02-22 19:16:53 +00:00

layouts

Load js base64 encode / decode

2014-08-14 19:49:58 -04:00

sidebar

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

2014-09-16 19:29:41 +01:00

admintask.tt

Allow Port Control users to see Port Config Log report

2014-02-14 19:39:02 +00:00

device.tt

Allow Port Control users to see Port Config Log report

2014-02-14 19:39:02 +00:00

index.tt

Set form focus to Username field on login form

2014-03-02 20:59:56 +00:00

inventory.tt

[ND1#117] unknown devices missing from inventory

2014-07-13 17:36:55 +01:00

password.tt

Password Change form for all users

2014-02-22 18:39:39 +00:00

plugin.tt

Plugin CSS and JS included file fix

2013-12-08 21:47:35 +00:00

report.tt

Allow Port Control users to see Port Config Log report

2014-02-14 19:39:02 +00:00

search.tt

Allow Port Control users to see Port Config Log report

2014-02-14 19:39:02 +00:00