zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-15 07:48:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
18,587 Commits 35 Branches 71 Tags
db8ee2810aca2416b4ee5a944887c080ef517f88
Commit Graph

18587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Petrello fc589389fc Merge pull request #2758 from ryanpetrello/fix-insights 
fix to handle nonexistent system_id
 2018-08-06 09:24:46 -04:00
Ryan Petrello 7df027f826 fix to handle nonexistent system_id 2018-08-03 16:08:40 -04:00
Shane McDonald 090b3fad8e Update translation template files 2018-08-03 15:07:19 -04:00
Ryan Petrello ad38bfbbe5 Merge pull request #2755 from ryanpetrello/fix-2751 
fix up a minor OAuth2 token serializer nit
 2018-08-03 15:01:28 -04:00
Jared Tabor 90c34f6293 Merge pull request #2736 from jaredevantabor/i18n 
I18n and more translations
 2018-08-03 11:59:59 -07:00
Ryan Petrello a3566b4270 fix up a minor OAuth2 token serializer nit 
see: https://github.com/ansible/tower/issues/2751
 2018-08-03 14:50:37 -04:00
Jared Tabor 1986efebda More Translations 2018-08-03 11:32:02 -07:00
Alan Rominger c2f60f35b4 Merge pull request #2733 from AlanCoding/policy_changes_test 
Apply policy task more selectively
 2018-08-03 10:59:53 -04:00
Michael Abashian fba5dbcc80 Merge pull request #2745 from mabashian/form-ids 
Adds id's to all form groups and new forms
 2018-08-03 09:14:19 -04:00
AlanCoding a99ebbb02f Apply policy task more selectively 2018-08-03 06:56:15 -04:00
Yunfan Zhang 6f54f59485 Merge pull request #2746 from YunfanZhang42/fix-license-error 
Fixing incorrect license_error value in inventory_sync
 2018-08-02 15:20:35 -04:00
Ryan Petrello 082d807007 Merge pull request #2747 from ryanpetrello/isolated-set-stat 
set_stats fails in callback plugin on isolated node #2123
 2018-08-02 15:20:14 -04:00
Yunfan Zhang 7001c67c84 Fixing incorrect license_error value in inventory_sync. 
Signed-off-by: Yunfan Zhang <yz322@duke.edu>
 2018-08-02 14:19:13 -04:00
U-AD001\U317788 a562d9ae0c set_stats fails in callback plugin on isolated node #2123 
Signed-off-by: U-AD001\U317788 <U317788@L7668YGH2.AD001.InfoFTPS.COM>
 2018-08-02 13:27:56 -04:00
mabashian bc49c879b4 Fix linting error 2018-08-02 12:48:32 -04:00
Wayne Witzel III 95a9e1a7b6 Merge pull request #2737 from wwitzel3/release_3.3.0 
unless allow_simultaneous do not start workflow jobs already running
 2018-08-02 12:37:46 -04:00
Shane McDonald f6aee3dd41 Fix error in Dutch translation file 2018-08-02 12:30:16 -04:00
mabashian 8523b56707 Adds id's to all form groups and new forms 2018-08-02 12:28:45 -04:00
Jared Tabor 45c067b599 Merge pull request #2722 from YunfanZhang42/search-filter 
Add AND filter to related search
 2018-08-02 09:10:30 -07:00
Wayne Witzel III 74ed1c2c40 fetch running workflow jobs once per process 2018-08-02 11:46:38 -04:00
Shane McDonald c97edaf9e0 Merge pull request #2744 from shanemcd/release_3.3.0 
Fix syntax in nginx config
 2018-08-02 11:26:49 -04:00
Shane McDonald be7a40daf3 Fix syntax in nginx config 
Broke in 6f5259d017
 2018-08-02 11:24:51 -04:00
Shane McDonald b8a51244e4 Extract latest strings 2018-08-02 11:23:32 -04:00
Shane McDonald 3cc35fc598 Pull updated localization files 2018-08-02 11:23:32 -04:00
Ryan Petrello 1cd75cf414 Merge pull request #2742 from ryanpetrello/fix-2738 
simpilfy LDAP GROUP_SEARCH misconfiguration failure handling
 2018-08-02 10:28:27 -04:00
