Shane McDonald 4fdf462b98 Merge branch 'release_3.3.0' into awx/devel ...

# Conflicts:
#	awx/ui/client/src/standard-out/standard-out-factories/main.js
#	awx/ui/package.json

2018-04-27 10:17:59 -04:00

..

api

remove the legacy fact cleanup system template

2018-04-25 14:20:19 -04:00

conf

validate group type params

2018-03-21 09:13:08 -04:00

lib

Merge branch 'release_3.2.4' into release_3.3.0

2018-04-26 11:10:28 -04:00

locale

Pull updated translations

2017-12-11 09:42:06 -05:00

main

revert change to allow org members to see teams

2018-04-26 13:37:08 -04:00

network_ui

add more logs for network canvas activity

2018-04-23 15:29:13 -04:00

playbooks

Only pass --force if we have an scm_result (i.e., we ran an actual checkout/revision change.)

2018-04-25 13:46:46 -04:00

plugins

Updating vmware_inventory from upstream

2018-04-23 12:59:41 -04:00

settings

Merge branch 'release_3.2.4' into release_3.3.0

2018-04-26 11:10:28 -04:00

sso

update radius backend for dr1.3.3

2018-04-25 15:04:46 -04:00

static

Update .gitignore, remove ui static file from wrong dir

2017-07-25 09:39:06 -04:00

templates

clears authtoken & add PAT

2018-02-22 15:18:12 -05:00

ui

Merge branch 'release_3.3.0' into awx/devel

2018-04-27 10:17:59 -04:00

__init__.py

Rollback celery

2018-02-22 09:37:14 -05:00

asgi.py

…

celery.py

Rollback celery

2018-02-22 09:37:14 -05:00

devonly.py

…

urls.py

Moves network_ui_test to an external repo

2018-03-23 17:00:27 -04:00

wsgi.py

Update middleware warning for latest minor version

2018-03-08 12:54:26 -05:00