Akita Noek 92df6b0fb2 Merge branch 'devel' into rbac

2016-03-18 16:26:45 -04:00

..

api

Merge remote-tracking branch 'ansible/devel' into merge-devel

2016-03-18 15:40: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' into rbac

2016-03-18 16:26:45 -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

Mass active flag code removal

2016-03-15 09:29:55 -04:00

sso

more .users -> member_role.members

2016-03-15 17:00:20 -04: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

Merge remote-tracking branch 'ansible/devel' into merge-devel

2016-03-18 15:40:13 -04:00

__init__.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

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