Commit Graph

6936 Commits

Author SHA1 Message Date
checktheroads
fe89b575fa 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
checktheroads
f952498ffc dist updates 2021-03-17 13:00:29 -07:00
checktheroads
65105db111 bootstrap 5 template updates 2021-03-17 13:00:20 -07:00
checktheroads
8173033e68 update select to handle display property 2021-03-17 12:39:35 -07:00
Jeremy Stretch
2479f1d95d Merge pull request #5999 from netbox-community/151-journaling
Closes #151: Add object journaling
2021-03-17 13:14:50 -04:00
Jeremy Stretch
32ee80f834 Add JournalEntry filter for kind 2021-03-17 13:02:40 -04:00
Jeremy Stretch
856efd0617 Add kind field to JournalEntry 2021-03-17 12:51:39 -04:00
Jeremy Stretch
bb007552ee Changelog and documentation for #151 2021-03-17 10:58:40 -04:00
Jeremy Stretch
7b95167aba Add bulk edit, delete views for journal entries 2021-03-17 10:41:06 -04:00
Jeremy Stretch
a0fe83bdfa Skip secondary check if get_absolute_url() not defined for model 2021-03-16 16:48:08 -04:00
Jeremy Stretch
9cba554ec9 Add JournalEntry tests 2021-03-16 16:47:35 -04:00
Jeremy Stretch
720f05976f Add JournalEntry list view w/filtering 2021-03-16 15:57:23 -04:00
Jeremy Stretch
87527744d7 Fix conditional display journal & change log tabs 2021-03-16 15:33:41 -04:00
Jeremy Stretch
4ffd2ba841 Initial work on #151: Object journaling 2021-03-16 15:00:08 -04:00
Jeremy Stretch
1445efc638 Move ConfigContext classes out of models.py 2021-03-16 13:08:07 -04:00
Jeremy Stretch
baf854b9b4 Closes #5975: Allow partial vCPU allocations for virtual machines 2021-03-16 11:52:59 -04:00
Jeremy Stretch
4d21d0028c Closes #5995: Dropped backward compatibility for queryset parameter on ObjectVar and MultiObjectVar 2021-03-16 11:28:50 -04:00
Jeremy Stretch
7a212fbf8b Closes #5990: Deprecated display_field parameter for custom script ObjectVar and MultiObjectVar fields 2021-03-16 11:08:34 -04:00
Jeremy Stretch
fe0d699731 Merge pull request #5992 from netbox-community/5891-api-serializer-display
Closes #5981: Add display field to all REST API serializers
2021-03-16 10:53:59 -04:00
Jeremy Stretch
3b66a55da9 Drop usage of display_field on DynamicModelChoiceFields 2021-03-16 10:29:15 -04:00
Jeremy Stretch
fdaa4a6eb8 Add 'display' field to all REST API serializers 2021-03-16 10:06:25 -04:00
Jeremy Stretch
5b117e98ef Merge pull request #5985 from netbox-community/5284-vlangroup-scope
Closes #5284: Allow VLANGroup assignment beyond sites
2021-03-15 21:11:49 -04:00
Jeremy Stretch
9fa26e6621 Omit prefetch_related() for VLANGroup 2021-03-15 20:58:23 -04:00
Jeremy Stretch
54b23d4353 Merge branch 'feature' into 5284-vlangroup-scope 2021-03-15 20:48:55 -04:00
Jeremy Stretch
6fa2d0bb91 Fix up VLANGroup tests 2021-03-15 20:35:18 -04:00
Jeremy Stretch
73ae61c73d Extend VLANGroup to support cluster/cluster group assignment 2021-03-15 16:32:07 -04:00
checktheroads
7bd5dd91ce dist updates 2021-03-15 08:54:09 -07:00
checktheroads
66eed35768 bootstrap 5 template updates 2021-03-15 08:54:01 -07:00
checktheroads
8e354d8c09 fix form error rendering 2021-03-15 08:53:48 -07:00
checktheroads
b16f7e0605 add startswith helper 2021-03-15 08:53:28 -07:00
checktheroads
7de57b2ea9 remove console.log 2021-03-15 08:34:35 -07:00
checktheroads
27dd23db73 customize file upload field 2021-03-15 07:49:59 -07:00
checktheroads
4b223a0b9b fix select loading display 2021-03-15 07:49:39 -07:00
checktheroads
bcec4d6a59 dist updates 2021-03-14 17:32:07 -07:00
checktheroads
0623ffcfae style fixes 2021-03-14 17:31:55 -07:00
checktheroads
fec8cf1692 fix styling when element is not in a form-floating div 2021-03-14 17:31:42 -07:00
checktheroads
26461b1a17 improve handling of loading data 2021-03-14 17:31:06 -07:00
checktheroads
d1aefd2bb4 fix search panel styling 2021-03-14 17:27:03 -07:00
checktheroads
26a5b9ac13 update templates to bootstrap 5 classes 2021-03-14 17:26:56 -07:00
checktheroads
0168d620ce fix device & device component templates 2021-03-14 17:26:33 -07:00
checktheroads
8ea58960a7 dist updates 2021-03-14 01:07:01 -07:00
checktheroads
4dc73c829d handle server-side form errors 2021-03-14 01:06:51 -07:00
checktheroads
3db4db1069 fix select data handling 2021-03-14 01:06:35 -07:00
checktheroads
14885fa9d1 update templates to bootstrap 5 classes 2021-03-14 01:06:18 -07:00
checktheroads
9ccd8e8370 Merge branch 'feature' of github.com:checktheroads/netbox into feature 2021-03-13 14:26:47 -07:00
checktheroads
c1c3aeff74 fix prefix layout 2021-03-13 14:26:12 -07:00
checktheroads
e9374a17d9 update templates to bootstrap 5 classes 2021-03-13 14:26:06 -07:00
checktheroads
9fdeb762ad update templates to bootstrap 5 classes 2021-03-13 14:15:23 -07:00
checktheroads
bc4bb4e713 add dist to git 2021-03-13 13:56:40 -07:00
checktheroads
baf88944f3 add UI readme 2021-03-13 13:51:55 -07:00