External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-04 02:58:13 -03:30
Code Issues Packages Projects Releases Wiki Activity
16,540 Commits 56 Branches 102 Tags
1595947ae2b87756ecac0124bf1ba7823ee20285
Commit Graph

16540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane McDonald
1595947ae2 Merge pull request #1663 from jakemcdermott/fix-docker-installer-paths 
update reference to role file path to work with installer roles dir
 2018-03-23 12:43:54 -04:00
Jake McDermott
4a8f24becc update reference to role file path to work with roles dir 2018-03-23 12:43:13 -04:00
Ryan Petrello
07680dd7c0 Merge pull request #1652 from ryanpetrello/fix-500 
send job notification templates _after_ all events have been processed
 2018-03-23 10:51:06 -04:00
Michael Abashian
e7cfe1e0b6 Merge pull request #1640 from mabashian/1561-survey-multi-select 
Fixed bug on non-required multiple choice survey questions
 2018-03-23 09:31:56 -04:00
Michael Abashian
224d996b9c Merge pull request #1622 from mabashian/169-prompt-cleanup 
Propagate new launch/relaunch logic across the app
 2018-03-23 09:31:33 -04:00
mabashian
7a4bc233f6 Pass job into the relaunch component rather than pull it from the parent. Added launch template component, use it on the templates lists. 2018-03-22 16:14:54 -04:00
Shane McDonald
caf576cac0 Merge pull request #1655 from shanemcd/devel 
Move installer roles into roles directory
 2018-03-22 14:39:03 -04:00
Shane McDonald
84cd933702 Move installer roles into roles directory 
Signed-off-by: Shane McDonald <me@shanemcd.com>
 2018-03-22 14:34:03 -04:00
mabashian
c3b32e2a73 Cleaned up awRequireMultiple and fixed broken survey question error messaging 2018-03-22 11:58:47 -04:00
Ryan Petrello
f59f47435b send job notification templates _after_ all events have been processed 
see: https://github.com/ansible/awx/issues/500
 2018-03-22 09:30:41 -04:00
Chris Meyers
ddf000e8e7 Merge pull request #1643 from chrismeyersfsu/fix-tower_special_group 
do not allow tower group delete or name change
 2018-03-22 08:06:03 -04:00
chris meyers
305ef6fa7e do not allow tower group delete or name change 
* DO allow policy changes and other attribute changes
 2018-03-22 08:05:06 -04:00
Chris Meyers
3446134501 Merge pull request #1646 from chrismeyersfsu/fix-kombu_unicode 
use non-unicode queue names
 2018-03-21 21:59:05 -04:00
Bill Nottingham
eae85e803e Merge pull request #1644 from wenottingham/botbotbot 
update team map
 2018-03-21 19:35:58 -04:00
mabashian
8d04be0fc8 Fixed unit test failures 2018-03-21 19:22:08 -04:00
chris meyers
e0803b9f08 use non-unicode queue names 
* Use unicode InstanceGroup and queue names up until the point we
actually create the queue
* kombu add_consumers returns a dict with a value that contians the
passed in queue name. Trouble is, the returned dict value is a string
and not a unicode string and this results in an error.
 2018-03-21 16:50:07 -04:00
Chris Meyers
724812e87c Merge pull request #1637 from chrismeyersfsu/fix-instance_removed_from_group 
handle instance group names unicode
 2018-03-21 15:47:00 -04:00
Bill Nottingham
45240a6bf0 update team map 2018-03-21 15:46:50 -04:00
mabashian
0cadea1cb5 Fixed bug preventing the user from ignoring a non-required multi-select survey question on launch 2018-03-21 14:55:38 -04:00
Alan Rominger
b3e15f70cb Merge pull request #1612 from AlanCoding/token_no 
Make user_capabilities False for read tokens
 2018-03-21 14:45:19 -04:00
Ryan Petrello
a13ddff81a Merge pull request #1627 from aperigault/fix_deprecation 
Replace deprecated -U option by --become-user
 2018-03-21 14:32:13 -04:00
Bill Nottingham
88ef889cf1 Merge pull request #1634 from wenottingham/winrm-rf 
Cherry-pick fix for WinRM listener to AzureRM inventory script.
 2018-03-21 14:13:08 -04:00
