NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-25 04:50:00 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
3,822 Commits 47 Branches 355 Tags
5c164d3ac12f6784ea74ca033d1da485effcf469
Commit Graph

162 Commits

Author SHA1 Message Date
Jeremy Stretch
3d4d9ab311 Allowed assigning an IP address to either a device or a VM 2017-08-29 15:26:35 -04:00
Jeremy Stretch
8129f4328d Merge branch 'develop' into develop-2.1 
Conflicts:
	netbox/netbox/settings.py
 2017-07-14 10:12:35 -04:00
Jeremy Stretch
60d5d4342a Fixes #1338: Allow importing prefixes with "container" status 2017-07-12 10:31:16 -04:00
Jeremy Stretch
b6c50c98b6 Fixes #1334: Fix server error when adding an interface to a device 2017-07-11 14:52:50 -04:00
Jeremy Stretch
1e1d228257 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
674aa67406 Fixes #1279: Fix primary_ip assignment during IP address import 2017-06-16 12:45:42 -04:00
Jeremy Stretch
8c65ba8277 Merge branch 'develop' into develop-2.1 
Conflicts:
	netbox/netbox/settings.py
 2017-06-15 14:26:02 -04:00
Jeremy Stretch
ff1e14f498 Fixes #1275: Raise validation error on prefix import when multiple VLANs are found 2017-06-15 14:13:20 -04:00
Jeremy Stretch
caef74a3ce Fixes #1273: Corrected status choices in IP address import form 2017-06-14 16:22:49 -04:00
Jeremy Stretch
d01f6d089e Closes #819: Implemented IP address functional roles 2017-06-14 16:11:13 -04:00
Jeremy Stretch
c1953377f1 Fixes #1238: Fix error when editing an IP with a NAT assignment which has no assigned device 2017-06-13 16:57:25 -04:00
Jeremy Stretch
0d651562ac Closes #704: Allow filtering VLANs by group when editing prefixes 2017-06-09 14:15:12 -04:00
Jeremy Stretch
2512e01df4 Converted device fields to use FlexibleModelChoiceField; misc cleanup 2017-06-07 15:51:11 -04:00
Jeremy Stretch
eca56a188f Updated CSVForm validation 2017-06-07 14:19:08 -04:00
Jeremy Stretch
4a6b79646a Replaced all CSVForm ChoiceFields with CSVChoiceField 2017-06-07 13:22:06 -04:00
Jeremy Stretch
a2174e7e98 Converted IPAM import views to new scheme 2017-06-02 16:07:11 -04:00
Jeremy Stretch
1f911c1567 Fixes #1229: Fix validation error on forms where API search is used 2017-05-25 14:33:50 -04:00
Jeremy Stretch
297d9c6bb9 Import unicode_literals 2017-05-24 11:33:11 -04:00
Jeremy Stretch
16dec29c1f Fixes #1197: Fixed status assignment during bulk import of devices, prefixes, IPs, and VLANs 2017-05-17 17:16:02 -04:00
Jeremy Stretch
2dd06353b1 Fixes #1186: Corrected VLAN edit form so that site assignment is not required 2017-05-16 16:30:28 -04:00
Jeremy Stretch
d47daa6360 Fixes #1171: Allow removing site assignment when bulk editing VLANs 2017-05-12 12:06:37 -04:00
Jeremy Stretch
a2b918b759 Moved tenancy to separate panel on bulk IP creation form 2017-05-12 12:04:06 -04:00
Jeremy Stretch
5514b20933 Fixes #1166: Re-implemented bulk IP address creation 2017-05-12 12:00:26 -04:00
Jeremy Stretch
d1e60d9cd7 Fixed selector initializations for TenancyForms 2017-05-11 17:52:23 -04:00
Jeremy Stretch
9721f9d038 Added tenant_group/tenant form section to all objects with tenancy 2017-05-11 17:35:20 -04:00
Jeremy Stretch
7f94f33044 Closes #1167: Introduced ChainedModelChoiceFields 2017-05-11 16:30:16 -04:00
Jeremy Stretch
63d4020ecb Fixed incorrect API URL in IPAddressForm 2017-05-09 11:11:30 -04:00
Jeremy Stretch
bd2f12630d Merge branch 'develop' into v2-develop 2017-05-08 15:02:06 -04:00
Jeremy Stretch
cf4c32a25a Fixes #1118: Allow designating an IP as primary for a device while editing the IP 2017-05-02 16:46:23 -04:00
Jeremy Stretch
86899d010c Closes #1110: Expand bulk edit forms to include boolean fields (e.g. toggle is_pool for prefixes) 2017-04-28 12:32:27 -04:00
Jeremy Stretch
410cfab36b Merge branch 'develop' into v2-develop 
Conflicts:
	netbox/ipam/forms.py
 2017-04-27 15:29:40 -04:00
Jeremy Stretch
a82908a2a0 Fixes #1104: Fix VLAN assignment on prefix import 2017-04-26 13:28:09 -04:00
Jeremy Stretch
ec70c9659f Removed deprecated IPAddressAssignForm 2017-04-26 13:03:18 -04:00
Jeremy Stretch
9957b62b6b Fixes #1101: Fix AJAX scripting for device component selection forms 2017-04-26 12:53:14 -04:00
Jeremy Stretch
04fc9d76ba Merge branch 'develop' into v2-develop 
Conflicts:
	netbox/circuits/models.py
	netbox/netbox/settings.py
	upgrade.sh
 2017-04-21 15:07:48 -04:00
Jeremy Stretch
5d36ff274a Closes #1084: Include custom fields when creating IP addresses in bulk 2017-04-19 14:50:58 -04:00
Jeremy Stretch
6359d2e82d Corrected invalid API URL name 2017-04-17 15:52:23 -04:00
Jeremy Stretch
dfa0275908 Merge branch 'develop' into v2-develop 
Conflicts:
	netbox/dcim/forms.py
	netbox/dcim/views.py
	netbox/ipam/forms.py
	netbox/templates/_base.html
	netbox/utilities/views.py
 2017-04-13 15:42:50 -04:00
Jeremy Stretch
946b142a69 Closes #1001: Merged IP interface assignment into ipam.IPAddressForm 2017-04-13 14:54:17 -04:00
Jeremy Stretch
58c6df8e93 Fixes #1057: Corrected VLAN validation during prefix import 2017-04-07 14:50:08 -04:00
Jeremy Stretch
e121a4f31c Merge branch 'develop' into v2-develop 
Conflicts:
	netbox/netbox/settings.py
	netbox/netbox/urls.py
	requirements.txt
 2017-04-06 17:01:13 -04:00
Jeremy Stretch
1ffa90c521 Fixes #1037: Fixed error on VLAN import with duplicate VLAN group names 2017-04-05 10:13:19 -04:00
Jeremy Stretch
3c80ddc850 Fixes #1028: Corrected API endpoint URL name in IPAddressForm 2017-04-03 17:11:22 -04:00
Zach Moody
d8b29c8b59 fix remaining legacy api url paths. 2017-03-24 18:58:19 -05:00
Zach Moody
6e5ab9e0af Fixes #996 2017-03-24 17:38:06 -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
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
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