1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Commit Graph

149 Commits

Author SHA1 Message Date
93b6d785f3 fix circuit termination styles 2021-04-15 15:26:59 -07:00
4c3b0abe7b Merge branch 'feature' of https://github.com/netbox-community/netbox into feature
# Conflicts:
#	netbox/dcim/tables/template_code.py
#	netbox/netbox/views/__init__.py
#	netbox/project-static/css/base.css
#	netbox/templates/base.html
#	netbox/templates/circuits/circuit.html
#	netbox/templates/circuits/circuittermination_edit.html
#	netbox/templates/circuits/inc/circuit_termination.html
#	netbox/templates/circuits/provider.html
#	netbox/templates/dcim/device.html
#	netbox/templates/dcim/device/base.html
#	netbox/templates/dcim/device_component.html
#	netbox/templates/dcim/devicetype.html
#	netbox/templates/dcim/inc/device_napalm_tabs.html
#	netbox/templates/dcim/rack.html
#	netbox/templates/dcim/site.html
#	netbox/templates/dcim/virtualchassis.html
#	netbox/templates/extras/configcontext.html
#	netbox/templates/extras/object_journal.html
#	netbox/templates/extras/tag.html
#	netbox/templates/generic/object.html
#	netbox/templates/generic/object_list.html
#	netbox/templates/home.html
#	netbox/templates/inc/nav_menu.html
#	netbox/templates/ipam/aggregate.html
#	netbox/templates/ipam/ipaddress.html
#	netbox/templates/ipam/prefix.html
#	netbox/templates/ipam/vlan.html
#	netbox/templates/ipam/vlangroup_edit.html
#	netbox/templates/ipam/vlangroup_vlans.html
#	netbox/templates/secrets/secret.html
#	netbox/templates/tenancy/tenant.html
#	netbox/templates/users/api_tokens.html
#	netbox/templates/virtualization/cluster.html
#	netbox/templates/virtualization/vminterface_edit.html
#	netbox/utilities/forms/fields.py
#	netbox/utilities/templates/buttons/export.html
2021-04-14 11:30:15 -07:00
2e07ac5a47 Rearrange provider, provider network templates 2021-04-05 13:18:19 -04:00
cd64fcac8d Linkify connected object 2021-04-01 17:21:04 -04:00
96759af86f Closes #6071: Cable traces now traverse circuits 2021-04-01 14:31:10 -04:00
d57222328b Rename Cloud to ProviderNetwork 2021-04-01 10:21:41 -04:00
3869028d53 Clean up organizational object URLs 2021-03-29 16:17:25 -04:00
b7e44a744d Add dedicated views for organizational models 2021-03-26 14:44:43 -04:00
2e97bf48c5 Include circuits list on cloud view 2021-03-18 14:05:32 -04:00
574a43fff7 Enable attaching circuit terminations to clouds 2021-03-18 13:53:48 -04:00
6ff8a267e9 Introduce the Cloud model 2021-03-18 11:20:09 -04:00
7a3af8de83 Merge branch 'feature' of https://github.com/netbox-community/netbox into feature
# Conflicts:
#	netbox/dcim/tables/template_code.py
#	netbox/netbox/forms.py
#	netbox/templates/dcim/cable_connect.html
#	netbox/templates/dcim/consoleport.html
#	netbox/templates/dcim/consoleserverport.html
#	netbox/templates/dcim/device.html
#	netbox/templates/dcim/device/base.html
#	netbox/templates/dcim/device_edit.html
#	netbox/templates/dcim/interface.html
#	netbox/templates/dcim/rack.html
#	netbox/templates/dcim/rack_edit.html
#	netbox/templates/dcim/site.html
#	netbox/templates/extras/configcontext.html
#	netbox/templates/extras/objectchange.html
#	netbox/templates/generic/object.html
#	netbox/templates/inc/nav_menu.html
#	netbox/templates/ipam/ipaddress_edit.html
#	netbox/templates/ipam/vrf.html
#	netbox/utilities/templates/buttons/export.html
2021-03-17 22:02:43 -07:00
9b89afd6dc begin bootstrap 5 migration, update templates 2021-03-13 02:19:42 -07:00
79b19821f6 Closes #5892: Introduce SiteGroup model (#5937)
* Initial work on #5892

