Jeremy Stretch d23f97abc8 Merge branch 'develop' into develop-2.9

2020-07-22 17:11:35 -04:00

..

circuits

Closes #4871: Specify ordering for querysets using annotate() to count related objects

2020-07-20 12:07:19 -04:00

dcim

Merge branch 'develop' into develop-2.9

2020-07-22 17:11:35 -04:00

extras

Merge branch 'develop' into develop-2.9

2020-07-21 12:57:02 -04:00

ipam

Merge branch 'develop' into develop-2.9

2020-07-21 12:57:02 -04:00

media

Tweak gitignore to include devicetype-images directory

2020-02-20 13:42:23 -05:00

netbox

Move EXEMPT_EXCLUDE_MODELS to settings; add Group and User models

2020-07-22 12:13:07 -04:00

project-static

Update static dependencies

2020-07-16 15:22:31 -04:00

reports

Restore reports directory

2018-08-07 13:47:36 -04:00

scripts

Remove extraneous demo scripts

2019-09-23 09:21:38 -04:00

secrets

Closes #4871: Specify ordering for querysets using annotate() to count related objects

2020-07-20 12:07:19 -04:00

templates

Merge branch 'develop' into develop-2.9

2020-07-21 12:57:02 -04:00

tenancy

Closes #4871: Specify ordering for querysets using annotate() to count related objects

2020-07-20 12:07:19 -04:00

users

Add filters for ObjectPermissions

2020-07-22 16:34:16 -04:00

utilities

Merge branch 'develop' into develop-2.9

2020-07-22 17:11:35 -04:00

virtualization

Merge branch 'develop' into develop-2.9

2020-07-21 12:57:02 -04:00

generate_secret_key.py

…

manage.py

…