Commit Graph

11397 Commits

Author SHA1 Message Date
jlmitch5 61f4352a97 Merge pull request #22 from jlmitch5/sshToMachine
update ssh to machine in ui for credential types lookups
2017-07-24 20:11:40 -04:00
Michael Abashian 175f4e7e98 Merge pull request #5 from mabashian/7248-workflow-editor
Fixed workflow maker dialog styling
2017-07-24 17:33:17 -04:00
Greg Considine 0636c6be2e Merge pull request #26 from gconsidine/ui/fix/credential-kind-list
Assign credential `kind` on change of credential list data
2017-07-24 17:28:26 -04:00
Michael Abashian 2125a9b8d0 Merge pull request #31 from mabashian/7281-xss-inv-source
Fix inv source schedule title sanitizing
2017-07-24 17:23:38 -04:00
Michael Abashian 35f70965aa Merge pull request #28 from mabashian/7279-xss
Fixed xss vulnerabilities within the delete permissions modals
2017-07-24 17:22:43 -04:00
Michael Abashian b9b37f4ca9 Merge pull request #21 from mabashian/7254-xss
xss tooltip vulnerability fixes
2017-07-24 17:20:52 -04:00
Michael Abashian f5f575843e Merge pull request #11 from mabashian/7249-multi-line-login
Allow for new lines in login info block
2017-07-24 17:20:02 -04:00
Michael Abashian 70c5061c29 Merge pull request #9 from mabashian/7262-job-details-deleted-inv
Check for inventory id before trying to build a link to it in job results
2017-07-24 17:19:27 -04:00
gconsidine 20162014b7 Add check if list is an array before looping 2017-07-24 16:50:19 -04:00
Ryan Petrello 6b6b4de205 Merge pull request #13 from ryanpetrello/fix-7252
allow Job Templates to launch with *only* a vault credential
2017-07-24 16:36:44 -04:00
Alan Rominger ca2671f17e Merge pull request #2 from AlanCoding/ansible_inv_update
Pull upstream changes for ansible-inventory backport
2017-07-24 16:34:12 -04:00
Ryan Petrello 243c36d28f Merge pull request #30 from ryanpetrello/fix-isolated-awx
fix tower-expect -> awx-expect for isolated tower builds
2017-07-24 16:22:02 -04:00
mabashian c9f39d6306 Fix inv source schedule title sanitizing 2017-07-24 16:18:36 -04:00
Ryan Petrello 94efdec092 Merge pull request #12 from ryanpetrello/fix-6776
don't allow boolean credential type fields that specify `secret`
2017-07-24 16:17:56 -04:00
Ryan Petrello 8ce1421c6a fix tower-expect -> awx-expect for isolated tower builds 2017-07-24 16:03:58 -04:00
Chris Meyers 145caafdc8 Merge pull request #17 from chrismeyersfsu/fix-6570
all dependent jobs must finish before starting job
2017-07-24 15:33:23 -04:00
Chris Meyers f6e68016fa Merge pull request #20 from chrismeyersfsu/fix-6762
fix api docs sample host_filter queries
2017-07-24 15:30:46 -04:00
AlanCoding 4aa332d7e1 pull upstream changes for ansible-inventory backport 2017-07-24 15:25:54 -04:00
mabashian b6547fe97a Fixed xss vulnerabilities within the delete permissions modals 2017-07-24 15:14:48 -04:00
Jim Ladd deb8eaa982 Disable POST to v1 inventory_sources 2017-07-24 14:42:08 -04:00
gconsidine ce4eccc513 Add assignment of on list change 2017-07-24 14:27:40 -04:00
Jim Ladd 8983351e99 Deprecate post to v2 jobs (#18) 2017-07-24 14:24:38 -04:00
mabashian 084163173a Removed extra sanitize filters 2017-07-24 14:10:17 -04:00
mabashian 15b01b99f3 More linkout fixes for the permissions modal 2017-07-24 14:08:08 -04:00
John Mitchell 4fe2f90689 update ssh to machine 2017-07-24 13:58:00 -04:00
mabashian 4e5090f28c xss tooltip vulnerability fixes 2017-07-24 13:50:34 -04:00
Chris Meyers ec212db83b fix api docs sample host_filter queries 2017-07-24 13:48:20 -04:00
Chris Meyers 01316aebf7 Merge pull request #7 from chrismeyersfsu/fix-7261
allow smart inventory to be created
2017-07-24 13:43:59 -04:00
Chris Meyers eaddafc920 allow smart inventory to be created
related to https://github.com/ansible/ansible-tower/issues/7261
2017-07-24 13:43:15 -04:00
Chris Meyers 525490a9a0 all dependent jobs must finish before starting job
related to https://github.com/ansible/ansible-tower/issues/6570 https://github.com/ansible/ansible-tower/issues/6489

* Ensure that all jobs dependent on a job have finished (i.e. error,
success, failed) before starting the dependent job.
* Fixes a bug where a smaller set of dependent jobs to fail upon a
update_on_launch job failing is chosen.
* This fixes the bug of jobs starting before dependent Project Updates
created via update on launch. This also fixes similar bugs associated
with inventory updates.
2017-07-24 12:31:35 -04:00
Alan Rominger 2ce300aa1e Merge pull request #15 from AlanCoding/awx_morphin
update TOWER_VENV_PATH setting to new awx location
2017-07-24 12:26:08 -04:00
AlanCoding eaeff7e290 rename setting TOWER_VENV_PATH to AWX_VENV_PATH 2017-07-24 12:23:54 -04:00
AlanCoding 6e3978fe66 update TOWER_VENV_PATH setting to new awx location 2017-07-24 12:13:46 -04:00
Ryan Petrello b0f5d2f82d allow Job Templates to launch with *only* a vault credential
see: https://github.com/ansible/ansible-tower/issues/7252
2017-07-24 11:42:35 -04:00
Ryan Petrello 9f11c008d2 don't allow boolean credential type fields that specify secret
secret doesn't really make sense for boolean values; they can't store
sensitive content because they're just true|false

see: https://github.com/ansible/ansible-tower/issues/6776
2017-07-24 11:41:12 -04:00
Ryan Petrello 6d201c44d9 fix a busted unit test re: tower -> awx 2017-07-24 11:36:11 -04:00
mabashian 7d5e2625b7 Allow for new lines in login info block 2017-07-24 11:16:27 -04:00
mabashian 72a7e55c71 Check for inventory id before trying to build a link to it in job results 2017-07-24 11:10:05 -04:00
mabashian 268a183b3b Fixed workflow maker dialog styling 2017-07-24 10:14:33 -04:00
Matthew Jones f175fbba23 Fix up some tower-manage -> awx-manage commands 2017-07-24 09:38:36 -04:00
Matthew Jones 3892e4e389 Tower -> AWX Tooling Migration
* Switching version number scheme and mechanism
* Refactor development tooling towards 'awx' paths and names
* Purging packaging details from Makefile
2017-07-21 17:06:45 -04:00
Alan Rominger cf967d244b Merge pull request #7166 from AlanCoding/reverse_fk_search
Correct search terms for reverse FK fields
2017-07-21 15:06:47 -04:00
Ryan Petrello 89637c0b93 Merge pull request #7251 from ryanpetrello/ugh-pexpect
fix a unit test that periodically fails
2017-07-21 14:51:56 -04:00
Wayne Witzel III 9799025a56 Merge pull request #7109 from ansible/squash-320
Squash migrations v3.1 / v3.2
2017-07-21 14:49:02 -04:00
Bill Nottingham bd55669423 Merge pull request #7250 from wenottingham/po-tay-to-po-tah-to
Fix header logo usage in API template.
2017-07-21 14:46:13 -04:00
Ryan Petrello 83ac761d81 fix a unit test that periodically fails
if you run this test *a lot*, it fails - seemingly due to a bug in
pexpect itself and how it handles stdout buffering; introducing a bit
of latency seems to make the issue go away

see: #7171
2017-07-21 14:39:55 -04:00
Jared Tabor c74b0df447 fix for api logo name 2017-07-21 11:37:35 -07:00
Bill Nottingham ae85ce6320 Fix logo usage in API header page 2017-07-21 14:27:14 -04:00
AlanCoding 4bb9bd5a2b correct search terms for reverse FK fields 2017-07-21 14:16:14 -04:00
Alan Rominger 52f8579c04 Merge pull request #7136 from AlanCoding/id_metadata
provide id field in OPTIONS for attaching sublists
2017-07-21 14:11:54 -04:00