Commit Graph

1206 Commits

Author SHA1 Message Date
Jeremy Stretch
d99f1b7d9d Fixes #1051: Upgraded django-rest-swagger 2017-04-06 09:40:09 -04:00
Jeremy Stretch
78021eb53c Merge pull request #1046 from digitalocean/component-filter-by-name
Fixes #1045
2017-04-06 09:14:41 -04:00
Jeremy Stretch
2ac4fe9ecc Closes #578: Show topology maps not assigned to a site on the home view 2017-04-05 17:33:39 -04:00
Jeremy Stretch
cd767261c3 Closes #430: Include circuits when rendering topology maps 2017-04-05 17:24:40 -04:00
Zach Moody
210e05db3f Fixes #1045 2017-04-05 15:29:53 -05:00
Jeremy Stretch
4384993546 Resolved RemovedInDjango20Warning deprecation warnings 2017-04-05 14:40:25 -04:00
Jeremy Stretch
e46675aa22 Rearranged URL namespaces to satisfy deprecation warnings 2017-04-05 14:26:33 -04:00
Jeremy Stretch
3e343a02e8 Fixes #1043: Corrected queryset in WritableDeviceSerializer validation 2017-04-05 13:38:23 -04:00
Jeremy Stretch
269f0c9084 Reset version 2017-04-05 12:11:48 -04:00
Jeremy Stretch
71214134f0 Release v2.0-beta2 2017-04-05 11:52:14 -04:00
Jeremy Stretch
a362e2da7c Added API endpoints for console and power connections 2017-04-05 11:29:12 -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
ca1895e237 Bump migration index due to a new migration in 1.9.4-r1 2017-04-04 15:59:33 -04:00
Jeremy Stretch
e0564fe568 Merge branch 'develop' into v2-develop 2017-04-04 15:56:33 -04:00
Jeremy Stretch
42e30d753b Post-release version bump 2017-04-04 15:50:59 -04:00
Jeremy Stretch
b2c2096fb4 Release v1.9.4-r1 2017-04-04 15:47:25 -04:00
Jeremy Stretch
7ed56a113c Fixes #1034: Missing migration 2017-04-04 15:46:27 -04:00
Jeremy Stretch
1a936a2c73 #1033: Tweak SelectWithDisabled option template 2017-04-04 14:36:35 -04:00
Jeremy Stretch
e5ba60d339 #1033: Update ArrayFieldSelectMultiple for Django 1.11 2017-04-04 14:30:00 -04:00
Jeremy Stretch
38fb6cf3dc #1033: Convert SelectWithDisabled to a templatized widget 2017-04-04 14:19:48 -04:00
Jeremy Stretch
79b18b178b Corrected CustomFieldModelSerializer behavior when serializing lists of objects 2017-04-04 14:09:14 -04:00
Jeremy Stretch
2a0f9ae100 #1033: Convert ColorSelect to a templatized widget 2017-04-04 13:45:32 -04:00
Jeremy Stretch
7d7b1c84ae #1033: Disable the debug toolbar templates panel by default due to a performance issue under Django 1.11 2017-04-04 13:44:55 -04:00
Jeremy Stretch
3f6f164574 Merge branch 'develop' into v2-develop
Conflicts:
	netbox/netbox/settings.py
