Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/upstream v2.3.0 #5

Merged
merged 107 commits into from
Mar 8, 2018
Merged

Feature/upstream v2.3.0 #5

merged 107 commits into from
Mar 8, 2018

Conversation

funzoneq
Copy link

@funzoneq funzoneq commented Mar 8, 2018

Merge v2.3.0 with our Develop

jeremystretch and others added 30 commits November 7, 2017 15:36
…-community#1672)

* fixed prefix header to represent new serial "vlan_vid"

* shows option in creation now

* fixed visibility on rack page

* cleanup

* Added view to Tenant page

* Moved migration for update from netbox-community#1666 and fixed tenant enumeration in FilterForm

* Fixed conflict #1

* Fixed filters from merge and made migration merge

* added tenant to api

* Fixed migrations problem

* Added Tenant to bulkedit option
@funzoneq funzoneq merged commit 0adb3d7 into develop Mar 8, 2018
@funzoneq funzoneq deleted the feature/upstream-v2.3.0 branch March 8, 2018 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants