Graham Mainwaring 1e8e53e811 Merge branch 'devel' of github.com:ansible/ansible-tower into python27_el6 ...

Conflicts:
	packaging/rpm/ansible-tower.spec
	tools/docker-compose/start_development.sh

2016-03-21 12:13:50 -04:00

..

api

Remove unneeded fetch for r/o fields

2016-03-16 13:12:13 -04:00

fact

fixes MONGO_HOST not found error

2016-03-18 10:56:00 -04:00

lib

Fix up statsd work to support python 2.6

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

main

Merge branch 'devel' of github.com:ansible/ansible-tower into python27_el6

2016-03-21 12:13:50 -04: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

Changes for Tower virtualenv support

2016-03-21 12:11:19 -04: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

Removed unused routes

2016-03-17 09:18:01 -04:00

__init__.py

Changes for Tower virtualenv support

2016-03-21 12:11:19 -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