Greg Considine 81dea61ba9 Merge branch 'devel' into uxi/templates

2017-04-05 15:37:49 -04:00

..

api

basic fact search grammar

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

conf

add API versioning for /api/v2/

2017-03-30 15:11:12 -04:00

lib

property filter no_log for item event loops

2017-03-22 11:15:33 -04:00

locale

Update pot files

2017-02-09 09:37:21 -05:00

main

Merge pull request #5946 from AlanCoding/work_success_except

2017-04-04 13:54:09 -04:00

playbooks

Make sure the insight playbook fetch doesn't quote user and pass

2017-03-29 16:42:15 -04:00

plugins

Fix case where Get-ChildItems does not return any results

2017-03-10 14:53:05 -05:00

settings

always use async http logging - even in celery workers

2017-03-15 13:17:01 -04:00

sso

allow is_system_auditor with AUTH_LDAP_USER_FLAGS_BY_GROUP

2017-03-07 16:48:51 -05:00

static

Extend stdout background to width of text.

2016-12-14 13:50:51 -05:00

templates

add API versioning for /api/v2/

2017-03-30 15:11:12 -04:00

ui

Merge branch 'devel' into uxi/templates

2017-04-05 15:37:49 -04:00

__init__.py

Bump version for 3.1.2 release

2017-03-07 16:48:48 -05:00

asgi.py

flake8 fixes for Jenkins

2016-10-14 09:46:41 -04:00

devonly.py

fixed copyright date

2015-06-11 16:10:23 -04:00

urls.py

Update default error pages.

2016-02-02 23:00:07 -05:00

wsgi.py

Update Django to 1.8 and DRF to 3.3, add new Django migrations, update serializers/pagination/metadata, update browsable API styling.

2016-02-02 17:48:04 -05:00