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

23208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mabashian bf6c16197c Moves config request out to block of code that gets executed before the app is bootstrapped. This should allow us to redirect to the override url before the app begins to render, improving the UX. 2019-12-11 11:39:11 -05:00
mabashian 25cc341888 Reverts changes to logout logic. We don't want to redirect to an override url if the user explicitly logs out. 2019-12-11 11:39:02 -05:00
mabashian d899e75ad7 Adds logic to redirect unauthenticated user if LOGIN_REDIRECT_OVERRIDE is set as long as the user is not navigating to /login or /#/login. Also redirects on logout if LOGIN_REDIRECT_OVERRIDE is set. 2019-12-11 11:38:55 -05:00
Graham Mainwaring 732da52239 Expose login redirect URL in unauthenticated /api view 2019-12-11 11:38:45 -05:00
Graham Mainwaring ab2f212b04 Add /login convenience URL 2019-12-11 11:38:36 -05:00
mabashian f94438cf9b Adds login redirect override field to the System (Misc System) Settings interface 2019-12-11 11:38:31 -05:00
Graham Mainwaring 2569ec4f4f Add default for LOGIN_REDIRECT_OVERRIDE 2019-12-11 11:38:21 -05:00
Graham Mainwaring b58bff4686 Add setting for configurable login redirect URL 2019-12-11 11:38:07 -05:00
Ryan Petrello 6254129f0d Merge pull request #4021 from beeankha/custom_email_approve_deny_fix 
[3.6.2 Backport] Enable Approval-Related Email Notifications to Send Properly
 2019-12-10 14:31:58 -05:00
Alan Rominger 266a4e71c5 Merge pull request #4027 from AlanCoding/ryan_hosts_36 
[alan] use a computed inventory field for task impact math
 2019-12-09 14:51:02 -05:00
AlanCoding be5a12a318 Compute fields in smart task_impact tests 2019-12-09 11:46:12 -05:00
Ryan Petrello 001d469bd0 Merge pull request #4026 from AlanCoding/fix_detached_36 
[3.6.2] Fix project sync errors when project branch is commit
 2019-12-06 14:33:10 -05:00
Ryan Petrello b36b6978fb Merge pull request #4024 from ryanpetrello/iso-check-timeout-362 
fix a bug in isolated check timeout handling
 2019-12-06 14:00:05 -05:00
AlanCoding 55a19ffe6a Fix project sync errors when project branch is commit 2019-12-06 13:04:04 -05:00
Ryan Petrello c4d358b870 use a computed inventory field for task impact math 
see: https://github.com/ansible/tower/issues/4022
 2019-12-06 12:56:18 -05:00
Ryan Petrello 5ae7df7757 fix a bug in isolated check timeout handling 2019-12-06 12:51:24 -05:00
Jake McDermott bc6d879976 Merge pull request #4015 from mabashian/4013-backport-angular-upgrade 
[3.6.2 backport] Upgrades angular and auxiliary deps to 1.7.9
 2019-12-05 11:34:28 -05:00
Ryan Petrello 9bae9d32c7 Merge pull request #4020 from ryanpetrello/always_release_lock-3-6-2 
fix situation were error happened before lock was released
 2019-12-05 11:32:38 -05:00
Ryan Petrello b5724adae5 fix situation were error happened before lock was released 2019-12-05 11:30:12 -05:00
beeankha d6e5eb356b Revert original quotation mark configuration for non-approval default msg and body 2019-12-05 09:25:32 -05:00
beeankha b46a2b43b0 Change quotation mark format for sconsistency and also to comply with qa tests 2019-12-05 09:25:23 -05:00
beeankha 6f54044cc6 Enable approval-related email notifications to send properly 2019-12-05 09:25:10 -05:00
mabashian 2d4df3d50e Fixes bug where permissions checkboxes had inverse effect after upgrading angular to 1.7.x. 2019-12-05 07:34:14 -05:00
mabashian 93b49f314d Upgrades angular and auxiliary deps to 1.7.9 2019-12-04 11:03:24 -05:00
Ryan Petrello 55d81cf74d Merge pull request #4012 from ryanpetrello/monkey-patch-oauth2-side-effect-362 
fix an nuanced bug which can cause OAuth2 migrations to fail
 2019-12-04 10:59:18 -05:00