chris meyers
91bfed3d50 handle instance group names unicode 2018-03-21 13:41:48 -04:00
AlanCoding
4f1f578fde make user_capabilities False for read tokens 2018-03-21 13:14:14 -04:00
Ryan Petrello
1a542c5e06 Merge pull request #1620 from ryanpetrello/dynamic-autoscale 
dynamically set worker autoscale max_concurrency based on system memory
 2018-03-21 11:52:16 -04:00
Marliana Lara
6e11b5b9c8 Merge pull request #1557 from marshmalien/feat/final_granular_permission_types 
New RBAC roles at the Org level
 2018-03-21 11:35:15 -04:00
Marliana Lara
4106e496df Merge pull request #1574 from marshmalien/fix/capacity_adjustment_value 
Add capacity adjuster slider label
 2018-03-21 11:35:03 -04:00
Ryan Petrello
6a96e6a268 dynamically set worker autoscale max_concurrency based on system memory 2018-03-21 11:10:48 -04:00
mabashian
bee7148c61 Addressed jshint errors 2018-03-21 10:59:13 -04:00
Marliana Lara
2ae02fda82 Update pr based on feedback 2018-03-21 10:55:00 -04:00
Marliana Lara
01d35ea9c0 Show organizations based on more granular RBAC roles 2018-03-21 10:54:59 -04:00
Marliana Lara
c156a0af99 Add capacity adjustment slider label 2018-03-21 10:53:16 -04:00
Bill Nottingham
531e5b5137 Cherry-pick fix for WinRM listenr to AzureRM inventory script. 
(ref: https://github.com/ansible/ansible/pull/37499/)
 2018-03-21 10:46:30 -04:00
mabashian
f0ff578923 Cleanup linting errors 2018-03-21 10:27:48 -04:00
Antony PERIGAULT
3adcdb43ad Replace deprecated -U option by --become-user 2018-03-21 12:28:27 +01:00
Bill Nottingham
e58038b056 Merge pull request #1623 from cvick/patch-1 
Added a space before closing quote to fix spelling
 2018-03-20 23:25:12 -04:00
Chris Vick
fca1e7028f Added a space before closing quote to fix spelling 
Without the space before the lines closing quote, 'or' and 'other' get concatenated to 'orother' in the tooltip
 2018-03-20 19:36:37 -07:00
Wayne Witzel III
f4e57e2906 Merge pull request #1608 from wwitzel3/devel 
System Setting for Orgainization User/Team permissions.
 2018-03-20 17:17:49 -04:00
mabashian
2e858790db Propagate launch/relaunch logic across the app. Removed some old launch related factories. 2018-03-20 15:53:21 -04:00
Alan Rominger
8056ac5393 Delay import of freeze to make tests run (#1617) 
* Delay import of freeze to make tests run

* fix flake8 error
 2018-03-20 11:58:11 -04:00
Matthew Jones
6419339094 Merge pull request #1570 from rooftopcellist/authorization_flow_docs 
add authorization grant to docs
 2018-03-20 07:26:10 -07:00
Matthew Jones
3ee8b3b514 Merge pull request #1613 from EagleIJoe/patch-1 
Corrected alternate dns servers entries in docker-compose template
 2018-03-20 07:24:31 -07:00
Wayne Witzel III
d7f26f417d Reword help text for manage org auth 2018-03-20 07:31:08 -04:00
Alan Rominger
30fb4076df Merge pull request #1569 from AlanCoding/relaunch_survey 
Allow normal users to relaunch jobs with survey answers
 2018-03-20 07:14:09 -04:00
Matthew Jones
c0661722b6 Merge pull request #1523 from paihu/slack-color-notification 
support slack color notification #1490
 2018-03-19 18:05:28 -07:00
Martin Adler
ca7b6ad648 Corrected alternate dns servers entries 
As lstrip_blocks: True was added, this broke the formating when adding alternate DNS servers within the template. Removing the extra white space removals within the if and endif statements fixed the resulting yml formating.
 2018-03-19 21:08:52 +01:00
Wayne Witzel III
d5564e8d81 Fix user capabilities when MANAGE_ORGANIZATION_AUTH is disabled 2018-03-19 15:16:54 -04:00
Wayne Witzel III
a9da494904 switch to single toggle and change name 2018-03-19 14:45:52 -04:00
John Mitchell
a9e13cc5f4 Merge pull request #1580 from jlmitch5/usersAppCrudUi 
implement users tokens sub list
 2018-03-19 13:23:29 -04:00
Wayne Witzel III
771108e298 Protect team assignment for the roles access point 2018-03-19 12:10:13 -04:00