[PR #18] [MERGED] Develop #11965

Closed
opened 2025-12-29 21:53:41 +01:00 by adam · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/18
Author: @jeremystretch
Created: 6/24/2016
Status: Merged
Merged: 6/24/2016
Merged by: @jeremystretch

Base: masterHead: develop


📝 Commits (10+)

  • e7d3c19 Removed UserActions from admin
  • bddd9b6 Fixed typo
  • 9de8ac9 Fixed typo
  • 3933085 Standardized graph display; added templatization for graph links
  • e34ca1a Standardized graphs_modal markup; added graphs to Provider view
  • 4cbf09e Improved ExpandableNameField help_text
  • 0b66b54 Fixed double top border on component template tables
  • 13e0957 Drafted documentation for extras
  • 0c8e9e5 Downgrade to pydot-1.0.2 to fix unknown graph rendering error
  • d83d0b6 Catch exceptions on graph generation

📊 Changes

18 files changed (+150 additions, -104 deletions)

View changed files

docs/extras.md (+58 -0)
📝 netbox/dcim/tables.py (+4 -4)
📝 netbox/extras/admin.py (+0 -5)
📝 netbox/extras/api/serializers.py (+5 -1)
📝 netbox/extras/api/views.py (+7 -2)
📝 netbox/extras/models.py (+6 -0)
📝 netbox/project-static/css/base.css (+10 -4)
netbox/project-static/js/graphs.js (+26 -0)
📝 netbox/templates/circuits/provider.html (+10 -0)
📝 netbox/templates/dcim/device.html (+2 -39)
📝 netbox/templates/dcim/inc/_interface.html (+1 -1)
📝 netbox/templates/dcim/inc/devicetype_component_table.html (+1 -3)
📝 netbox/templates/dcim/site.html (+4 -41)
netbox/templates/inc/graphs_modal.html (+11 -0)
📝 netbox/templates/secrets/inc/private_key_modal.html (+1 -1)
📝 netbox/templates/users/userkey_edit.html (+1 -1)
📝 netbox/utilities/forms.py (+2 -1)
📝 requirements.txt (+1 -1)

📄 Description

Some last-minute tweaks and paint before the public release


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netbox-community/netbox/pull/18 **Author:** [@jeremystretch](https://github.com/jeremystretch) **Created:** 6/24/2016 **Status:** ✅ Merged **Merged:** 6/24/2016 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`e7d3c19`](https://github.com/netbox-community/netbox/commit/e7d3c19b58421587360d74036955ba107b5b3945) Removed UserActions from admin - [`bddd9b6`](https://github.com/netbox-community/netbox/commit/bddd9b6f392553d0fd435b7054025b27f099f902) Fixed typo - [`9de8ac9`](https://github.com/netbox-community/netbox/commit/9de8ac91a16842de482a4ca447c576b73cd318a9) Fixed typo - [`3933085`](https://github.com/netbox-community/netbox/commit/39330850b3c5c2290fad465dde500f0b6694c6f4) Standardized graph display; added templatization for graph links - [`e34ca1a`](https://github.com/netbox-community/netbox/commit/e34ca1a3f597212ad70bceeb7d1de542b034b233) Standardized graphs_modal markup; added graphs to Provider view - [`4cbf09e`](https://github.com/netbox-community/netbox/commit/4cbf09e0e1558e8fe74dbee238aa3ffe2ae80eb4) Improved ExpandableNameField help_text - [`0b66b54`](https://github.com/netbox-community/netbox/commit/0b66b547a37722d87c4843e88c6ffa63c849719a) Fixed double top border on component template tables - [`13e0957`](https://github.com/netbox-community/netbox/commit/13e095770cbeb7a6886f2b30688915ad871cf023) Drafted documentation for extras - [`0c8e9e5`](https://github.com/netbox-community/netbox/commit/0c8e9e582577552edea6d78fc3327ca55748b34b) Downgrade to pydot-1.0.2 to fix unknown graph rendering error - [`d83d0b6`](https://github.com/netbox-community/netbox/commit/d83d0b66b04899daec855cbf1057b41db2c8ee04) Catch exceptions on graph generation ### 📊 Changes **18 files changed** (+150 additions, -104 deletions) <details> <summary>View changed files</summary> ➕ `docs/extras.md` (+58 -0) 📝 `netbox/dcim/tables.py` (+4 -4) 📝 `netbox/extras/admin.py` (+0 -5) 📝 `netbox/extras/api/serializers.py` (+5 -1) 📝 `netbox/extras/api/views.py` (+7 -2) 📝 `netbox/extras/models.py` (+6 -0) 📝 `netbox/project-static/css/base.css` (+10 -4) ➕ `netbox/project-static/js/graphs.js` (+26 -0) 📝 `netbox/templates/circuits/provider.html` (+10 -0) 📝 `netbox/templates/dcim/device.html` (+2 -39) 📝 `netbox/templates/dcim/inc/_interface.html` (+1 -1) 📝 `netbox/templates/dcim/inc/devicetype_component_table.html` (+1 -3) 📝 `netbox/templates/dcim/site.html` (+4 -41) ➕ `netbox/templates/inc/graphs_modal.html` (+11 -0) 📝 `netbox/templates/secrets/inc/private_key_modal.html` (+1 -1) 📝 `netbox/templates/users/userkey_edit.html` (+1 -1) 📝 `netbox/utilities/forms.py` (+2 -1) 📝 `requirements.txt` (+1 -1) </details> ### 📄 Description Some last-minute tweaks and paint before the public release --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 21:53:41 +01:00
adam closed this issue 2025-12-29 21:53:41 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/netbox#11965