14596 Commits

Author SHA1 Message Date
jaredevantabor
be3ec6d8d8 making jerkins happy 2016-11-30 17:39:51 -05:00
jaredevantabor
7b3d9168df making jerkins happy 2016-11-30 14:15:27 -08:00
Michael Abashian
50691b77db Typo's and leftover injections that are no longer used. 2016-11-30 17:00:18 -05:00
Michael Abashian
089f369cc4 Implemented WFJT copy and moved JT copy away from a viewless route 2016-11-30 16:55:19 -05:00
AlanCoding
3643d9c06b allow for reloading of logging settings via CTiT 2016-11-30 16:52:47 -05:00
Chris Meyers
5cf0b8929f Merge pull request #4176 from chrismeyersfsu/fix-artifacts
artifact data comes in as a dict
2016-11-30 16:38:40 -05:00
Chris Meyers
88d6552b86 artifact data comes in as a dict 2016-11-30 16:25:27 -05:00
kensible
1d9c52572d Merge pull request #4172 from kensible/4151-azure-ctint
Added Azure form to authentication section
2016-11-30 15:46:10 -05:00
jaredevantabor
7db6f35650 Filtering out project syncs by default on the jobs list
by adding the query param `not__launch_type='sync'`
2016-11-30 12:28:04 -08:00
jaredevantabor
31781fa3d8 fixing some broken links on the job results page 2016-11-30 11:30:43 -08:00
Ken Hoes
90d163f126 Added Azure form to authentication section 2016-11-30 13:25:13 -05:00
Ken Hoes
8028b7ef75 Added image upload for custom logo 2016-11-30 13:15:30 -05:00
Ken Hoes
99fd30e84f Added required, list parsing, form-gen cleaning 2016-11-30 13:15:30 -05:00
Jared Tabor
011d17613f Merge pull request #4166 from jaredevantabor/job-results-labels
Job Labels should be collapsible
2016-11-30 09:49:37 -08:00
Chris Church
6a02ca1de0 Add support for encrypting settings that are passwords. 2016-11-30 11:22:39 -05:00
Ken Hoes
43e201c832 Merge branch 'kensible-ctit-small-fixes' into devel 2016-11-30 09:39:39 -05:00
Ken Hoes
200bbf55d9 Fixed merge conflicts 2016-11-30 09:39:27 -05:00
kensible
9cb39cb0d9 Merge pull request #4159 from kensible/4152-copy-changes
Updated wording in dropdown and tabs
2016-11-30 09:18:44 -05:00
Chris Church
2efe178fd4 Flake8 can suck it. 2016-11-29 21:30:40 -05:00
jaredevantabor
e53509520f adding badge for indicating a job was launched by a workflow
on the jobs list and the job results page
2016-11-29 17:16:35 -08:00
jaredevantabor
9dcd6d52af making labels section collapsible on job results 2016-11-29 14:44:27 -08:00
Chris Church
0bde7bf920 Merge pull request #4141 from cchurch/multiple-ldap-servers
Allow specifying multiple LDAP servers.
2016-11-29 17:07:55 -05:00
AlanCoding
37ef4e8bc8 HTTP logger overrides kwargs with settings 2016-11-29 16:26:28 -05:00
Matthew Jones
9cecb7d870 Cleaning up some parts of the logging branch
* Fixing some flake8 warnings
* Removing some superflous print statements
2016-11-29 15:02:20 -05:00
Matthew Jones
1921f8cf04 Re-sync tower and ansible dependencies 2016-11-29 15:02:20 -05:00
AlanCoding
f3805b1317 enable Logstash auth and prepare for handler for multiple auth types 2016-11-29 14:05:19 -05:00
Matthew Jones
7df11c59c0 Adding requests-futures dependency 2016-11-29 13:40:35 -05:00
Matthew Jones
cad112e8da Add python-logstash dependency 2016-11-29 13:29:13 -05:00
Ken Hoes
84144ab806 Updated wording in dropdown and tabs 2016-11-29 13:24:16 -05:00
AlanCoding
f3427d1359 Logging Integration, ELK docker-compose as update file 2016-11-29 13:09:47 -05:00
Aaron Tan
88bf975368 Pytest fixture adjustment. 2016-11-29 12:58:04 -05:00
jaredevantabor
dc032489c2 fixing jshint errors 2016-11-29 09:57:20 -08:00
Aaron Tan
a458bb3c89 Remove source_workflow_job and use workflow_job_id instead. 2016-11-29 11:55:04 -05:00
Chris Church
9c2ae43ac6 Clear cache between tests to prevent cached settings sticking around. 2016-11-29 11:50:24 -05:00
Bill Nottingham
6de0057c03 add a period 2016-11-29 11:08:05 -05:00
Chris Meyers
6c0b97675a handle special case pkg_name[pkg_subname] 2016-11-29 10:17:07 -05:00
Alan Rominger
25eaae5f09 Merge pull request #4140 from ansible/AlanCoding-patch-1
Fix scan job relaunch bug
2016-11-29 08:52:01 -05:00
AlanCoding
dd02ab329a add test assertions that check the relaunch job_type bug 2016-11-29 08:07:57 -05:00
Chris Church
48391dfa5e Don't prompt for basic auth if AUTH_BASIC_ENABLED is False. 2016-11-28 23:09:14 -05:00
Chris Church
2e8faeaf0d AzureAD auth updates. Add auth backend to settings, add microsoft icon to fontcustom, add azuread support to login modal. 2016-11-28 22:12:50 -05:00
Alan Rominger
fbd27e25a6 Fix scan job relaunch bug 2016-11-28 16:55:11 -05:00
Chris Church
934da3c425 Allow specifying multiple LDAP servers. 2016-11-28 16:54:16 -05:00
Michael Abashian
29cc5d0f2e Merge pull request #4129 from mabashian/3959-template-type-column-v2
Fix the type column on the templates list
2016-11-28 15:39:04 -05:00
Jared Tabor
4aea3ebc5b Merge pull request #4125 from jaredevantabor/job-list-labels
adding labels for job type on jobs list
2016-11-28 11:35:58 -08:00
Chris Church
cbc52c7b69 Update elapsed in real time when job is running. 2016-11-28 14:35:37 -05:00
jaredevantabor
d332c3bbe6 removing old lines 2016-11-28 11:34:42 -08:00
Michael Abashian
d76ef1419e Added GetChoices to the templates list to properly display the template type 2016-11-28 13:44:28 -05:00
Matthew Jones
34add726b7 Hide active tasks if anonymous user 2016-11-28 13:35:43 -05:00
Chris Church
01f59b4696 Update defaults for SAML info/contact settings. 2016-11-28 13:16:29 -05:00
Chris Church
7889e07229 Use the right base class for super(). 2016-11-28 13:10:45 -05:00