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

Conflicts:
	netbox/circuits/models.py
	netbox/netbox/settings.py
	upgrade.sh

2017-04-21 15:07:48 -04:00

..

templates

#1033: Tweak SelectWithDisabled option template

2017-04-04 14:36:35 -04:00

templatetags

Closes #951: Provide a side-by-side view of rack elevations

2017-04-20 13:07:22 -04:00

__init__.py

Initial push to public repo

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

api.py

Merge pull request #1026 from digitalocean/image-attachments

2017-04-03 14:21:15 -04:00

context_processors.py

Initial push to public repo

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

error_handlers.py

Fixes #865: Fix server error when attempting to delete a protected object parent (Python 3)

2017-02-01 12:09:59 -05:00

fields.py

Fixes #672: Expanded color selection for rack and device roles

2016-12-06 12:28:29 -05:00

filters.py

Closes #981: Allow filtering primary objects by a given set of IDs

2017-03-22 09:39:30 -04:00

forms.py

Merge branch 'develop' into v2-develop

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

managers.py

Fixes #747: Fixes natural_order_by integer cast error on large numbers

2016-12-19 11:01:44 -05:00

middleware.py

Resolved RemovedInDjango20Warning deprecation warnings

2017-04-05 14:40:25 -04:00

models.py

Extended primary models to include 'created' and 'last_updated' fields

2016-06-22 10:19:00 -04:00

paginator.py

Closes #362: Added per_page query parameter to control pagination page length

2017-03-28 15:57:50 -04:00

sql.py

Fixes #531: Order prefixes by VRF assignment

2016-09-15 12:09:54 -04:00

tables.py

Prettied things up a bit

2017-03-29 16:45:25 -04:00

tests.py

Introduced HttpStatusMixin to provide more detail on HTTP response status test failures

2017-03-20 13:46:47 -04:00

utils.py

Fixes #851: Resolve encoding issues during import/export with Python 3

2017-02-01 11:49:54 -05:00

views.py

Merge branch 'develop' into v2-develop

2017-04-21 15:07:48 -04:00