External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-14 16:00:11 -02:30
Code Issues Packages Projects Releases Wiki Activity
20,322 Commits 64 Branches 102 Tags
cb4d55b47aa50451b9cab00356c42007cbb99ff8
Commit Graph
20322 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake McDermott a968a44afb add inventory field to inventory update 2018-07-17 11:10:06 -04:00
Chris Meyers e3cb531180 Merge pull request #2558 from chrismeyersfsu/saml_admin_user_feature_cherry_pick 
Saml admin user feature cherry pick
 2018-07-17 09:27:18 -04:00
AlanCoding a38d6552e8 strict type enforcement of deprecated launch fields 2018-07-17 08:41:40 -04:00
Jared Tabor 429cf40db3 Adjusts which partical/controller combination is used when editing a schedule 
MGMT jobs require a different partial + controller
 2018-07-16 18:02:11 -07:00
aperigault 71730f9bc1 Update SAML doc 2018-07-16 17:14:41 -04:00
Antony PERIGAULT 53b5291a56 Fix functional tests 2018-07-16 17:03:00 -04:00
Antony PERIGAULT 3b6ab6217b New feature: Add SAML users as organization admins 2018-07-16 17:02:53 -04:00
Antony PERIGAULT 6ec2228885 Revert "Map users in organizations based on saml groups" 
This reverts commit b4e0ff650165e6b0ab08d9a78be85f2f46182b94.
 2018-07-16 17:02:46 -04:00
Antony PERIGAULT 062c18efa0 Map users in organizations based on saml groups 2018-07-16 17:02:38 -04:00
Michael Abashian a955b3f947 Merge pull request #2542 from mabashian/1466-workflow-node 
Properly clear out prompt data when user manually changes a node's JT
 2018-07-16 16:17:52 -04:00
AlanCoding 885ea2c5e1 make applications name-unique 2018-07-16 15:54:00 -04:00
mabashian 069c60abf7 Re-initialize tag options before calling to create select2 on those fields in prompt modal 2018-07-16 15:37:12 -04:00
Ryan Petrello b6e246f65a Merge pull request #2554 from ryanpetrello/release_3.3.0 
Makefile update.
 2018-07-16 14:57:16 -04:00
Ryan Petrello f0707ad701 Makefile update. 2018-07-16 14:55:07 -04:00
Ryan Petrello 5bb71fc133 Merge pull request #2550 from rooftopcellist/fix_expire_command 
fix expire session command
 2018-07-16 14:53:31 -04:00
Ryan Petrello 34fe54c6e0 Makefile update. 2018-07-16 14:45:44 -04:00
Jake McDermott 2fa216c98f Merge pull request #2062 from RR2DO2/patch-1 
Don't capitalise last name
 2018-07-16 14:19:46 -04:00
Haokun Chen 220b45cb8a Merge pull request #2551 from Haokun-Chen/2547 
show empty template list placeholder panel correctly
 2018-07-16 14:11:33 -04:00
Alan Rominger 9208ef6664 Merge pull request #2540 from AlanCoding/towerkit_protector 
Raise 400 instead of ignoring if fields mismatch v1/v2
 2018-07-16 13:29:12 -04:00
Marliana Lara d693dac0c6 Merge pull request #2546 from marshmalien/fix/2206-relaunch-text-translation 
Send relaunch value instead of name in POST request
 2018-07-16 13:26:52 -04:00
Shane McDonald 65a5f2dc9b Merge pull request #2052 from robruma/feature/callback_script_enhancement 
Adding ability to ignore SSL certificate validation errors, cleanup p…
 2018-07-16 13:13:51 -04:00
Shane McDonald 467a1fafcc Merge pull request #1880 from luisico/compose-web-wait-for 
AWX launchers should wait for other containers to be ready
 2018-07-16 13:11:06 -04:00
Shane McDonald ad33dff6af Merge pull request #1949 from willthames/k8s_use_context 
Use use-context to set Kubernetes context
 2018-07-16 12:59:36 -04:00
Haokun-Chen b5dab72dd7 show empty template list placeholder panel correctly 2018-07-16 12:59:00 -04:00
adamscmRH 3d7fd9270c fix expire session command 2018-07-16 12:57:00 -04:00
Ryan Petrello ca6b6460bb Merge pull request #2522 from ryanpetrello/fix-2509 
awx metavars for job.created_by should be more robust to DoesNotExist
 2018-07-16 12:46:50 -04:00
