Wayne Witzel III dfd65441b1 Merge pull request #6177 from wwitzel3/devel ...

add organization_id to Inventory summary fields

2017-05-03 17:13:20 -04:00

..

api

Merge pull request #6177 from wwitzel3/devel

2017-05-03 17:13:20 -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

Merge pull request #6135 from AlanCoding/scm_bifurcation

2017-05-03 16:03:11 -04:00

playbooks

Fix insights related spelling mistake that could cause failure

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

plugins

Merge pull request #6120 from AlanCoding/ansible-inventory

2017-05-02 16:19:58 -04:00

settings

modularization of inventory_import command

2017-05-01 14:37:42 -04:00

sso

Merge branch 'release_3.1.3' into devel

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

static

Extend stdout background to width of text.

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

templates

add API versioning for /api/v2/

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

ui

Merge pull request #6156 from marshmalien/fix/stdOutPanesFillHeight

2017-05-03 13:40:00 -04:00

__init__.py

updating versions for 3.1.3 release

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

asgi.py

flake8 fixes for Jenkins

2016-10-14 09:46:41 -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