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

22 Commits

Author SHA1 Message Date
46cd22ea7e style textareas supporting markdown with monospace font 2021-03-17 23:30:39 -07: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
a694dbb020 Closes #5990: Deprecated display_field parameter for custom script ObjectVar and MultiObjectVar fields 2021-03-16 11:08:34 -04:00
c64f96d65b Drop usage of display_field on DynamicModelChoiceFields 2021-03-16 10:29:15 -04:00
94c25b0ff4 update templates & rendering for bootstrap 5 2021-03-13 02:27:32 -07:00
8de20fcd1f Closes #5375: Add 'speed' attribute to console port models 2021-03-03 10:20:08 -05:00
3d3748d6f5 Fixes: #5315 - Make "null_option" on DynamicModelChoiceField also null the value on the model. (#5704)
Fixes: #5315 - Fix site unassignment from VLAN when using "None" option
2021-02-12 10:53:40 -06:00
2b0ddd2a98 Closes #5399: Show options for cable endpoint types during bulk import 2020-12-02 10:08:41 -05:00
cadba74b1f #5306: Introduce CSVContentTypeField for cable termination types 2020-12-01 11:03:05 -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
7598b891c1 Add initial_params to all forms 2020-11-04 11:09:13 -05:00
1f0b1dd10e Add initial_params to DynamicModelChoiceMixin 2020-11-04 10:15:15 -05:00
0cc2a6b2cf Closes #5003: CSV import now accepts slug values for choice fields 2020-09-18 13:03:38 -04:00
b891b407d4 Add brief_mode to DynamicModelChoiceMixin 2020-08-12 14:15:34 -04:00
c40df97ffa Rename add_additional_query_param() 2020-08-12 13:59:11 -04:00
e9e77fc689 Add disabled_indicator to DynamicModelChoiceMixin 2020-08-12 13:30:49 -04:00
8a8b4e728a Move null_option to DynamicModelChoiceMixin 2020-08-12 09:47:13 -04:00
f3fb85933f Add query_params attribute to DynamicModelChoiceMixin 2020-08-12 09:28:24 -04:00
a831e525da Remove value_field from APISelect; reference to_field_name on field 2020-08-11 17:19:40 -04:00
fdc43f8279 Add display_field kwarg to DynamicModelChoiceMixin 2020-08-11 17:00:28 -04:00
5b438c3f30 Refactor utility form resources into separate modules 2020-08-11 15:14:06 -04:00