Matthew Jones decd9da058 Merge branch 'master' into reintroduce-zeromq-unstable ...

* master:
  Fix a bug where listing the unified job fields did not include the 'launch_type' parameter, causing failing unit tests
  Inventory Scripts
  Extra var parsing
  Clean up jobs
  Cleanup jobs redirect to jobs page
  Custom inventory : Edit
  Portal credential modal needed
  Fix a bug in how I'm handling ids when creating a unified job as part of the launch process
  Survey Maker
  JS Hint errors

2014-12-01 10:24:18 -05:00

..

api

Make sure we propogate source_script into the related fields it needs to

2014-11-26 11:14:26 -05:00

lib

Fixing the Redis vendor.

2014-11-03 15:13:06 -06:00

main

Merge branch 'master' into reintroduce-zeromq-unstable

2014-12-01 10:24:18 -05:00

playbooks

AC-473 Quote all parameters passed to source control tasks.

2014-02-26 23:12:38 -05:00

plugins

Merge remote-tracking branch 'origin/master' into reintroduce-zeromq-unstable

2014-11-26 13:40:37 -05:00

settings

Merge remote-tracking branch 'origin/master' into reintroduce-zeromq-unstable

2014-11-26 13:40:37 -05:00

static

Retinafied favicon

2014-06-26 15:19:44 -04:00

templates

enable autoescaping of content in the DRF template

2014-10-24 13:55:13 -04:00

ui

Inventory Scripts

2014-12-01 09:34:53 -05:00

__init__.py

Consolidate RPM and DEB build process

2014-10-17 14:54:23 -04:00

devonly.py

Happy new year!!!

2014-01-02 11:51:43 -05:00

urls.py

Removed admin support (no longer used or maintained).

2014-03-28 22:04:26 -04:00

wsgi.py

Reword errors when version metadata does not match or is absent

2014-11-18 12:06:43 -05:00