2017-04-04 12:06:49 -04:00
Jeremy Stretch
ff04b77645 Post-release version bump 2017-04-04 12:03:26 -04:00
Jeremy Stretch
46a14ccb0a Release v1.9.4 2017-04-04 11:58:44 -04:00
Jeremy Stretch
d3cc38e18d Fixes #1027: Fixed nav menu highlighting when BASE_PATH is set 2017-04-04 11:55:16 -04:00
Stephen
c00a2b3d9b Only show Custom Fields on IP Address Assign Page if custom fields are set against the ip address (#1031) 2017-04-04 11:37:20 -04:00
Jeremy Stretch
2dcd3010da Refactored custom field serializers 2017-04-04 11:25:23 -04:00
Jeremy Stretch
3c80ddc850 Fixes #1028: Corrected API endpoint URL name in IPAddressForm 2017-04-03 17:11:22 -04:00
Jeremy Stretch
7a1f10a038 Corrected topology map link 2017-04-03 16:34:37 -04:00
Jeremy Stretch
796e595e81 Updated static CSS/JS libraries 2017-04-03 16:15:06 -04:00
Jeremy Stretch
c7a3780f7f Fixed deprecated references to ImageAttachment.obj 2017-04-03 15:51:45 -04:00
Jeremy Stretch
cce4a11638 Added a search box to the navigation menu 2017-04-03 15:33:41 -04:00
Jeremy Stretch
eef22e5c52 Fixes #1022: Record user actions when creating IP addresses in bulk 2017-04-03 14:45:20 -04:00
Jeremy Stretch
71f0729385 What would we do without you, PEP8? 2017-04-03 14:26:20 -04:00
Jeremy Stretch
f9e3534dab Merge pull request #1026 from digitalocean/image-attachments
#152: Image attachments
2017-04-03 14:21:15 -04:00
Jeremy Stretch
1150e8e97b Implemented API endpoints for ImageAttachments 2017-04-03 14:00:15 -04:00
Jeremy Stretch
042076c032 Fixes #1025: Applied missing API view filters 2017-04-03 11:04:17 -04:00
Jeremy Stretch
76cf9ca5d7 Enable serving static media through Django 2017-03-31 15:51:17 -04:00
Jeremy Stretch
2efaea364b Added image attachments to sites and devices 2017-03-31 15:19:44 -04:00
Jeremy Stretch
00f0ea3e77 Fixes #1021: Corrected evaluation of API token expiration time 2017-03-31 11:13:37 -04:00
Jeremy Stretch
c6e3810265 Initial work on #152: Image attachments 2017-03-30 21:55:57 -04:00
Jeremy Stretch
24b4127743 Appended a version flag to all CSS/JS references to invalidate browser cache after an upgrade 2017-03-30 15:40:00 -04:00
Jeremy Stretch
0910ddfc62 Updated the docstring for Device 2017-03-30 09:56:47 -04:00
Jeremy Stretch
ae335a1a33 Merge branch 'global-search' into v2-develop 2017-03-29 16:45:57 -04:00
Jeremy Stretch
74d27b8e1f Prettied things up a bit 2017-03-29 16:45:25 -04:00
Jeremy Stretch
7bbd8ec9c3 Introduced SearchTable for improved performance 2017-03-29 16:05:23 -04:00
Jeremy Stretch
cc6a7407c9 Search form improvements 2017-03-29 14:22:27 -04:00
Jeremy Stretch
8a645248c2 Base64 decoding tweaks 2017-03-29 13:39:59 -04:00
Jeremy Stretch
92c4346d91 Fixes #1013: Show edit/delete reservation buttons on rack view 2017-03-29 12:15:14 -04:00
Jeremy Stretch
583871a25b Initial work on global search 2017-03-29 12:04:57 -04:00
Jeremy Stretch
ed51e72d32 Closes #973: Removed extraneous admin UI functions 2017-03-28 16:41:53 -04:00
Jeremy Stretch
c773430bb0 Closes #362: Added per_page query parameter to control pagination page length 2017-03-28 15:57:50 -04:00
Jeremy Stretch
3b6d6f52e6 Token admin form improvements 2017-03-28 12:19:08 -04:00
Jeremy Stretch
ae42abb0d0 Added tests for get-session-key API endpoint 2017-03-28 11:30:38 -04:00
Jeremy Stretch
e66559fd4c Closes #985: Added preserve_key to get-session-key endpoint 2017-03-28 11:13:13 -04:00
Jeremy Stretch
997269b51f Order interfaces naturally for Device A 2017-03-27 10:55:54 -04:00
Jeremy Stretch
e580d0fd3f Fixes #991: Correct server error on "create and connect another" interface connection 2017-03-27 10:53:32 -04:00
Zach Moody
d8b29c8b59 fix remaining legacy api url paths. 2017-03-24 18:58:19 -05:00
Zach Moody
8fc8fa462a update api_url with new interfaces endpoint. 2017-03-24 18:42:23 -05:00
Zach Moody
6e5ab9e0af Fixes #996 2017-03-24 17:38:06 -05:00
Jeremy Stretch
b7435e76dd Merge branch 'develop' into v2-develop
Conflicts:
	netbox/netbox/settings.py
2017-03-23 17:14:41 -04:00
Jeremy Stretch
b33c4e7274 Post-release version bump 2017-03-23 16:29:42 -04:00
Jeremy Stretch
d1fbaa7695 Release v1.9.3 2017-03-23 16:24:35 -04:00
Jeremy Stretch
3febbaf060 Rack assignment is optional for devices 2017-03-23 15:36:24 -04:00
Jeremy Stretch
44099b0f1a Merge branch 'api2' into v2-develop 2017-03-23 13:36:09 -04:00
Jeremy Stretch
7d3831ee25 Closes #972: Add ability to filter connections list by device name 2017-03-23 10:07:02 -04:00
Jeremy Stretch
f815eede74 Merge pull request #974 from marc-us/develop
Filter on mac address on interface
2017-03-23 09:35:01 -04:00
Mark
a020c4c56b Filter on mac address on interface via API 2017-03-23 12:57:35 +01:00
Jeremy Stretch
32e641936b Only attempt to process session key if user is authenticated 2017-03-22 17:43:29 -04:00
Jeremy Stretch
a8960b3fd2 Closes #978: Allow filtering device types by function and subdevice role 2017-03-22 17:29:47 -04:00
Jeremy Stretch
30e584d017 Closes #983: Include peer device names when listing circuits in device view 2017-03-22 16:58:56 -04:00
Jeremy Stretch
74f98b27fa v2.0 Beta 1 release 2017-03-22 10:07:37 -04:00
Jeremy Stretch
52d235853f Merge branch 'develop' into api2
Conflicts:
	netbox/circuits/filters.py
2017-03-22 09:48:41 -04:00
Jeremy Stretch
74fb6f1a4d Closes #981: Allow filtering primary objects by a given set of IDs 2017-03-22 09:39:30 -04:00
Jeremy Stretch
5a21884cea Added has_primary_ip filter for Devices 2017-03-21 21:29:03 -04:00
Jeremy Stretch
78a665d2e4 Allow editing of platform RPC client 2017-03-21 17:33:40 -04:00
Jeremy Stretch
a0c3b7dc0d RPC API fixes 2017-03-21 17:24:16 -04:00
Jeremy Stretch
dfb1bfa456 Finished work on secrets views; removed path from cookie assignment 2017-03-21 15:30:36 -04:00
Jeremy Stretch
903656c414 Merge branch 'develop' into api2 2017-03-21 14:10:53 -04:00
Jeremy Stretch
fb8ac4e816 Fixes #843: Implemented CORS headers for API 2017-03-21 13:53:07 -04:00
Jeremy Stretch
7ce4d6e976 Include the API version in responses 2017-03-21 13:23:56 -04:00
Jeremy Stretch
581f7c3269 Tweak how we set the API version 2017-03-21 13:17:50 -04:00
Jeremy Stretch
be56d01a1d Renamed Module to InventoryItem (prep for #824) 2017-03-21 12:54:08 -04:00
Jeremy Stretch
ea9ed11c3b Custom name for ConnectedDeviceViewSet 2017-03-20 21:54:01 -04:00
Jeremy Stretch
8c15daf697 Fixed browsable API breadcrumbs 2017-03-20 21:50:10 -04:00
Jeremy Stretch
354b3b0011 Added test case for ConnectedDeviceViewSet 2017-03-20 21:39:40 -04:00
Jeremy Stretch
2be7d030c2 Renamed rack-units API and added a test 2017-03-20 21:18:37 -04:00
Jeremy Stretch
73be1297a5 Removed custom renderers 2017-03-20 17:47:18 -04:00
Jeremy Stretch
9ba11806b2 Fixed custom renderers to work with paginated data 2017-03-20 17:15:42 -04:00
Jeremy Stretch
c09c9f8745 Converted ChoiceFieldSerializer to display an object 2017-03-20 16:32:59 -04:00
Jeremy Stretch
5577d67223 Wrote API endpoints, tests for ExportTemplates 2017-03-20 16:21:10 -04:00
Jeremy Stretch
15ecd734c6 Added API endpoint, tests for Graphs 2017-03-20 15:14:33 -04:00
Jeremy Stretch
023b67ca4a Added a footer link to the GitHub wiki 2017-03-20 14:05:26 -04:00
Jeremy Stretch
4f5d5cd4f0 Introduced HttpStatusMixin to provide more detail on HTTP response status test failures 2017-03-20 13:46:47 -04:00
Jeremy Stretch
b9bc9cabd8 Enforce API versioning 2017-03-20 12:33:42 -04:00
Jeremy Stretch
472008a673 Updated RackViewSet() to be compatible with paginated API 2017-03-20 10:38:09 -04:00
Jeremy Stretch
d76d4b6966 Fix API JS to read response.results for new API 2017-03-20 10:06:25 -04:00
Mark
2c273eef03 Filter on mac address on interface 2017-03-18 21:26:33 +01:00
Mark
a7df85acdf Filter on mac address on interface 2017-03-18 21:21:49 +01:00
Mark
6662b34fac Filter on mac address on interface
Extension to be able filter on mac address via API
2017-03-18 21:10:36 +01:00
Jeremy Stretch
1ecf2fa700 Python3 fixes 2017-03-17 21:39:29 -04:00
Jeremy Stretch
90fbaeb0c2 Make CI happy 2017-03-17 17:39:56 -04:00
Jeremy Stretch
c072bedd02 Restore not-so-extraneous 'id' field to all WritableSerializers 2017-03-17 17:32:43 -04:00
Jeremy Stretch
9ca5f7df0f Merge branch 'develop' into api2 2017-03-17 17:06:01 -04:00
Jeremy Stretch
a0f931891b Removed extraneous 'id' field from all WritableSerializers 2017-03-17 16:20:34 -04:00
Jeremy Stretch
af2e7ca5a7 Wrote tests for secrets API 2017-03-17 16:01:57 -04:00
Jeremy Stretch
d93a379c15 Assign RackReservation user from request context 2017-03-17 14:45:14 -04:00
Jeremy Stretch
494ad68a4c Make RackReservation.rack editble for API compatability 2017-03-17 14:40:11 -04:00
Jeremy Stretch
ac83cd8021 Wrote tests for IPAM API 2017-03-17 14:36:59 -04:00
Jeremy Stretch
1f294b9479 Removed unneeded services endpoint from DCIM API 2017-03-17 12:23:23 -04:00
Jeremy Stretch
05c37ea90e Finished DCIM API model tests 2017-03-17 12:16:24 -04:00
Jeremy Stretch
86e73a825f Fix error when assigning a new interface to a LAG 2017-03-16 22:27:01 -04:00
Jeremy Stretch
708cc043c3 Fixed bug interpreting facility_id as a required field 2017-03-16 17:25:34 -04:00
Jeremy Stretch
b63ed3d1dc First batch of DCIM API tests 2017-03-16 16:50:18 -04:00
Jeremy Stretch
a282808285 Improved create/update validation 2017-03-16 14:17:14 -04:00
Jeremy Stretch
1838b8f209 Wrote tests for tenancy API 2017-03-16 13:29:55 -04:00
Jeremy Stretch
ff13bf81c6 Wrote tests for circuits API 2017-03-16 13:23:01 -04:00
Jeremy Stretch
43ed77446f Implemented full read/write support for secrets 2017-03-15 14:47:18 -04:00
Jeremy Stretch
53dccc6670 Refactored SecretViewSet 2017-03-15 13:48:09 -04:00
Jeremy Stretch
1149f91edb Post-release version bump 2017-03-14 17:18:05 -04:00
Jeremy Stretch
e5318f602f Release v1.9.2 2017-03-14 17:07:04 -04:00
Jeremy Stretch
d2bbac65af Fixes #964: Fix bug when bulk editing/deleting filtered set of objects 2017-03-14 15:22:08 -04:00
Jeremy Stretch
426d8333d9 Fixes #963: Fix bug in IPv6 address range expansion 2017-03-14 15:06:34 -04:00
Jeremy Stretch
5e0b257865 Allow user to delete session key 2017-03-14 14:01:06 -04:00
Jeremy Stretch
0047f5ce11 Relate SessionKey to UserKey rather than User 2017-03-14 13:32:07 -04:00
Jeremy Stretch
1249da5411 Updated user URLs 2017-03-14 12:59:10 -04:00
Jeremy Stretch
479705b387 Merge branch 'develop' into api2
Conflicts:
	netbox/templates/users/_user.html
	netbox/users/urls.py
2017-03-14 12:40:28 -04:00
Jeremy Stretch
cfb1287cd5 Renamed user URL namespace 2017-03-14 12:36:44 -04:00
Jeremy Stretch
87abcf8306 Secrets UI work 2017-03-14 12:32:08 -04:00
Jeremy Stretch
b872eda7ea Simplify SessionKey usage 2017-03-14 10:58:57 -04:00
Jeremy Stretch
b3a95bbab5 Allow assigning child devices to rackless parents 2017-03-13 11:31:28 -04:00
Jeremy Stretch
f0c251c76e Fix parent device position display 2017-03-13 11:25:06 -04:00
Jeremy Stretch
50e790c2d8 Fixes #950: Fix site_id error on child device import 2017-03-13 11:18:33 -04:00
Jeremy Stretch
487b6121cb Fixes #957: Correct device site filter count to include unracked devices 2017-03-13 10:13:04 -04:00
Jeremy Stretch
c6c3c46ed6 Fixes #956: Correct bug affecting unnamed rackless devices 2017-03-13 10:06:32 -04:00
Jeremy Stretch
02d791a3d6 APIRootView tweaks 2017-03-09 15:18:50 -05:00
Jeremy Stretch
3ba49e19a7 Provided a root API view 2017-03-09 15:05:01 -05:00
Jeremy Stretch
8099d51a85 Removed deprecated GraphListView 2017-03-09 14:28:52 -05:00
Jeremy Stretch
1b1cb25826 Closes #855: Added an API endpoint for recent activity 2017-03-09 14:26:39 -05:00
Jeremy Stretch
e26707f898 Fixed serialization of CustomFieldChoices 2017-03-09 13:50:30 -05:00
Jeremy Stretch
c2965d26d5 Removed browsable API login/logout 2017-03-09 13:38:15 -05:00
Jeremy Stretch
78f0d583b0 Standardized API URL definitions 2017-03-09 13:24:02 -05:00
Jeremy Stretch
1ba65cb311 Replaced RelatedConnectionsView with views.ConnectedDeviceViewSet 2017-03-09 12:18:53 -05:00
Jeremy Stretch
a98a856ae3 Converted GetSessionKey and RSAKeyGeneratorView to ViewSets 2017-03-08 17:57:51 -05:00
Jeremy Stretch
97006f15ec Cleanup 2017-03-08 16:30:32 -05:00
Jeremy Stretch
79c8be97e4 Moved custom field serializers to their own module to avoid circular dependency 2017-03-08 16:18:41 -05:00
Jeremy Stretch
7b5f59852f Moved TopologyMaps from DCIM to extras 2017-03-08 16:12:14 -05:00
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
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
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
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
13b523e096 Post-release version bump 2017-03-02 13:30:45 -05:00
Jeremy Stretch
709bc475b2 Release v1.9.0 2017-03-02 13:22:29 -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
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
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
Jeremy Stretch
e82e39745b Merge branch 'develop' into api2
Conflicts:
	netbox/dcim/api/serializers.py
2017-02-17 15:12:53 -05:00
Jeremy Stretch
e3c4a999a5 Fixes #903: Only alert on missing criticial connections if present in the parent device type 2017-02-17 15:10:08 -05:00
Jeremy Stretch
d3423a64db Cleanup from work on #198 2017-02-17 14:52:58 -05:00
Jeremy Stretch
91be4a4df3 Closes #198: Support for rackless devices (#902)
* Initial work to support rackless devices

* Updated device component connection forms

* Updated IP address assignment form

* Updated circuit termination form

* Formatting cleanup

* Fixed tests
2017-02-17 14:48:00 -05:00
Jeremy Stretch
06cc036bbe Fixes #897: Fixed power connections CSV export 2017-02-16 15:17:13 -05:00
Jeremy Stretch
c589f40796 Closes #898: Expand circuits list in provider view 2017-02-16 15:13:35 -05:00
Jeremy Stretch
1c8642e1e2 Tweaked ChoiceFieldSerializer to display a field as (value, label) 2017-02-16 14:37:21 -05:00
Jeremy Stretch
b9d5d9ee8c 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
2017-02-16 14:28:06 -05:00
Jeremy Stretch
cc79b8ea3d Rack reservations (#900)
* Initial work on rack reservations

* Added views for rack reservations

* Implemented ArrayFieldSelectMultiple form widget

* Implemented API endpoints for rack reservations

* Tweaked the database migration
2017-02-16 13:46:58 -05:00
Jeremy Stretch
4ee7fc9465 Exposed the request to ObjectEditView's alter_obj() 2017-02-15 15:03:31 -05:00