Ken Hoes 200bbf55d9 Fixed merge conflicts

2016-11-30 09:39:27 -05:00

..

api

add a period

2016-11-29 11:08:05 -05:00

conf

Merge pull request #4093 from cchurch/tower-url-base-reset

2016-11-22 14:51:09 -05:00

lib

Add multiprocessing RLock around event data output to ensure only one process is writing to stdout at a time.

2016-11-17 09:09:19 -05:00

main

Flake8 can suck it.

2016-11-29 21:30:40 -05:00

playbooks

Fix some issues syncing playbooks

2016-10-24 11:32:21 -04:00

plugins

Fixing up fact cachine related unit tests

2016-11-18 10:23:07 -05:00

settings

Merge pull request #4080 from cchurch/event-stdout-max-bytes-display

2016-11-22 14:50:38 -05:00

sso

Allow specifying multiple LDAP servers.

2016-11-28 16:54:16 -05:00

static

Fix browsable API styles in wide mode.

2016-06-15 17:27:41 -04:00

templates

django i18n

2016-10-18 18:10:39 +05:30

ui

Fixed merge conflicts

2016-11-30 09:39:27 -05:00

__init__.py

Fix flake8 E302 errors.

2016-11-15 20:59:39 -05: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