Ryan Petrello 27f4e487ec simpilfy LDAP GROUP_SEARCH misconfiguration failure handling 2018-08-02 10:11:18 -04:00
John Mitchell 9131577355 Merge pull request #2721 from jlmitch5/fixJTSaveCompletedDeferring 
make credential association cause deferral of jt promise chain
 2018-08-02 09:45:19 -04:00
Ryan Petrello a13712074f Merge pull request #2739 from ryanpetrello/fix-2738 
fix a bug in multi-LDAP authentication
 2018-08-02 08:27:13 -04:00
Jared Tabor f6a960d8f4 Changes the encodeQuerysetObject function for the job details search widget 
With this change, the stdout search will perform a search like search=A,B
instead of search=A&search=B
 2018-08-01 20:59:37 -07:00
Yunfan Zhang b191f6cfc3 Add AND filter to related search. 
Signed-off-by: Yunfan Zhang <yz322@duke.edu>
 2018-08-01 19:43:57 -07:00
Jared Tabor 6b64ef8f64 Changes a related search w/ two search params. 
Changes from using a pattern like "search=A&search=B" to "search=A,B".
 2018-08-01 19:43:41 -07:00
Ryan Petrello 2102c1ef0a fix a bug in multi-LDAP authentication 
see: https://github.com/ansible/tower/issues/2738
 2018-08-01 17:55:13 -04:00
Wayne Witzel III da603dd3ad use workflow_template_id 2018-08-01 15:55:19 -04:00
Wayne Witzel III c96cf3cf5d unless allow_simultaneous, do not start workflow jobs that are already running 2018-08-01 14:53:00 -04:00
Jake McDermott c09a23f063 Merge pull request #2734 from ansible/jakemcdermott-patch-e2e-1 
update credential form type selector
 2018-08-01 11:42:06 -04:00
Jake McDermott 45072b54f0 update credential form type selector 2018-08-01 11:01:38 -04:00
Ryan Petrello 0f66de2de9 Merge pull request #2732 from ryanpetrello/fix-2731 
sprinkle some more i18n love for the credential form
 2018-07-31 22:43:31 -04:00
Ryan Petrello 0a400ca339 sprinkle some more i18n love for the credential form 
see: https://github.com/ansible/tower/issues/2731
 2018-07-31 22:13:17 -04:00
Ryan Petrello ed79a7fc12 Merge pull request #2726 from ryanpetrello/fix-2690 
prevent host deletion when the related inventory is pending deletion
 2018-07-31 16:49:17 -04:00
Alan Rominger 0c0d5d4eba Merge pull request #2719 from AlanCoding/differential_policy 
Apply policy results differentially
 2018-07-31 16:25:14 -04:00
Ryan Petrello 5610cbe735 prevent host deletion when the related inventory is pending deletion 
see: https://github.com/ansible/tower/issues/2690
 2018-07-31 15:54:46 -04:00
Alan Rominger 9ff249f5c4 Merge pull request #2438 from AlanCoding/ask_user_input_creds 
Ask user input if credential prompting enabled
 2018-07-31 15:48:19 -04:00
Ryan Petrello 0c53a0c0a4 Merge pull request #2717 from ryanpetrello/fix-2180 
allow access to JT labels if you have read access to the JT
 2018-07-31 15:28:24 -04:00
Ryan Petrello 0aaa3807a9 allow access to JT labels if you have read access to the JT 
see: https://github.com/ansible/tower/issues/2180
 2018-07-31 15:13:24 -04:00
AlanCoding 8eaae97768 Apply policy results differentially 
This avoids client-side scripting problems
where they grab the instance list during the
re-calculation which leads to incorrect assumptions
 2018-07-31 15:03:36 -04:00
Ryan Petrello f18be1c83a Merge pull request #2724 from ryanpetrello/more-network-ui 
more network UI cleanup (whoops)
 2018-07-31 15:00:35 -04:00
Ryan Petrello 8e3b72e1e5 more network UI cleanup (whoops) 2018-07-31 14:53:11 -04:00
John Mitchell 54422d74d0 make credential association cause deferral of jt promise chain 2018-07-31 13:26:59 -04:00
Yunfan Zhang 9cdee4f75c Merge pull request #2711 from YunfanZhang42/add_instance_groups_to_activity_stream 
Add instance groups to activity stream.
 2018-07-31 13:17:22 -04:00
Yunfan Zhang f9309c9cd9 Add instance groups to activity streams. 
Signed-off-by: Yunfan Zhang <yz322@duke.edu>
 2018-07-31 11:01:29 -04:00