Michael Abashian 4648c5619e Merge branch 'inventory-source-states' of https://github.com/mabashian/ansible-tower into mabashian-inventory-source-states ...

# Conflicts:
#	awx/ui/client/src/inventories/main.js

2017-05-16 08:37:09 -04:00

..

api

Adding more informative fields to HA model views

2017-05-15 15:47:48 -04:00

conf

Merge branch 'release_3.1.3' into devel

2017-04-28 13:57:04 -04:00

lib

work around a change in ansible 2.3 to Task.get_name()

2017-05-01 10:38:05 -04:00

locale

Pull Spanish updates from Zanata

2017-04-20 08:05:14 -04:00

main

Instance group preference order consistent with docs

2017-05-15 15:45:10 -04:00

playbooks

Fix insights related spelling mistake that could cause failure

2017-04-06 10:57:19 -04:00

plugins

Dependency Updates

2017-05-08 12:03:02 -04:00

settings

Merge branch 'rampart_groups_setup_playbook' into devel

2017-05-12 13:40:30 -04:00

sso

Create tacacs and radius users with password disabled.

2017-05-09 16:36:50 -04:00

static

…

templates

add API versioning for /api/v2/

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

ui

Merge branch 'inventory-source-states' of https://github.com/mabashian/ansible-tower into mabashian-inventory-source-states

2017-05-16 08:37:09 -04:00

__init__.py

updating versions for 3.1.3 release

2017-03-31 12:11:37 -04:00

asgi.py

…

devonly.py

…

urls.py

…

wsgi.py

…