Jeremy Stretch
3ad489a63d
Merge branch 'develop' into api2
...
Conflicts:
netbox/netbox/settings.py
2017-03-08 15:18:32 -05:00
Jeremy Stretch
6c5723e52e
Post-release version bump
2017-03-08 14:45:23 -05:00
Jeremy Stretch
35db0b4b5d
Merge pull request #949 from digitalocean/develop
...
Release v1.9.1
2017-03-08 14:40:16 -05:00
Jeremy Stretch
b3b1f2526f
Release v1.9.1
2017-03-08 14:38:24 -05:00
Jeremy Stretch
db407fc479
Fixes #943 : Child prefixes missing on Python 3
2017-03-08 14:10:27 -05:00
Jeremy Stretch
b1839e5b8a
Fixes #948 : Region name should be hyperlinked to site list
2017-03-08 12:04:50 -05:00
Jeremy Stretch
b6522c161b
Closes #946 : Disregard mask length when filtering IP addresses by a parent prefix
2017-03-08 11:59:24 -05:00
Jeremy Stretch
67a973e87a
Finished user control panel for tokens
2017-03-08 11:34:47 -05:00
Jeremy Stretch
71a70740a2
Initial work on user control panel for tokens
2017-03-07 23:30:53 -05:00
Jeremy Stretch
160bcc214a
Addded is_expired property to Token
2017-03-07 23:30:31 -05:00
Jeremy Stretch
c24fe99c48
Shorten key length to 20 bytes
2017-03-07 22:56:29 -05:00
Jeremy Stretch
c1f98043f3
Suppress default permissions for Token model
2017-03-07 22:40:05 -05:00
Jeremy Stretch
dcc673cf88
Closes #945 : Display the current user in the nav menu
2017-03-07 22:27:46 -05:00
Jeremy Stretch
1588c6226b
Initial work on token authentication
2017-03-07 17:17:39 -05:00
Jeremy Stretch
98dad62ee6
Corrected merge conflict
2017-03-07 16:55:49 -05:00
Jeremy Stretch
6326894a4f
Merge branch 'develop' into api2
...
Conflicts:
netbox/dcim/api/views.py
2017-03-07 14:08:06 -05:00
Jeremy Stretch
93cf372889
Fixes #944 : Correct console and power connection form behavior
2017-03-07 13:32:48 -05:00
Jeremy Stretch
36ecc890e9
Fixes #941 : Corrected old references to rack.site on Device
2017-03-06 10:23:24 -05:00
Jeremy Stretch
c8737f73c0
Post-release version bump
2017-03-03 11:28:27 -05:00
Jeremy Stretch
487b70d42b
Merge pull request #939 from digitalocean/develop
...
Release v1.9.0-r1
2017-03-03 11:28:02 -05:00
Jeremy Stretch
0cf6709b7b
Release v1.9.0-r1
2017-03-03 11:26:31 -05:00
Jeremy Stretch
c8cf9aff5b
Fixes #935 : Fix form validation error when connecting an interface using live search
2017-03-03 11:19:19 -05:00
Jeremy Stretch
c0c78dd61e
Fixes #938 : Provider view yields an error if one or more circuits is assigned to a tenant
2017-03-03 10:47:16 -05:00
Jeremy Stretch
047fb8c671
Fixes #937 : Region assignment should be optional when creating a site
2017-03-03 10:44:07 -05:00
Jeremy Stretch
c704ac99b3
Enable API versioning
2017-03-02 16:20:16 -05:00
Jeremy Stretch
5a7630e560
Merge branch 'develop' into api2
...
Conflicts:
netbox/dcim/api/serializers.py
netbox/dcim/api/urls.py
netbox/dcim/api/views.py
netbox/dcim/filters.py
netbox/dcim/tables.py
requirements.txt
2017-03-02 16:01:25 -05:00
Jeremy Stretch
ac47fba481
Added GitHub issue/PR templates; updated CONTRIBUTING policy
2017-03-02 15:30:14 -05:00
Jeremy Stretch
13b523e096
Post-release version bump
2017-03-02 13:30:45 -05:00
Jeremy Stretch
63dbafb486
Merge pull request #933 from digitalocean/develop
...
Release v1.9.0
2017-03-02 13:27:10 -05:00
Jeremy Stretch
709bc475b2
Release v1.9.0
2017-03-02 13:22:29 -05:00
Jeremy Stretch
4a244847c2
Documentation refresh
2017-03-02 13:21:56 -05:00
Jeremy Stretch
e82af5025c
Closes #894 : Expand device name max length to 64 characters
2017-03-02 10:11:54 -05:00
Jeremy Stretch
1cc07bae75
Closes #901 : Support for filtering prefixes and IP addresses by mask length
2017-03-01 14:23:52 -05:00
Jeremy Stretch
9f216fd9ba
Closes #927 : Upgrade to django-filter 1.0
2017-03-01 13:09:19 -05:00
Jeremy Stretch
8b1b50da17
Closes #862 : Show both IPv6 and IPv4 primary IPs in device list
2017-02-28 16:46:44 -05:00
Jeremy Stretch
acaf558b42
Corrected region serializers
2017-02-28 16:23:39 -05:00
Jeremy Stretch
691ea87444
Merged develop
2017-02-28 16:10:53 -05:00
Jeremy Stretch
b92f7aa8f1
Implemented recursive regions with django-mptt
2017-02-28 14:15:15 -05:00
Jeremy Stretch
26263f5bcb
Initial work on regions
2017-02-28 12:11:43 -05:00
Jeremy Stretch
459ecd3cfb
Fixed permissions for inclusion of interface bulk edit form
2017-02-27 17:19:30 -05:00
Jeremy Stretch
91d689d122
Tweaked interface LAG validation
2017-02-27 17:13:58 -05:00
Jeremy Stretch
eddb8a2fbc
Merge branch 'develop' into api2
...
Conflicts:
netbox/dcim/api/serializers.py
netbox/dcim/api/views.py
netbox/dcim/filters.py
2017-02-27 17:04:08 -05:00
Jeremy Stretch
9847b5187f
Closes #105 : Interface groups ( #919 )
...
* Initial work on interface groups
* Simplify to a single LAG form factor
* Correct interface serializer
* Allow for bulk editing of interface LAG
* Additional LAG interface validation
* Fixed API tests
2017-02-27 16:52:13 -05:00
Jeremy Stretch
dddeebb882
Merge pull request #908 from digitalocean/global-vlans
...
Closes #235 : Global vlans
2017-02-21 14:58:52 -05:00
Jeremy Stretch
8d34033ae7
Additional work on #904
2017-02-21 14:53:22 -05:00
Shawn Peng
c07e5ad52b
Fix #235 : Enable global vlan ( #904 )
...
* Fix #235 : Enable global vlan
Decouple site/vlan, make site optional for vlan/vlangroup
Change html generation code to check site existence before
dereference
Create site search function, if site is None for a VLAN, view it as
global VLAN
* commit1
* commit2
* commit3
* Add migration file for VLAN&VLAN group
* Revert unintentional commits
2017-02-21 13:27:24 -05:00
Jeremy Stretch
a7dd93160e
Merge pull request #907 from Jasperswaagman/develop
...
Typo
2017-02-21 09:24:17 -05:00
Jasperswaagman
45c56dc54c
Typo
2017-02-21 15:20:42 +01:00
Jeremy Stretch
e66e3e437c
Fixes #892 : Restored missing edit/delete buttons when viewing child prefixes and IP addresses from a parent object
2017-02-17 16:34:09 -05:00
Jeremy Stretch
8e0d1ec4d0
Fixes #872 : TypeError on bulk IP address creation (Python 3)
2017-02-17 16:10:07 -05:00