Jeremy Stretch 0dd857f7a2 Merge branch 'develop' into api2

2017-02-01 12:33:37 -05:00

..

api

Implemented static writable ModelSerializers for all models

2017-01-31 15:35:09 -05:00

fixtures

…

migrations

…

tests

…

__init__.py

…

admin.py

…

apps.py

…

fields.py

…

filters.py

…

formfields.py

…

forms.py

Closes #841: Merged search and filter forms on all object lists

2017-01-24 12:05:39 -05:00

lookups.py

…

models.py

Basic Support for Python 3 (#827)

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

tables.py

…

urls.py

…

views.py

Fixes #861: Avoid overwriting device primary IP assignment from alternate family during bulk import of IP addresses

2017-01-31 17:25:44 -05:00