Jeremy Stretch
|
5b43a108bc
|
Merge branch 'develop' into develop-2.1
Conflicts:
netbox/ipam/models.py
netbox/netbox/settings.py
netbox/templates/dcim/inc/interface.html
|
2017-07-06 13:27:13 -04:00 |
|
Jeremy Stretch
|
789ac5dfd4
|
Combined mgmt and non-mgmt interfaces into same list on device and device type views
|
2017-06-16 17:13:33 -04:00 |
|
Jeremy Stretch
|
ea869d4ffc
|
Fixes #1282: Fixed tooltips on "mark connected/planned" toggle buttons for device connections
|
2017-06-16 10:02:14 -04:00 |
|
Jeremy Stretch
|
a6cb0e0a96
|
Updated console/power connection icons
|
2017-05-03 17:24:57 -04:00 |
|
Jeremy Stretch
|
6791ff6192
|
Fixes #1125: Include MAC addresses on a device's interface list
|
2017-05-02 15:01:27 -04:00 |
|
Jeremy Stretch
|
610b412506
|
#878: Layout tweaks
|
2017-04-13 15:09:08 -04:00 |
|
Jeremy Stretch
|
52420945b2
|
Standardized naming of return_url for all object views
|
2017-01-23 14:07:26 -05:00 |
|
Jeremy Stretch
|
3eb969de0c
|
Standardized the use of return_url for ObjectDeleteView
|
2017-01-18 13:30:19 -05:00 |
|
Jeremy Stretch
|
dbf9840b26
|
Corrected permissions for device component form rendering
|
2017-01-05 15:37:15 -05:00 |
|
Jeremy Stretch
|
09fe328c3f
|
Standardized template names
|
2017-01-05 15:31:41 -05:00 |
|