Jake McDermott cb9cbfff87 Merge pull request #2544 from jakemcdermott/fix-2233 
fix output double-scroll bug and initial output page numbers
 2018-07-16 12:32:52 -04:00
Haokun Chen aa43610250 Merge pull request #2528 from Haokun-Chen/2248 
update workflowMaker title text to be preceded by  "Workflow Visualizer"
 2018-07-16 12:21:22 -04:00
Haokun Chen 1661e73086 Merge pull request #2541 from Haokun-Chen/1865 
show active row indicator correctly when close active list item
 2018-07-16 12:21:02 -04:00
Jared Tabor ebaabcfbd9 Merge pull request #2537 from jaredevantabor/fix-2510 
Subscribes the Sources list to the inventory group for pending deletes
 2018-07-16 09:14:46 -07:00
Jared Tabor 39e2008660 Merge pull request #2534 from jaredevantabor/fix-2493 
Adds error catch block to credentials resolve
 2018-07-16 09:10:48 -07:00
Marliana Lara 0e36ef35af Merge pull request #2543 from marshmalien/fix/1040-center-sidebar-icons 
Center align side navigation icons
 2018-07-16 12:05:17 -04:00
Marliana Lara 161caf0099 Send relaunch value instead of name in POST request 2018-07-16 11:57:35 -04:00
Jake McDermott 81476d544f fix initial head/tail page values when in page mode 2018-07-16 11:43:40 -04:00
Jake McDermott 85b227213f don't page up or down while already paging up or down 2018-07-16 11:42:27 -04:00
Ryan Petrello 55be530e27 awx metavars for job.created_by should be more robust to DoesNotExist 
see: https://github.com/ansible/tower/issues/2509
 2018-07-16 11:35:35 -04:00
Marliana Lara ac39519015 Center side nav icons 2018-07-16 11:23:11 -04:00
mabashian 88c5f9305d Ensure that .some() receives an array to avoid erroring 2018-07-16 11:19:19 -04:00
Alan Rominger 9db6202210 Merge pull request #2538 from AlanCoding/team_queryset 
Remove custom get_queryset that ignored special case
 2018-07-16 11:14:31 -04:00
mabashian f7f1c06d80 Properly clear out prompt data when user manually changes a node's JT 2018-07-16 11:11:50 -04:00
Alan Rominger 53b4a4e2fc Merge pull request #2531 from AlanCoding/everything_text_type 
Fix unicode bug in launch error message
 2018-07-16 10:49:44 -04:00
Haokun-Chen f2de453110 show active row indicator correctly when close active list item 2018-07-16 10:49:14 -04:00
kialam ac01eab0f1 Merge pull request #2525 from kialam/fix/1067-workflow-status-pending 
Update labels and tooltips whenever the websocket emits status change
 2018-07-16 10:36:09 -04:00
Michael Abashian 097125446a Merge pull request #2519 from mabashian/2505-application-token 
Removes application requirement when creating token, fixes delete personal token
 2018-07-16 10:31:52 -04:00
Michael Abashian 4e8fff8cf1 Merge pull request #2532 from mabashian/1882-templates-list 
Remove updateDataset listener from templates list controller
 2018-07-16 10:31:29 -04:00
Shane McDonald 9b941e8b05 Merge pull request #2040 from kivio/tiller-namespace-configuration 
#2039 add tiller-namespace as argument
 2018-07-16 10:10:23 -04:00
kialam 90ad104391 Update labels and tooltips whenever the websocket emits status change 
Since the translated workflow status copy is a result of a function; it
does not auto-update when `workflow.status` is updated. We should call
it whenever the web socket lets us know that a job status has changed.
 2018-07-16 09:50:36 -04:00
Shane McDonald 3f8b80e415 Merge pull request #2028 from basos9/fix-nginx-log 
FIX nginx use selected log formatting
 2018-07-16 09:47:05 -04:00
AlanCoding fd468ac766 raise 400 instead of ignoring if fields mismatch v1/v2 2018-07-16 09:36:43 -04:00
AlanCoding b5b2bf15df remove custom get_queryset that ignored special case 2018-07-14 21:09:57 -04:00