12954 Commits

Author SHA1 Message Date
Ken Hoes
2ed75a0a16 Fixed location of sub-category dropdowns 2017-01-26 15:18:42 -05:00
Chris Meyers
fbebc58267 add tests for license add host duplicate or not logic 2017-01-26 15:16:33 -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
Chris Meyers
e09a0fb886 ensure manually modifying hosts adhears to license
* Super user or not, don't allow adding NOR editing (changing the name
of) a host to exceed the host license count.
2017-01-26 12:13:06 -05: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
AlanCoding
3b4af0aa82 WFJT activity stream optimization 2017-01-26 11:23:47 -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
AlanCoding
77f0625d44 include WFJTs in activity stream for org_admins 2017-01-26 09:00:11 -05:00
AlanCoding
eaffde438b encode logic for JT name-uniqueness in data generator 2017-01-26 09:00:10 -05:00
AlanCoding
28ef16e1e8 activitiy stream optimization for org admins with large data sets 2017-01-26 09:00:07 -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
Michael Abashian
7c4b77284e Merge pull request #4934 from mabashian/4906-workflow-launch
Fix workflow details view
2017-01-25 10:56:23 -05:00
AlanCoding
62d2a30d70 updated WFJT launch help text 2017-01-25 10:49:31 -05:00
Michael Abashian
a380830861 Building workflow node tree now returns a promise. Code needed to be updated accordingly 2017-01-25 10:46:28 -05:00
Alan Rominger
8b31251b64 Merge pull request #4928 from AlanCoding/wf_todo
Remove workflow TODOs
2017-01-25 10:18:49 -05:00
Alan Rominger
8cbb841989 Merge pull request #4930 from AlanCoding/launch_type_migration
include added launch_type choice in 3.1 migration
2017-01-25 10:13:13 -05:00
Chris Meyers
dff41bf035 Merge pull request #4919 from chrismeyersfsu/fix-4698
more correctly handle notification email list
2017-01-25 09:57:00 -05:00
AlanCoding
bae3fdb635 removal of workflow TODOs that are resolved 2017-01-25 09:52:05 -05:00
AlanCoding
c22cf2f7e6 more presets and timing functionality to data generator 2017-01-25 09:51:25 -05:00
AlanCoding
f265d2fe0f tighten up code for new UJ queryset 2017-01-25 09:51:24 -05:00