Jeremy Stretch b01bf6089c Merge branch 'develop' into v2-develop ...

Conflicts:
	netbox/dcim/forms.py
	netbox/dcim/views.py
	netbox/ipam/forms.py
	netbox/templates/_base.html
	netbox/utilities/views.py

2017-04-13 15:42:50 -04:00

..

templatetags

Created a template tag for displaying utilization graphs

2016-07-20 13:56:17 -04:00

bulk_edit_form.html

Standardized naming of return_url for all object views

2017-01-23 14:07:26 -05:00

confirm_bulk_delete.html

Re-implemented method for bulk editing/deleting all objects within a filtered queryset

2017-01-20 16:42:11 -05:00

confirmation_form.html

Improved handling of return_url for object edit/delete views; removed manual definitions of initial data fields

2017-04-13 13:11:23 -04:00

obj_delete.html

Converted all delete CBVs to use utilities/obj_delete.html

2016-05-12 15:46:02 -04:00

obj_edit.html

Initial work on #152: Image attachments

2017-03-30 21:55:57 -04:00

obj_table.html

Fixes #845: Fix missing edit/delete buttons on object tables for non-superusers

2017-01-26 13:20:56 -05:00

render_custom_fields.html

Initial work on custom fields

2016-08-12 17:20:01 -04:00

render_field.html

Fixes #692: Form errors are not displayed on checkbox fields

2016-11-14 11:13:27 -05:00

render_form.html

Initial push to public repo

2016-03-01 11:23:03 -05:00