Michael Abashian fc16473c03 Merge branch 'log-viewer-cleanup' into devel ...

# Conflicts:
#	awx/ui/client/src/helpers.js

2016-02-26 11:45:18 -05:00

..

api

Add the id field to the default summary fields

2016-02-26 11:30:34 -05:00

fact

reorganzing tests folder

2016-02-01 18:37:56 -05:00

lib

Fix up statsd work to support python 2.6

2016-02-02 09:58:19 -05:00

main

Merge pull request #1020 from cchurch/ad-hoc-check-mode-fixes

2016-02-25 16:45:25 -05:00

playbooks

Refactor scan_packages for os detection

2015-11-24 14:19:09 -05:00

plugins

Include @anoek's changes from #1029.

2016-02-25 15:01:29 -05:00

settings

Merge pull request #977 from cchurch/api-raw-data-form-fixes

2016-02-23 12:23:14 -05:00

sso

Add sample config for LDAP connection options, disable referrals by default, prefetch user groups to reduce LDAP queries when checking group memberships.

2015-12-11 15:00:20 -05:00

static

Update browsable API styling based on UI feedback.

2016-02-12 00:07:15 -05:00

templates

Update browsable API styling based on UI feedback.

2016-02-12 00:07:15 -05:00

ui

Merge branch 'log-viewer-cleanup' into devel

2016-02-26 11:45:18 -05:00

__init__.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

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