Jeremy Stretch 9b39ba169c Merge branch 'develop' into api2 ...

Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/urls.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py
	netbox/dcim/tables.py
	requirements.txt

2017-03-02 16:01:25 -05:00

..

api

Re-implemented CustomFieldSerializer (read-only for now)

2017-02-09 16:55:54 -05:00

fixtures

Closes #176: Added initial_data fixtures for new installs

2016-08-01 12:29:26 -04:00

migrations

Closes #783: Add a description field to the Circuit model

2017-01-17 15:18:03 -05:00

__init__.py

Fixes #817: Update last_updated time of a circuit when editing a child termination

2017-01-23 15:31:41 -05:00

admin.py

Closes #49: Introduction of circuit terminations

2016-12-14 13:47:22 -05:00

apps.py

Fixes #817: Update last_updated time of a circuit when editing a child termination

2017-01-23 15:31:41 -05:00

filters.py

Merge branch 'develop' into api2

2017-03-02 16:01:25 -05:00

forms.py

Closes #927: Upgrade to django-filter 1.0

2017-03-01 13:09:19 -05:00

models.py

Basic Support for Python 3 (#827)

2017-01-23 16:44:29 -05:00

signals.py

Fixes #817: Update last_updated time of a circuit when editing a child termination

2017-01-23 15:31:41 -05:00

tables.py

Closes #783: Add a description field to the Circuit model

2017-01-17 15:18:03 -05:00

urls.py

Closes #49: Introduction of circuit terminations

2016-12-14 13:47:22 -05:00

views.py

Merged develop

2017-02-28 16:10:53 -05:00