External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity
27,813 Commits 54 Branches 19 Tags
Commit Graph

27813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Corey
60ccdfa4e6 removes asterisk from wfjt form inventory field 2020-11-19 14:33:55 -05:00
softwarefactory-project-zuul[bot]
b6a55e53d5
Merge pull request #8622 from mabashian/nav-expanded 
Fix nav console error

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-19 17:39:25 +00:00
softwarefactory-project-zuul[bot]
f22fa9c5b0
Merge pull request #8617 from AlanCoding/valid_groups 
Avoid invalid group characters in default inventory script factory

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-18 20:26:28 +00:00
mabashian
d3928a0c0f Get rid of onExpand but keep isExpanded on side nav 2020-11-18 11:34:54 -05:00
Alan Rominger
91eff51390
Avoid invalid group characters in default inventory script factory 2020-11-18 10:16:08 -05:00
softwarefactory-project-zuul[bot]
691b4512b5
Merge pull request #8615 from jakemcdermott/fix-navbar 
Fix the navbar

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-18 00:41:30 +00:00
Jake McDermott
471e22a4e2 Start with nav expanded 2020-11-17 18:54:11 -05:00
softwarefactory-project-zuul[bot]
b338da40c5
Merge pull request #8482 from jakemcdermott/fix-8465 
Fix inconsistent screen title bars

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-16 21:14:25 +00:00
softwarefactory-project-zuul[bot]
00fb955544
Merge pull request #8563 from AlexSCorey/8535-UpgradePF 
Updates PF dependency

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-16 18:16:17 +00:00
softwarefactory-project-zuul[bot]
74711a55bb
Merge pull request #8552 from DeloitteHux/ng-helm-install 
Add helm installation (#8551)

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-16 17:47:31 +00:00
Jake McDermott
d30dd97c96
Fix inconsistent screen title bars 2020-11-16 11:39:04 -05:00
softwarefactory-project-zuul[bot]
10664d1931
Merge pull request #8582 from wenottingham/collect-again 
Revert portions of 40a10dcc5f00d60284aa507b418b5e758094d437

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-13 22:54:23 +00:00
Bill Nottingham
7b04fa114e Revert portions of 40a10dcc5f00d60284aa507b418b5e758094d437 
Keep some of the collectors, while removing ones we calculate
in other ways.
 2020-11-13 14:50:04 -05:00
softwarefactory-project-zuul[bot]
0d843899e1
Merge pull request #8519 from nixocio/ui_issue_8098 
Remove groups/hosts when deleting inventory sources

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-13 18:37:07 +00:00
Alex Corey
54e1991ff4 Update PF Dependency and associated components and tests 2020-11-13 10:11:05 -05:00
softwarefactory-project-zuul[bot]
76fd63ba5f
Merge pull request #8463 from nixocio/ui_issue_7130 
Add feature to associate teams to users

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-12 18:21:25 +00:00
nixocio
07edf505e7 Add feature to associate teams to users 
Add feature to associate teams to users. For the time being when
associating Users to a team, the User will be associated with `member_role` only. And when `diassociating` the User from a team all related roles - member, read, and admin will be removed.

Also, fix a bug related to search not being cleared after closing/cancel
the `AssociateModal`.
 2020-11-12 10:06:33 -05:00
softwarefactory-project-zuul[bot]
1078bf76ad
Merge pull request #8575 from ryanpetrello/yet-more-downstream-bits 
more downstream changes

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-11 19:27:28 +00:00
softwarefactory-project-zuul[bot]
cb4fcb9d80
Merge pull request #8566 from AlexSCorey/8539-SurveyRequiredFields 
Adds asterisk to required survey questions in preview modal

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-11 18:58:30 +00:00
Ryan Petrello
32e149c76e
Merge branch 'downstream' into devel 2020-11-11 13:30:28 -05:00
Ryan Petrello
4d8176e6af
Merge remote-tracking branch 'downstream' into downstream 2020-11-11 13:30:21 -05:00
Ryan Petrello
ddd109059f
Merge pull request #4682 from wenottingham/subs-corner-cases 
Use the exported count in the manifest for the node count, if present.
 2020-11-11 13:13:01 -05:00
softwarefactory-project-zuul[bot]
4d480cb95f
Merge pull request #8413 from sean-m-sullivan/role_list 
Tower_role Improvements, Approvals and use of Lists

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-11 17:37:21 +00:00
softwarefactory-project-zuul[bot]
69c3acfb39
Merge pull request #8570 from ryanpetrello/analytics-cleanup 
removed unused analytics metrics

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
 2020-11-11 17:26:27 +00:00
Bill Nottingham
a092406543 Use the exported count in the manifest for the node count, if present. 2020-11-11 12:20:32 -05:00
Christian Adams
a65008f762
Merge pull request #4680 from ansible/i18n_release_3.8.0_translations 
(More) UI translation strings for release_3.8.0 branch
 2020-11-11 12:07:35 -05:00
ansible-translation-bot
2a44a72024 UI translation strings for release_3.8.0 branch 2020-11-11 15:42:54 +00:00
Ryan Petrello
40a10dcc5f
removed unused analytics metrics 2020-11-11 09:56:20 -05:00
ansible-translation-bot
d25d5762e0 UI translation strings for release_3.8.0 branch 2020-11-11 14:12:48 +00:00
softwarefactory-project-zuul[bot]
073e518c16
Merge pull request #8503 from AlexSCorey/8237-FixKebabifiedToolbarBtns 
Fixes toolbar buttons in Advanced Search mode

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-11 13:25:15 +00:00
Ryan Petrello
454c8e66e0
Merge pull request #4678 from beeankha/delete_cloudforms_from_collections 
Remove Cloudforms as a credential type from collections
 2020-11-10 17:12:16 -05:00
softwarefactory-project-zuul[bot]
cd5553a1dc
Merge pull request #8567 from ryanpetrello/busted-cf-migration 
avoid breaking upgrades from certain AWX versions

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-10 21:18:13 +00:00
Christian Adams
e4d9cd4000
Merge pull request #4676 from ansible/i18n_release_3.8.0_translations 
UI translation strings for release_3.8.0 branch
 2020-11-10 16:07:22 -05:00
beeankha
400c55faaa Remove Cloudforms as a credential type from collections 2020-11-10 15:49:55 -05:00
Ryan Petrello
fabd2eec63
avoid breaking upgrades from certain AWX versions 
the prior version of this migration was rewritten, so we should
run the function again to really make sure that cleanup happens
 2020-11-10 15:18:49 -05:00
Alex Corey
619fabc3a1 adds asterisk to required survey questions in preview modal 2020-11-10 11:47:30 -05:00
sean-m-sullivan
4e4f1d3cce update comment 2020-11-10 10:04:05 -06:00
sean-m-sullivan
e2e3d30b49 update comment 2020-11-10 09:16:08 -06:00
Christian Adams
ff78cade3a
Merge pull request #4677 from rooftopcellist/fix_hover_help 
Fix hover-over help text for subscriptions
 2020-11-10 09:56:08 -05:00
Christian M. Adams
97381f6810 Fix hover-over help text for subscriptions 2020-11-10 09:32:16 -05:00
sean-m-sullivan
999086968c Merge branch 'role_list' of github.com:sean-m-sullivan/awx into role_list 2020-11-10 08:17:09 -06:00
sean-m-sullivan
ab4abf4e3b update comment 2020-11-10 08:17:01 -06:00
Sean Sullivan
0fd0f0c1bd
Merge pull request #21 from ansible/devel 
Rebase
 2020-11-10 08:13:52 -06:00
softwarefactory-project-zuul[bot]
d16055806b
Merge pull request #8520 from AlexSCorey/7636-WFJTSurveyNotEnabled 
Toggles WFJT survey on and off

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-10 12:25:57 +00:00
ansible-translation-bot
e09ac530d5 UI translation strings for release_3.8.0 branch 2020-11-09 16:27:11 +00:00
ansible-translation-bot
1923926422 UI translation strings for release_3.8.0 branch 2020-11-09 15:09:59 +00:00
softwarefactory-project-zuul[bot]
7d3bf36227
Merge pull request #8559 from ryanpetrello/yet-anooooooother-downstream-merge 
Merge in some downstream bug fixes

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-06 19:29:18 +00:00
Ryan Petrello
d653c05da8
Merge branch 'downstream' into devel 2020-11-06 13:22:26 -05:00
softwarefactory-project-zuul[bot]
862a6835fe
Merge pull request #8545 from nixocio/ui_issue_4968 
Mark `Host Config Key` as a required field

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-11-06 17:23:16 +00:00
Ryan Petrello
33f3ad17cb
Merge pull request #4671 from ryanpetrello/cloudforms-minus-minus 
entirely remove CloudForms inventory sources instead of converting
 2020-11-06 11:30:23 -05:00