Merge Conflicts on Admin Templates

Customer Upload uses old Resource code; completely broken.

Customer Upgrade Errors

Users without resource update or resource create permissions can create and edit resources.

Users without Resource Update permissions can Update Resources on Detail

Permissions wonky with test account

Edit SOA function doesn't appear to work properly

Navigation gets lost in IE, blank-screens on refresh

Imported zones - unexpected EOF

Move delete zone functionality into zone

SWIP issue - customer reported

Send Request Button Nonfunctional on Admin API Page

IPAM Edit Block Misalignment

DNS validation rules weaker on detail.php

Inconsistent log messages and Levels for permissions

SOA for DNS needs to be validated in ADMIN panel and moved to DNS admin

Boundary issues in Technical Info pane

"Coming Soon" panes on Dashboard appeared to be set in place

Authentication errors visible on Admin screen

Can't find permissions for reporting tab?

Erratic Reordering Behavior on Editfile pages

Generate API Request Issue

PHP Errors in Generate Request URL Text Field

UI clean up - legacy options in Admin.php

Can't email IP information from Resource

Ajax error - local install only?

Menu issues in IE9 for zonelist

Menu issues in IE9 for ipam

Dashboard - text updates for 4.0

Create analagous view of 3.9.3 sitelist for 4.0

When you mark a peer "not qualified" or "rejected" they disappear!

Topbar is jacked up in Resources

IPAM Gadget - Assign by resource displays nothing

RIR Data Missing

Unavailable Functions shown on Customer Detail page

Adding a new Section/Type does not provide error messages

Coming Soon page content update

Undo/Import zone function is weird/needs some TLC

"code" field for Resources is not visible on main layout template

Create new Category - click on TLR - get nothing

DNS Admin DNS Bulk changes width needs to be bigger

Update permission error message

Unable to see contrast in dropdown

Zone text does not refresh on viewzone.php

Generate API Request: Several Sections Unhelpful

Customer import inserting escape characters

Field weirdness on CSV import screen (see Browse button in screenshot)

Auto split/aggregate box loses close X after hitting apply

Update DCIM admin for new passwords

Tab bar shows two tabs 'active' on Customer page

Odd Indenting on Detail Tech Info section

ResourceQuery returning odd results from empty arrays.

This just looks not right...

Edit on last ipam block in manage screen puts bottom of modal off screen

Button mislabeled - says "Send" instead of "Save"