11152 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matthew Jones	cf084850c2	Merge pull request #4960 from ansible/priv_esc_hangs ... Fixes some issues where Tower would not emit the password on prompts	2017-01-27 09:51:57 -05:00
Chris Meyers	4367e4a9ae	Merge pull request #4942 from chrismeyersfsu/fix-vmware_link ... update vmware inventory ini link	2017-01-27 09:18:32 -05:00
Chris Meyers	10a3e972df	Merge pull request #4977 from chrismeyersfsu/fix-4725 ... bump vmware inventory script	2017-01-27 09:18:03 -05:00
Wayne Witzel III	7807ee09f9	Merge pull request #4915 from wwitzel3/issue-4636 ... Mask the default value for password fields in survey_spec.	2017-01-27 02:37:16 -05:00
jaredevantabor	6df36ce038	i accidentally removed the "-1" from this check, adding it back in	2017-01-26 16:29:12 -08:00
Jared Tabor	8ec7808751	Merge pull request #4948 from jaredevantabor/job-results-error-event_type ... Standard out wasn't being shown for all possible event_types	2017-01-26 15:29:46 -08:00
jaredevantabor	6223cb6921	fixing jshint	2017-01-26 14:52:49 -08:00
Jared Tabor	c01936d714	Merge pull request #4950 from jaredevantabor/job-explanation ... Fix for job results explanation and traceback	2017-01-26 14:49:18 -08:00
Chris Meyers	608975ff2f	bump vmware inventory script	2017-01-26 16:01:57 -05:00
Matthew Jones	bfda6ff8b5	Fix up some unit tests	2017-01-26 16:01:54 -05:00
kensible	f25edf63bf	Merge pull request #4973 from kensible/4874-category-dropdown ... Fixed location of sub-category dropdowns	2017-01-26 15:54:52 -05:00
jaredevantabor	2be7a9ded7	moving appendToBottom function elsewhere	2017-01-26 12:48:05 -08:00
jaredevantabor	c751c56355	rearranging logic to match integrity of existing logic	2017-01-26 12:36:15 -08:00
Jared Tabor	7488e09763	Merge pull request #4927 from jaredevantabor/projects-sockets ... Preventing page from refreshing when project list updates via the socket	2017-01-26 12:20:25 -08:00
Jared Tabor	a86f3d61c2	Merge pull request #4925 from jaredevantabor/groups-pagination ... Groups pagination	2017-01-26 12:19:27 -08:00
Ken Hoes	2ed75a0a16	Fixed location of sub-category dropdowns	2017-01-26 15:18:42 -05:00
jaredevantabor	484eda4aa1	fix for traceback	2017-01-26 12:11:31 -08:00
Matthew Jones	90caa2fbb7	Merge pull request #4961 from ansible/purge_old_events_endpoints ... These old endpoints are hacky, ugly, and no longer used	2017-01-26 14:33:19 -05:00
jaredevantabor	bad9e9fcf0	fixing unit test failures	2017-01-26 10:43:18 -08:00
Matthew Jones	6388e9b055	Putting back the inadvertantly removed job_events	2017-01-26 12:00:13 -05:00
Matthew Jones	37d8e57c4f	These old endpoints are hacky, ugly, and no longer used ... They were strictly shortcuts for UI querying which can be performed more efficiently on `/job_events` without any special processing	2017-01-26 11:55:44 -05:00
Matthew Jones	e15273c993	Fixes some issues where Tower would not emit the password on prompts ... Carat seems to only want to match newlines or the beginning of the string, since we seem to get CR+LF this seems to keep the carat from matching so here we're expanding the regex matches. This also extends support for DZDO where it was only originally added on ad-hoc commands inadvertantly. Remove PMRUN support since that was never merged into core	2017-01-26 11:19:23 -05:00
Ryan Petrello	2568c86b71	Merge pull request #4955 from ryanpetrello/fix-4900 ... move the uwsgi master FIFO from /tmp/awxfifo to /var/lib/awx/awxfifo	2017-01-26 10:11:21 -05:00
jaredevantabor	38f4a413d7	Fix for job reults explanation and traceback for SCM update failures	2017-01-25 19:55:01 -08:00
jaredevantabor	69caf45dec	Adding additional check for when event_type isn't a runner_on or playbook_on event	2017-01-25 16:53:12 -08:00
Shane McDonald	dfd7b5ca62	Improve awx/ui/README.md	2017-01-25 18:45:48 -05:00
Shane McDonald	35deb0be37	Simplify UI / Docker targets ... - Renamed npm scripts to reflect what they are actually doing. Nothing is being built here! - Not sure why the default django_host was 0.0.0.0… - Removed unnecessary logic from build-docker-cid	2017-01-25 18:45:48 -05:00
Shane McDonald	7776dc1304	Remove SauceLabs stuff from package.json	2017-01-25 18:45:48 -05:00
Shane McDonald	f9573db5a3	Regenerate npm-shrinkwrap.json ... This file was originally generated with a version of NPM that was affected by a bug that would cause `npm install` to fail on non-macOS systems. We were temporarily forced to downgrade to 3.10.7, but…. this fixes that! Verified on macOS Sierra and CentOS 7 using NPM version 3.10.10.	2017-01-25 18:45:47 -05:00
Shane McDonald	790f30b3cd	Prevent npm install from running every time make ui-docker* is invoked ... awx/ui/package.json is a normal file in the repo, not created by Make.	2017-01-25 18:45:47 -05:00
jlmitch5	ce6f4c9e0c	Merge pull request #4945 from jlmitch5/fixDupAndArrayTags ... fix duplicate and array-based search tags	2017-01-25 17:24:42 -05:00
jlmitch5	c5625c6779	Merge pull request #4944 from jlmitch5/changeResultsToDetails ... fix host event modal from using parent	2017-01-25 17:24:26 -05:00
Ryan Petrello	f061505895	move the uwsgi master FIFO from /tmp/awxfifo to /var/lib/awx/awxfifo ... Resolves #4900	2017-01-25 16:37:11 -05:00
John Mitchell	2f6a797415	fix duplicate and array-based search tags	2017-01-25 15:24:34 -05:00
John Mitchell	3ea70a75ee	fix host event modal from using parent	2017-01-25 14:50:00 -05:00
Jared Tabor	ebf5c85238	Merge pull request #4926 from jaredevantabor/delete-prompt-word-wrapping ... adding word break for delete modal	2017-01-25 11:38:30 -08:00
jaredevantabor	67f2df64b3	Preventing page from refreshing when project list updates via the socket ... fixing jshint	2017-01-25 11:36:22 -08:00
jaredevantabor	572e2301f9	adding word break for delete modal	2017-01-25 11:25:06 -08:00
Bill Nottingham	d025ac9027	Merge pull request #4890 from wenottingham/rolefu ... Nuke galaxy metadata from some Tower setup roles.	2017-01-25 14:18:34 -05:00
Bill Nottingham	87c3183a31	Merge pull request #4922 from wenottingham/thats-no-moon ... Merge foreman inventory script performance fixes.	2017-01-25 14:18:26 -05:00
Ryan Petrello	188e423bd7	Merge pull request #4943 from ryanpetrello/fix-4861 ... fix a typo that results in a NameError	2017-01-25 14:17:41 -05:00
Ryan Petrello	f347bc5ae4	fix a typo that results in a NameError ... Resolves #4861	2017-01-25 14:08:49 -05:00
jaredevantabor	4e61460452	Fixing issue where pagination was overwriting the default params for a group ... when selecting a child group from a paginated set of groups.	2017-01-25 11:05:43 -08:00
Ryan Petrello	a13b2588b2	Merge pull request #4938 from ryanpetrello/release_3.1.0 ... fix a bug which causes activitystream actor assignment to be invalid	2017-01-25 13:54:38 -05:00
Chris Meyers	ef7f69ba80	update vmware inventory ini link	2017-01-25 13:28:06 -05:00
Alan Rominger	4feb7fcb8d	Merge pull request #4862 from AlanCoding/poly_morphin_time ... Unified JT and Unified Job queryset refactor	2017-01-25 13:05:48 -05:00
Alan Rominger	f90447ea95	Merge pull request #4936 from AlanCoding/wf_launch_update ... Update WFJT launch help text	2017-01-25 13:02:34 -05:00
Alan Rominger	fe36e2ad8e	Merge pull request #4921 from AlanCoding/jobs_others_opt ... Low hanging query optimizations	2017-01-25 11:57:08 -05:00
Alan Rominger	460dfe7548	Merge pull request #4916 from AlanCoding/no_missing_dict ... Remove missing resource checks from nodes	2017-01-25 11:53:22 -05:00
Ryan Petrello	e7c5dfeaa4	fix a bug which causes activitystream actor assignment to be invalid ... Resolves #4660	2017-01-25 11:45:12 -05:00