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
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
Ken Hoes
84144ab806
Updated wording in dropdown and tabs
2016-11-29 13:24:16 -05:00
jaredevantabor
dc032489c2
fixing jshint errors
2016-11-29 09:57:20 -08: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
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
jaredevantabor
ff0a446d77
adding labels for job type on jobs list
2016-11-28 10:10:39 -08:00
Jared Tabor
f4f589ce19
Merge pull request #4122 from jaredevantabor/host-event-modal
...
Changing the codemirror on the host event modal for custom stdout
2016-11-28 09:05:36 -08:00
jaredevantabor
82616cb47f
fixing up HTML files for readability
2016-11-28 09:03:41 -08:00
jaredevantabor
1d3737d553
changing the codemirror on the host event modal for custom stdout
...
more style changes to host event stdout
2016-11-28 08:32:51 -08:00
Ryan Fitzpatrick
d77cc5c984
Replace dropped psutil in ansible requirements ( #4118 )
2016-11-28 10:19:42 -05:00
Michael Abashian
236f5fdee7
Merge pull request #4110 from mabashian/workflow-surveys
...
Workflow edit survey/show survey on launch
2016-11-28 09:45:23 -05:00
Aaron Tan
d7c9ff209d
Merge pull request #4112 from jangsutsr/4054_add_org_to_wfjt_related_fields
...
Add org to wfjt related fields
2016-11-26 16:12:07 -05:00
Aaron Tan
f0b65d36bd
Add new version indicator
2016-11-26 12:10:21 -05:00
Aaron Tan
a27ab393de
Merge pull request #4113 from jangsutsr/4095_add_workflow_object_roles_list_endpoint
...
Add workflow job template object_roles_list endpoint
2016-11-26 12:05:59 -05:00
Aaron Tan
d809227cac
Add wfjt object_roles_list endpoint.
2016-11-25 22:46:46 -05:00
Aaron Tan
8eb4b7b271
Add reversed relationship.
2016-11-25 22:02:23 -05:00
Jared Tabor
e4510f4e64
Merge pull request #4106 from jaredevantabor/job-result-time-badge
...
Job result time badge
2016-11-23 14:16:29 -08:00
Michael Abashian
639eec95e7
Workflow edit survey/show survey on launch
2016-11-23 16:34:04 -05:00
Alan Rominger
df658e7f65
Merge pull request #4108 from AlanCoding/wfjt_ssf
...
Add WFJT survey and recent_jobs
2016-11-23 16:11:16 -05:00
AlanCoding
dc3e744dda
change unit tests to work with JobTemplateMixin serializer
2016-11-23 16:06:23 -05:00
AlanCoding
bf0a235ce9
Add WFJT survey and recent_jobs
2016-11-23 15:48:11 -05:00
jaredevantabor
5b0f7741a7
parse-stdout.service unit tests for time badge
2016-11-23 11:53:34 -08:00
jaredevantabor
5ae0335563
fixing css for time badge
2016-11-23 10:10:55 -08:00
Matthew Jones
95f3eacf25
Remove -e flags from requirements to fix build
...
These cause some odd behavior with egg-info links
2016-11-23 04:50:43 -05:00
Michael Abashian
595c2c7761
Merge pull request #4101 from mabashian/3972-workflow-details-sockets
...
Hooking up sockets to the workflow details page
2016-11-23 09:43:51 -05:00
Shane McDonald
7342210ca6
Remove awx/job_output in clean target
2016-11-23 08:55:55 -05:00
Chris Meyers
ebfa3b1891
Merge pull request #4062 from chrismeyersfsu/rebase_requirements
...
Rebase requirements
2016-11-22 22:58:00 -06:00
jaredevantabor
ad2b5cf553
adding start timei badge to header lines of stdout
2016-11-22 14:06:08 -08:00
Michael Abashian
5cf5bc697d
Removed leftover commented code and cleaned up a variable name
2016-11-22 16:33:30 -05:00
Michael Abashian
59e3552fa3
Hooking up sockets to the workflow details page
2016-11-22 16:24:02 -05:00
Alan Rominger
6bffaec6f9
Merge pull request #4066 from AlanCoding/log_doc
...
Logging Integration feature documentation
2016-11-22 15:38:43 -05:00
Chris Church
f15144807f
Merge pull request #4093 from cchurch/tower-url-base-reset
...
Reset TOWER_URL_BASE to the hostname used for the request
2016-11-22 14:51:09 -05:00
Chris Church
8ba2c57b1e
Merge pull request #4092 from cchurch/custom-logo-custom-login-info
...
Add support for CUSTOM_LOGO and CUSTOM_LOGIN_INFO settings
2016-11-22 14:50:59 -05:00
