Commit Graph

1233 Commits

Author SHA1 Message Date
jeremystretch
511a1a17ef Merge v2.11.2 2021-04-27 14:05:38 -04:00
jeremystretch
dee945e0fc Add migration for CustomLink button_class default 2021-04-27 13:25:57 -04:00
jeremystretch
5548e2850c Fixes #6262: Support filtering by created/updated time for all relevant objects 2021-04-27 10:04:28 -04:00
jeremystretch
c0e9a6d5d8 Fixes #6236: Journal entry title should account for configured timezone 2021-04-23 15:27:58 -04:00
checktheroads
beaa01b76e fix custom link rendering 2021-04-23 09:31:16 -07:00
checktheroads
0372438a24 Merge branch 'feature' of https://github.com/netbox-community/netbox into feature
# Conflicts:
#	netbox/project-static/js/forms.js
#	netbox/templates/dcim/location.html
#	netbox/templates/generic/object_list.html
2021-04-22 19:19:03 -07:00
jeremystretch
a60ec1c230 Closes #5994: Drop support for display_field argument on ObjectVar 2021-04-21 10:29:25 -04:00
checktheroads
c459e774e4 Merge branch 'feature' of https://github.com/netbox-community/netbox into feature
# Conflicts:
#	netbox/templates/generic/object_list.html
2021-04-19 19:40:15 -07:00
jeremystretch
d2e74af032 Merge branch 'develop' into feature 2021-04-15 15:46:48 -04:00
jeremystretch
66b07a6be3 Fixes #5652: Update object data when renaming a custom field 2021-04-15 12:04:34 -04:00
jeremystretch
f77b02dcbf Enable webhooks for JournalEntry 2021-04-14 14:55:01 -04:00
checktheroads
ccc44abb79 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
jeremystretch
c7268c542e Reorganize base TestCase classes 2021-04-14 14:22:58 -04:00
jeremystretch
087b55ba43 Merge branch 'develop' into feature 2021-04-13 16:41:46 -04:00
jeremystretch
79568fd653 Fixes #6056: Optimize change log cleanup 2021-04-13 13:48:22 -04:00
jeremystretch
223561b6e3 Closes #5848: Filter custom fields by content type in format <app_label>.<model> 2021-04-13 11:30:45 -04:00
jeremystretch
8d6a057b91 Closes #6150: Enable change logging for journal entries 2021-04-13 10:53:55 -04:00
jeremystretch
15d3db817a Fixes #5583: Eliminate redundant change records when adding/removing tags 2021-04-13 10:14:25 -04:00
jeremystretch
8ffe6f7907 Merge branch 'develop' into feature 2021-04-12 14:19:30 -04:00
jeremystretch
9160031f38 Fixes #6082: Support colons in webhook header values 2021-04-12 12:09:37 -04:00
jeremystretch
34e911995d Fixes #6130: Improve display of assigned models in custom fields list 2021-04-09 09:43:35 -04:00
jeremystretch
4cb1ae0fd1 Add tagged items count to tag view 2021-04-05 13:53:25 -04:00
jeremystretch
fe2b920649 Use CommentField for JournalEntry comments 2021-04-02 17:14:15 -04:00
jeremystretch
30ff6edb4b Convert all LinkColumns to Column(linkify=True) 2021-04-02 16:59:53 -04:00
jeremystretch
995446bc57 Remove redundant prechange_data assignments 2021-04-02 15:21:11 -04:00
Jeremy Stretch
36d84c5cd5 Use ContentTypeChoiceField for all ContentType fields 2021-04-02 10:55:16 -04:00
Jeremy Stretch
c599a06e26 Changelog & docs for #5380 2021-03-30 18:59:47 -04:00
Martin Rødvand
68e57681d9 Closes #5830: Add as_attachment field to API serializers and admin view. 2021-03-30 23:26:55 +02:00
Martin Rødvand
139afe844b Add boolean as_attachment to Export template 2021-03-30 22:27:26 +02:00
Jeremy Stretch
2cf2627984 Add missing tests for SiteGroup 2021-03-30 11:06:59 -04:00
Jeremy Stretch
7ac9eca2d5 Closes #6038: Include tagged objects list on tag view 2021-03-29 16:53:41 -04:00
Jeremy Stretch
ed35fb5132 Fix ConfigContext application for SiteGroups 2021-03-29 15:57:44 -04:00
Jeremy Stretch
b7c247ca2e Closes #4833: Allow assigning config contexts by device type 2021-03-29 15:40:09 -04:00
Jeremy Stretch
cfcfbf74de Note that 'table' is a reserved name for ExportTemplates 2021-03-29 11:25:57 -04:00
Jeremy Stretch
cebec14a9f Truncate comments in JournalEntryTable 2021-03-29 09:54:06 -04:00
Jeremy Stretch
71e30297c5 Strip microseconds from JournalEntry creation time 2021-03-29 09:48:45 -04:00
Jeremy Stretch
8474f9fc5d Fix journal entry table ordering 2021-03-29 09:44:04 -04:00
Jeremy Stretch
6b5694c612 Add Markdown support for JournalEntry comments 2021-03-29 09:43:21 -04:00
Jeremy Stretch
8784f98c53 Add dedicated view for tags 2021-03-26 15:25:18 -04:00
Jeremy Stretch
09d6264d04 Enable get view tests for organizational objects 2021-03-26 15:15:59 -04:00
Jeremy Stretch
f102cf70e4 Introduce paginate_table() utility to simplify table pagination 2021-03-26 13:02:55 -04:00
checktheroads
923cfc2e6b update css classes for bootstrap 5 colors 2021-03-17 23:31:15 -07:00
checktheroads
e2ba5774c4 fix object journal styles 2021-03-17 22:37:13 -07:00
Jeremy Stretch
54f1308f50 Closes #5998: Introduce ContentTypeColumn 2021-03-17 16:29:43 -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
7b95167aba Add bulk edit, delete views for journal entries 2021-03-17 10:41:06 -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
4ffd2ba841 Initial work on #151: Object journaling 2021-03-16 15:00:08 -04:00