zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-16 15:58:39 -05:00
Code Issues Packages Projects Releases Wiki Activity
23,174 Commits 35 Branches 71 Tags
8fbfed5c5516033ad86faa0f6176e79e906bc3e6
Commit Graph

23174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Petrello 24b9a6a38d fix a minor bug in the notification templates UI 
see: https://github.com/ansible/awx/issues/5029
 2019-10-17 08:43:04 -04:00
softwarefactory-project-zuul[bot] 857683e548 Merge pull request #4917 from jakemcdermott/ui-next-ci 
Tune webpack config and add Dockerfile

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-10-16 22:29:58 +00:00
softwarefactory-project-zuul[bot] 4bf96362cc Merge pull request #5018 from ryanpetrello/cli-deprecation-warnings 
warn about endpoint deprecation in the CLI

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-10-16 20:37:29 +00:00
Ryan Petrello 5001d3158d Merge pull request #3837 from ansible/rename-cyberark-aim 
rename the CyberArk AIM credential type
 2019-10-16 16:12:58 -04:00
Ryan Petrello ce5bb9197e rename the CyberArk AIM credential type 
see: https://github.com/ansible/awx/issues/4400
 2019-10-16 15:58:35 -04:00
Ryan Petrello 309e89e0f0 Merge pull request #3813 from matburt/fix_smart_inventory_impact 
Change host counting for task impact
 2019-10-16 15:56:50 -04:00
Ryan Petrello e27dbfcc0b Merge pull request #3836 from wenottingham/eeeeeeeeEEEEEEEEEEEEEEEEeeeeeeeeeenum 
Remove removal requirement that isn't actually in the requirements
 2019-10-16 15:35:31 -04:00
Bill Nottingham 7df448a348 Remove removal requirement that isn't actually in the requirements 2019-10-16 15:34:33 -04:00
Bill Nottingham e220e9d8d7 Merge pull request #3834 from wenottingham/seriously-cut-it-out-google 
Blacklist rsa even more.
 2019-10-16 15:30:01 -04:00
Ryan Petrello c8a29bac66 warn about endpoint deprecation in the CLI 2019-10-16 15:26:59 -04:00
Bill Nottingham 11d39bd8cc Blacklist rsa even more. 2019-10-16 15:17:19 -04:00
softwarefactory-project-zuul[bot] 1376b8a149 Merge pull request #5020 from ryanpetrello/devel 
merge a variety of downstream bug fixes

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-10-16 18:13:02 +00:00
Ryan Petrello 750208b2da Merge pull request #3831 from rooftopcellist/use_system_ca_for_collection 
Make Analytics collections verify with system trusted CA
 2019-10-16 13:55:07 -04:00
Christian Adams 9d81b00772 have analytics collections verify with system trusted CA list 2019-10-16 13:32:06 -04:00
Ryan Petrello c7be94c2f2 Merge branch 'hardening' into devel 2019-10-16 13:15:20 -04:00
Ryan Petrello 1adf5ee51d Merge pull request #3805 from beeankha/cli_approval_notification_support 
Enable Approval Notification Support for CLI
 2019-10-16 13:09:22 -04:00
Ryan Petrello da998fb196 Merge pull request #3828 from AlanCoding/deprecate_script 
API deprecation of inventory script views
 2019-10-16 11:27:41 -04:00
Ryan Petrello b559860c78 Merge pull request #3804 from jbradberry/cli-no-truncate 
Do not truncate job event list stdout when called from the CLI
 2019-10-16 10:36:29 -04:00
Ryan Petrello a31e2bdac1 Merge pull request #3829 from ansible/tz-fix 
fix a tz parsing bug
 2019-10-16 10:31:44 -04:00
beeankha 62e4ebb85d Minor change to README, plus a rebase. 2019-10-16 09:50:00 -04:00
beeankha aa4f5ccca9 Add blank line (flake8) 2019-10-16 09:50:00 -04:00
beeankha fdddba18be Update code to be compatible with py2 2019-10-16 09:50:00 -04:00
beeankha ad89c5eea7 Enable approval notification support for CLI 2019-10-16 09:50:00 -04:00
Jake McDermott e15bb4de44 Merge pull request #3827 from jakemcdermott/fix_flake8_error 
Fix flake8 error
 2019-10-16 09:47:57 -04:00
