Commit Graph

17133 Commits

Author SHA1 Message Date
John Mitchell c8442d705b Merge pull request #1530 from jlmitch5/newListXSSSanitize
specifically bind html only the row items that need it for new lists …
2018-04-24 13:58:46 -04:00
Alan Rominger 8765de732e Merge pull request #1546 from AlanCoding/named_words
use named formatting in error messages
2018-04-24 13:43:48 -04:00
Alan Rominger 7c0fdd5f05 Merge pull request #1540 from AlanCoding/modified_by_alice
Do not update modified_by for system fields
2018-04-24 12:25:03 -04:00
AlanCoding 13550acb91 fix cross-talk between JT-proj due to arg mutability 2018-04-24 11:29:33 -04:00
AlanCoding 7c621a91ee use named formatting in error messages 2018-04-24 11:26:36 -04:00
Alan Rominger 3b129d784a Merge pull request #1526 from AlanCoding/network_logs
Add more logs for network canvas activity
2018-04-24 11:14:22 -04:00
Michael Abashian 311e0343df Merge pull request #1520 from mabashian/1446-verbosity-prompt-preview
Show verbosity on prompt preview tab
2018-04-24 11:04:26 -04:00
AlanCoding 68975572f3 do not update modified_by for system fields 2018-04-24 10:48:23 -04:00
Marliana Lara fd52fe9b96 Merge pull request #1527 from marshmalien/fix/1415-Tower-group-name-readonly
Make tower instance group name input field read-only
2018-04-24 07:40:24 -04:00
Jake McDermott 43aab10d18 Merge pull request #1532 from jaredevantabor/adhoc-host-events
Adhoc host events
2018-04-24 00:31:27 -04:00
Jake McDermott d0c8c7d5ce Merge pull request #1533 from jaredevantabor/1436-angular-in-stdout
Adds NgNonBindable directive to stdout lines
2018-04-24 00:25:13 -04:00
Matthew Jones 047e2a92c5 Merge pull request #1506 from ansible/update_vmware_inventory
Updating vmware_inventory from upstream
2018-04-24 00:01:09 -04:00
Jared Tabor 6f1774f1b1 Adds NgNonBindable directive to stdout lines
in order to prevent stdout code from running angular snippets
2018-04-23 19:51:14 -07:00
Jared Tabor 99fb8e6d83 Updates URL for host events for adhoc commands 2018-04-23 19:15:12 -07:00
Jared Tabor 298af25bab Points the host event modal's Standard Out tab at event_data.res.stdout
instead of `event_data.res.results.stdout`. Same for stderr. This was
some stale copy pasta from the host event modal rework
2018-04-23 18:13:26 -07:00
John Mitchell 9cfd264103 specifically bind html only the row items that need it for new lists in the ui 2018-04-23 16:57:43 -04:00
Marliana Lara 29b9c44a1e Show tower group name field as read-only 2018-04-23 15:29:53 -04:00
AlanCoding 405a936544 add more logs for network canvas activity 2018-04-23 15:29:13 -04:00
Ryan Petrello e4ffdeb0b5 Merge pull request #1518 from ryanpetrello/botocore-dep-hell
unpin botocore now that an upstream dependency issue is resolved
2018-04-23 15:15:59 -04:00
Ryan Petrello 19d5d71937 unpin botocore now that an upstream dependency issue is resolved
related: https://github.com/ansible/awx/commit/4f585dd09e35c2ab1011e8ea93e6533be8877329
related: https://github.com/boto/botocore/pull/1433
2018-04-23 14:43:09 -04:00
John Mitchell 0de88d6566 Merge pull request #1440 from jlmitch5/fixNewTab
fix new tab in router
2018-04-23 13:52:27 -04:00
mabashian 5848a61238 Show verbosity on prompt preview tab 2018-04-23 13:52:11 -04:00
Michael Abashian 7a281cefed Merge pull request #1516 from mabashian/fix-prompt-creds
Fixed merge conflict error that prevents launching JTs with cred prompting
2018-04-23 13:46:50 -04:00
mabashian e38d779d04 Fixed botched merge conflict bug which prevents launching jobs that need credential selection 2018-04-23 13:42:37 -04:00
Matthew Jones 18b41791ab Updating vmware_inventory from upstream 2018-04-23 12:59:41 -04:00
John Mitchell fd598f5adc Merge pull request #1439 from jlmitch5/fixInstanceGroupsRunningJobs
update instance groups to only be running jobs
2018-04-23 12:43:23 -04:00
John Mitchell a1541d679c remove obsolete .go unit test 2018-04-23 12:41:07 -04:00
Ryan Petrello 488e0cc4c6 Merge pull request #1459 from wwitzel3/become-enable
Add new credential become methods, inject instead of set in database
2018-04-23 11:50:31 -04:00
Michael Abashian 4b4bbcebae Merge pull request #1399 from mabashian/1137-cancel-prompt
Fixed bug where user could still save schedule/node after halfway filling out prompt step(s)
2018-04-23 11:30:00 -04:00
Wayne Witzel III 765ad07d9e Fix migration name/ordering 2018-04-23 11:00:21 -04:00
Michael Abashian d36ec19e24 Merge branch 'release_3.3.0' into 1137-cancel-prompt 2018-04-23 10:57:01 -04:00
Michael Abashian 8c10a064f2 Merge pull request #1438 from mabashian/1437-host-filter-tags
Fixed bug where host filter search tags were not present
2018-04-23 10:55:42 -04:00
Wayne Witzel III f1b37ff53a Fix order become methods render and migration query 2018-04-23 10:33:59 -04:00
Wayne Witzel III c1a8d8670f Pop the type to be consistent 2018-04-23 10:33:59 -04:00
Wayne Witzel III 07474d5b21 Extend become_method to model field validation as well 2018-04-23 10:33:59 -04:00
Wayne Witzel III d6ac9b6e3d Restore previous choices, clean up some minor things 2018-04-23 10:33:59 -04:00
Wayne Witzel III 8fa98d0d54 Add new credential become methods, inject instead of set in database 2018-04-23 10:33:59 -04:00
Wayne Witzel III df4f6ecfd6 Merge pull request #1480 from wwitzel3/release_3.3.0
Fixup migrations.
2018-04-23 06:01:06 -07:00
Wayne Witzel III 44470200a2 Fix migration numbering 2018-04-23 07:51:36 -04:00
Wayne Witzel III c37ed32c55 Merge pull request #1204 from AlanCoding/org_members_team
allow org members to see teams in org
2018-04-23 04:15:38 -07:00
Matthew Jones ec8a8119b9 Merge pull request #1468 from ansible/protect_iso_groups
Protect isolated and control groups from api deletion
2018-04-20 17:36:30 -04:00
Alan Rominger cdb7e16e6d Merge pull request #1463 from AlanCoding/update_supervisor
Update the dev supervisor file to match recent change
2018-04-20 16:51:08 -04:00
Christian Adams 136a58ee85 Merge pull request #1465 from rooftopcellist/update_oauth2_docs
Update oauth2 docs
2018-04-20 16:50:12 -04:00
John Mitchell ee137b8b4d fix open in new tab for credentials and inventory scripts 2018-04-20 16:00:57 -04:00
Matthew Jones 062329f56e Protect isolated and control groups from api deletion
Isolated and Control groups are managed strictly from the standalone
setup playbook installer and should not be directly managable from the
api. Especially true since you can't assign or create isolated groups
from within the API itself.

In the future this may change but allowing this in the API could leave
the system in a bad state.
2018-04-20 15:30:13 -04:00
adamscmRH 350ebab161 fix curl example 2018-04-20 15:22:28 -04:00
AlanCoding 4036f64cc4 update the dev supervisor file to match recent change 2018-04-20 14:53:21 -04:00
Chris Meyers a2901a47ee Merge pull request #1410 from chrismeyersfsu/fix-revert_tower_special_group
send all tower work to a user-hidden queue
2018-04-20 14:21:50 -04:00
Christian Adams b9d5f96f00 Merge pull request #1460 from rooftopcellist/saml_auth_issue
fix multiple auth backends
2018-04-20 14:04:36 -04:00
adamscmRH 3627c713fa fix multiple auth backends 2018-04-20 13:34:51 -04:00