Ryan Petrello afadfa939d fix an nuanced bug which can cause OAuth2 migrations to fail 2019-12-04 09:55:55 -05:00
Ryan Petrello 9856c9154e Merge pull request #3999 from ryanpetrello/fix-system-jobs-362 
fix a few bugs with the session and oauth2 cleanup scheduled jobs
 2019-12-03 12:08:03 -05:00
Michael Abashian e7a712394a Merge pull request #4001 from mabashian/backport-awx-5411 
[3.6.2] Backport WFJT inventory rbac fix
 2019-12-03 10:23:30 -05:00
Marliana Lara 9cdb281f06 Check inventory use permissions to disable workflow inventory lookup 2019-11-27 16:42:57 -05:00
Ryan Petrello c373420982 fix incorrect SystemJob.job_type choices 2019-11-27 12:37:24 -05:00
mabashian 93a9a0354f Adds missing semicolons to make linter happy 2019-11-27 12:37:21 -05:00
mabashian ee6e28e066 Only show the days to keep input on the scheduler for system jobs that require it. Hides this field for cleaning up tokens and sessions. 2019-11-27 12:37:16 -05:00
Ryan Petrello ea5d429399 fix a few bugs with the session and oauth2 cleanup scheduled jobs 
see: https://github.com/ansible/tower/issues/3940
 2019-11-27 12:37:10 -05:00
Ryan Petrello a1af4e1808 Merge pull request #3997 from ryanpetrello/fix-busted-tests-362 
fix busted tests for 3.6.2
 2019-11-27 09:22:39 -05:00
Ryan Petrello ffdcb2f8eb fix busted tests 2019-11-27 08:37:30 -05:00
Ryan Petrello 7b5f4f51fb Merge pull request #3990 from AlanCoding/sanity_fixes_36 
Fix duplicate exception sanity error
 2019-11-27 08:35:52 -05:00
Ryan Petrello 25c2b9610a Merge pull request #3993 from ryanpetrello/fix-asgi-bug-362 
bump asgi-amqp dependency
 2019-11-27 08:03:05 -05:00
Ryan Petrello 68f17eb370 bump asgi-amqp dependency 2019-11-26 23:33:24 -05:00
AlanCoding 695eab1fdd fix duplicate exception sanity error 2019-11-26 09:47:07 -05:00
Shane McDonald ce8c0066d0 Fix downstream tests 
I backported how we do the VERSION detection in 3.5.something. This should
already be fixed upstream.
 2019-11-25 12:55:18 -05:00
Shane McDonald 24abc1462f Merge pull request #3985 from shanemcd/fix-cache 
Fix Docker build caching
 2019-11-25 11:41:33 -05:00
Shane McDonald 12363ae175 Fix Docker build caching 
The flow will need to be:

- Pre-pull image you want to use
- Re-tag as image:$(COMPOSE_TAG)
- COMPOSE_TAG=mytag make docker-compose-build
 2019-11-25 11:32:41 -05:00
Ryan Petrello 1fbae00e37 Merge pull request #3983 from ryanpetrello/fix-3980 
Remove usage of idle_timeout when checking status of isolated / containerized jobs
 2019-11-25 11:15:35 -05:00
Ryan Petrello 0d659b0111 Merge pull request #3984 from ryanpetrello/fix-3978 
Adds link to docs on container groups add/edit forms
 2019-11-25 10:42:59 -05:00
mabashian ee8775a08d Adds link to docs on container groups add/edit forms to match instance groups. Updates instance groups link. 2019-11-25 10:35:23 -05:00
Shane McDonald 31650bb0bd Remove usage of idle_timeout when checking status of isolated / containerized jobs 2019-11-25 10:31:33 -05:00
Ryan Petrello 17509d560d Merge pull request #3955 from AlanCoding/lets_release 
Backport collection fixes
 2019-11-18 16:25:04 -05:00
Ryan Petrello 268b22c550 Merge pull request #3953 from ryanpetrello/more-container-group-fixes 
[3.6.1] fix a few bugs related to container group execution
 2019-11-18 14:27:18 -05:00
Ryan Petrello b525d0a6f4 Merge pull request #3967 from ryanpetrello/fix-cli-doc-typos 
fix a typo in the CLI usage docs
 2019-11-18 11:26:24 -05:00
Ryan Petrello 9c2797b34c fix a typo in the CLI usage docs 2019-11-18 11:21:34 -05:00