Ryan Petrello 5f2e1c9705 fix a tz parsing bug 2019-10-16 09:46:18 -04:00
Jake McDermott 8c5b0cbd57 Merge pull request #3815 from jakemcdermott/fix-3790 
Allow navigation to previous launch prompt tabs
 2019-10-16 09:36:54 -04:00
Jake McDermott 73272e338b Merge pull request #3809 from AlexSCorey/4944-4943-TOCBugs 
Sys Aud can see CG forms, Adds correct CG form link, Disables CodeMirror
 2019-10-16 09:35:02 -04:00
AlanCoding 86ef81cebf API deprecation of inventory script views 2019-10-16 09:34:21 -04:00
Jake McDermott cd18ec408c Remove unused variable 2019-10-16 09:30:43 -04:00
Ryan Petrello 90c5efa336 Merge pull request #3824 from AlanCoding/one_less_redirect 
Avoid unnecessary OPTIONS redirect
 2019-10-16 09:17:03 -04:00
Alex Corey 4134d0b516 Updates PR and Addresses Console Error 
THis commit imroves conditional rendering of the container groups form for
System Auditors.  It also removes a ng-class condition in the IG list that was unused.
 2019-10-16 09:15:44 -04:00
AlanCoding 2123092bdc Avoid unnecessary OPTIONS redirect 2019-10-16 09:08:22 -04:00
softwarefactory-project-zuul[bot] ba7b53b38e Merge pull request #4992 from keithjgrant/4817-react-router-upgrade 
4817 react router upgrade

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-10-15 20:29:16 +00:00
Keith Grant cac5417916 delete commented code 2019-10-15 12:56:39 -07:00
Keith Grant b318f24490 don't skip JobDetail test now that async act works 2019-10-15 12:55:26 -07:00
Bill Nottingham c2743d8678 Merge pull request #3802 from wenottingham/oh-noes-not-again 
Check the user's ansible.cfg for role/collection paths.
 2019-10-15 14:21:18 -04:00
Bill Nottingham 60ca843b71 Use logger.exception instead of logger.warning. 2019-10-15 14:20:09 -04:00
Keith Grant 766f863655 update ProjectDetails tests with memoryHistory 2019-10-15 11:11:44 -07:00
Seth Foster e85fe6a3b7 Merge pull request #3807 from fosterseth/release_3.6.0 
Allow oauth2 settings to be set in the ui and api
 2019-10-15 13:40:25 -04:00
Keith Grant 0b190c2d0d fix login/logout redirect behavior 2019-10-15 10:25:40 -07:00
Keith Grant c7d73c4583 lint fixes 2019-10-15 10:25:40 -07:00
Keith Grant 7ad2c03480 clean up 'act()' warnings in tests 2019-10-15 10:25:40 -07:00
Keith Grant 9e44fea7b5 bump react to lastest patch version 2019-10-15 10:25:40 -07:00
Keith Grant baf5bbc53a finish updating tests for upgraded react-router 2019-10-15 10:25:40 -07:00
Keith Grant 20c24eb275 WIP upgrade react & react-router 2019-10-15 10:25:40 -07:00
Alex Corey 5cf84ddb60 Sys Aud can see CG forms, Adds correct CG form link, Disables CodeMirror 
This allows the System Auditor to see the container groups form in a disabled state.
If the pod_spec_override has been changed that field will be open when the page renders
but it will be disabled. It also greys out all code mirror text area fields for System Auditor.
It adds the correct url for the Container Groups message bar to inform users of possible
pitfalls associated with that feature.
 2019-10-15 10:47:04 -04:00
Jake McDermott 85781d0bc1 Allow navigation to previous launch prompt tabs 2019-10-14 17:07:50 -04:00
softwarefactory-project-zuul[bot] cbed525547 Merge pull request #4965 from marshmalien/project-detail 
Add project detail and unit tests

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-10-14 18:30:30 +00:00
Michael Abashian 31c14b005c Merge pull request #3816 from ansible/4945-wfjt-responsivity-styles 
Fix workflow results detail panel responsive style
 2019-10-14 14:28:38 -04:00
Michael Abashian 7574541037 Merge pull request #3814 from ansible/4846-wfjt-notifications-placeholder 
Style empty list placeholder text inline
 2019-10-14 14:28:03 -04:00