Michael Abashian 778c4ab557 Merge branch 'modularize-helpers-utilities' of https://github.com/mabashian/ansible-tower into mabashian-modularize-helpers-utilities ...

# Conflicts:
#	awx/ui/client/src/activity-stream/main.js
#	awx/ui/client/src/app.js
#	awx/ui/client/src/helpers.js
#	awx/ui/client/src/helpers/Credentials.js
#	awx/ui/client/src/helpers/Groups.js
#	awx/ui/client/src/helpers/Hosts.js
#	awx/ui/client/src/helpers/teams.js

2017-03-02 10:20:32 -05:00

..

api

prohibit API payloads that represent something other than a JSON object

2017-02-28 13:23:03 -05:00

conf

blacklist certain sensitive fields and relations as search arguments

2017-02-21 16:18:02 -05:00

lib

We specifically need to convert the ansible included file type

2017-02-01 15:30:22 -05:00

locale

Update pot files

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

main

small refactor of python requirement test to work in dev env

2017-03-01 09:04:31 -05:00

playbooks

Properly parse subversion revision info.

2017-01-17 10:04:30 -05:00

plugins

bump vmware inventory script

2017-01-26 16:01:57 -05:00

settings

Merge pull request #5487 from wwitzel3/issue-5341

2017-02-27 10:06:58 -05:00

sso

properly detect the backend name in failed social_auth callbacks

2017-02-14 16:19:39 -05:00

static

Extend stdout background to width of text.

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

templates

say goodbye to 2016

2017-01-13 12:44:07 -05:00

ui

Merge branch 'modularize-helpers-utilities' of https://github.com/mabashian/ansible-tower into mabashian-modularize-helpers-utilities

2017-03-02 10:20:32 -05:00

__init__.py

Bumping versions to 3.2.0

2016-12-04 21:21:22 -05:00

asgi.py

flake8 fixes for Jenkins

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

devonly.py

…

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