Jeremy Stretch 0de857bf7a Merge branch 'develop' into develop-2.8 6 lat temu
..
api 2e83ce76ed Fix race condition in available-prefix/ip APIs 6 lat temu
migrations b475a575e4 Drop family column from Aggregate, Prefix, and IPAddress models 6 lat temu
tests 0de857bf7a Merge branch 'develop' into develop-2.8 6 lat temu
__init__.py 741f93999b PEP8 clenaup 9 lat temu
apps.py 980d62d579 Removed Python 2 string compatibility 7 lat temu
choices.py fdf8211e9a Fixes #3930: Fix API rendering of the family field for aggregates 6 lat temu
constants.py c6473d654d Add explanatory text for constants 6 lat temu
fields.py b475a575e4 Drop family column from Aggregate, Prefix, and IPAddress models 6 lat temu
filters.py 0de857bf7a Merge branch 'develop' into develop-2.8 6 lat temu
formfields.py b7e71f9f39 Add tests for IP address vars 6 lat temu
forms.py 9fa5004a35 Closes #4324: Add CSV import view for services 6 lat temu
lookups.py 28e3b7af18 Merge branch 'develop' into develop-2.8 6 lat temu
managers.py 28e3b7af18 Merge branch 'develop' into develop-2.8 6 lat temu
models.py 0de857bf7a Merge branch 'develop' into develop-2.8 6 lat temu
querysets.py bdb3838d71 Replace all instances of .extra() in QuerySets with annotations, including references in docstrings 6 lat temu
tables.py 1a997610c7 Fixes #4241: Correct IP address hyperlinks on interface view 6 lat temu
urls.py 9fa5004a35 Closes #4324: Add CSV import view for services 6 lat temu
validators.py aa56c020ab Move prefix_validator() to ipam.validators 6 lat temu
views.py 0de857bf7a Merge branch 'develop' into develop-2.8 6 lat temu