* Add site group selection to object edit forms

* Add documentation for site groups

* Changelog for #5892

* Finish application of site groups to config context
2021-03-08 13:28:53 -05:00
51120ccf31 Introduce generic object template 2021-03-02 15:58:33 -05:00
8dd7123923 Closes #3648: Mark cable termination models as connected without attaching a cable 2021-03-01 21:34:42 -05:00
6a9b50f95d Closes #5873: Use numeric IDs in all object URLs 2021-02-26 17:23:23 -05:00
d6cf385a3c Update CircuitTermination fields to use SelectSpeedWidget 2021-02-25 14:12:34 -05:00
42e82f0ead Update object edit template to use fieldsets where possible 2021-02-25 13:51:48 -05:00
6f39e6599d Fixes #5540: Fix exception when viewing a provider with one or more tags assigned 2020-12-28 10:48:50 -05:00
d237b97776 Update custom_fields_panel.html 2020-11-19 13:53:37 -05:00
790e1ee2e4 Update created_updated.html 2020-11-19 13:44:34 -05:00
d5d87e0fdd Update templates to use "object" context var 2020-11-19 13:22:33 -05:00
a3675854be Clean up generic view templates 2020-11-11 16:58:29 -05:00
62b0a68bef Don't use chevron-right icon for hierarchy 2020-11-06 16:26:16 -05:00
72dace29b7 Replace Glyphicons with Material Design 2020-11-06 14:49:14 -05:00
867f308027 Replace Font Awesome icons with Material Design 2020-11-06 14:33:20 -05:00
23cce55246 Merge branch 'develop' into develop-2.10 2020-11-05 15:33:07 -05:00
c53990c739 Closes #5307: Add a region selector for every site form field 2020-11-04 15:27:41 -05:00
30778a9c40 Closes #5225: CircuitTermination port_speed is now optional 2020-10-09 14:06:24 -04:00
ec66e1a5c0 Closes #4349: Drop support for embedded graphs 2020-08-21 11:57:46 -04:00
eadd2d6854 Remove obsolete livesearch Javascript 2020-08-11 12:56:27 -04:00
1714902f88 Merge branch 'develop' into develop-2.9 2020-07-21 12:57:02 -04:00
1f9a440598 Fixes #4856: Redirect user back to circuit after connecting a termination 2020-07-15 10:09:31 -04:00
1d0b27c99e Fixes #4851: Show locally connected peer on circuit terminations 2020-07-15 10:01:01 -04:00
ffa3a229b5 Fix restriction violations for provider, circuit models 2020-06-16 14:00:43 -04:00
19a10cee82 Rename base template 2020-04-10 10:21:02 -04:00
46b896b2cf Merge branch 'develop' into develop-2.8 2020-04-06 13:51:05 -04:00
630788731e Closes #4448: Allow connecting cables between two circuit terminations 2020-04-03 13:44:41 -04:00
fa83750e72 Merge branch 'develop-2.8' into 3351-plugins 2020-03-27 13:05:34 -04:00
9c1eda0d9a Closes #4404: Add cable trace button for circuit terminations 2020-03-27 12:35:36 -04:00
8364694fb4 added plugin template content injection to primary model detail views 2020-03-15 23:45:18 -04:00
16d3cebf3e Update markdown filter name 2020-03-09 10:42:32 -04:00
1423fd9024 Rename gfm filter to render_markdown 2020-03-09 10:31:29 -04:00
9f42bce16a Update modal template 2020-03-05 13:55:27 -05:00
2cf990bd92 Standardize on two-word form of "change log" 2020-02-19 12:45:52 -05:00
4ef15e4dc8 Migrate circuits views to use common object list template 2020-02-13 13:31:04 -05:00
2949bfaaa7 Merge branch 'develop' into 2921-tags-select2 2020-01-16 15:33:42 +00:00
834fd408bd Fixes #2921: Replace tags filter with Select2 widget 2020-01-11 15:18:27 +00:00
9f627fd0d3 Merge branch 'develop' into develop-2.7 2020-01-10 13:33:51 -05:00