68c099a2af
Merge branch 'develop' into api2
...
Conflicts:
netbox/netbox/settings.py
2017-03-08 15:18:32 -05:00
70a05b4280
Post-release version bump
2017-03-08 14:45:23 -05:00
097e0f38ff
Merge pull request #949 from digitalocean/develop
...
Release v1.9.1
2017-03-08 14:40:16 -05:00
094974d417
Release v1.9.1
2017-03-08 14:38:24 -05:00
d89314a559
Fixes #943 : Child prefixes missing on Python 3
2017-03-08 14:10:27 -05:00
086340540a
Fixes #948 : Region name should be hyperlinked to site list
2017-03-08 12:04:50 -05:00
ed83b1d9e9
Closes #946 : Disregard mask length when filtering IP addresses by a parent prefix
2017-03-08 11:59:24 -05:00
4f6d2a8b71
Finished user control panel for tokens
2017-03-08 11:34:47 -05:00
d58a8ebba0
Initial work on user control panel for tokens
2017-03-07 23:30:53 -05:00
6be465fe9b
Addded is_expired property to Token
2017-03-07 23:30:31 -05:00
26225aff57
Shorten key length to 20 bytes
2017-03-07 22:56:29 -05:00
fd55360672
Suppress default permissions for Token model
2017-03-07 22:40:05 -05:00
4e766c7c3b
Closes #945 : Display the current user in the nav menu
2017-03-07 22:27:46 -05:00
0b10d98e0b
Initial work on token authentication
2017-03-07 17:17:39 -05:00
be0a3fb1f2
Corrected merge conflict
2017-03-07 16:55:49 -05:00
02e89d77bb
Merge branch 'develop' into api2
...
Conflicts:
netbox/dcim/api/views.py
2017-03-07 14:08:06 -05:00
4b753b1610
Fixes #944 : Correct console and power connection form behavior
2017-03-07 13:32:48 -05:00
f8381628d4
Fixes #941 : Corrected old references to rack.site on Device
2017-03-06 10:23:24 -05:00
d8f41f67c9
Post-release version bump
2017-03-03 11:28:27 -05:00
ce26b566a4
Merge pull request #939 from digitalocean/develop
...
Release v1.9.0-r1
2017-03-03 11:28:02 -05:00
ee2d0b963d
Release v1.9.0-r1
2017-03-03 11:26:31 -05:00
f051c0e564
Fixes #935 : Fix form validation error when connecting an interface using live search
2017-03-03 11:19:19 -05:00
03d3bbcddb
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
06cafb09b3
Fixes #937 : Region assignment should be optional when creating a site
2017-03-03 10:44:07 -05:00
a7a7b956b1
Enable API versioning
2017-03-02 16:20:16 -05:00
9b39ba169c
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
4670929953
Added GitHub issue/PR templates; updated CONTRIBUTING policy
2017-03-02 15:30:14 -05:00
366e2e7a94
Post-release version bump
2017-03-02 13:30:45 -05:00
0e14bc1e02
Merge pull request #933 from digitalocean/develop
...
Release v1.9.0
2017-03-02 13:27:10 -05:00
e5f05ca9be
Release v1.9.0
2017-03-02 13:22:29 -05:00
d08522408a
Documentation refresh
2017-03-02 13:21:56 -05:00
cc31c8fc33
Closes #894 : Expand device name max length to 64 characters
2017-03-02 10:11:54 -05:00
db60e8868c
Closes #901 : Support for filtering prefixes and IP addresses by mask length
2017-03-01 14:23:52 -05:00
1adae67dd7
Closes #927 : Upgrade to django-filter 1.0
2017-03-01 13:09:19 -05:00
5ad3044314
Closes #862 : Show both IPv6 and IPv4 primary IPs in device list
2017-02-28 16:46:44 -05:00
90fe556e5f
Corrected region serializers
2017-02-28 16:23:39 -05:00
c0152940f9
Merged develop
2017-02-28 16:10:53 -05:00
9313ba08ed
Implemented recursive regions with django-mptt
2017-02-28 14:15:15 -05:00
f3b9930dea
Initial work on regions
2017-02-28 12:11:43 -05:00
5520144ff4
Fixed permissions for inclusion of interface bulk edit form
2017-02-27 17:19:30 -05:00
2b9ea58c86
Tweaked interface LAG validation
2017-02-27 17:13:58 -05:00
8f42f59a80
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
c6970e1998
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
c61bae3a33
Merge pull request #908 from digitalocean/global-vlans
...
Closes #235 : Global vlans
2017-02-21 14:58:52 -05:00
b0f9035e2d
Additional work on #904
2017-02-21 14:53:22 -05:00
aba9748ffd
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
2876ef7607
Merge pull request #907 from Jasperswaagman/develop
...
Typo
2017-02-21 09:24:17 -05:00
7d1aeede1a
Typo
2017-02-21 15:20:42 +01:00
b7f4a11eee
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
0e5138d6ec
Fixes #872 : TypeError on bulk IP address creation (Python 3)
2017-02-17 16:10:07 -05:00
