External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-20 06:01:25 -03:30
Code Issues Packages Projects Releases Wiki Activity
30,623 Commits 55 Branches 19 Tags
Commit Graph

30623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
softwarefactory-project-zuul[bot]
d4305f734a
Merge pull request #7585 from philipsd6/enable-html-custom-login-info 
Safely enable HTML in Custom Login Info

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-10 12:57:17 +00:00
weltamdraht
347529a0cf Adding inventory variable to set "extra_hosts" in generated compose file 
Signed-off-by: weltamdraht <andreas.aderhold@dwd.de>
 2020-07-10 13:25:07 +02:00
softwarefactory-project-zuul[bot]
e4470f1200
Merge pull request #7592 from jakemcdermott/fix-7591 
Include instance_id in host edit request

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-09 21:17:18 +00:00
Keith Grant
f225df1acd add useWsInventories tests 2020-07-09 14:12:56 -07:00
nixocio
01f210e392 Set React to Strict Mode 
Set React to Strict Mode.

See: https://reactjs.org/docs/strict-mode.html
 2020-07-09 15:37:19 -04:00
Keith Grant
455e018099 refactor shared WS logic into useWebsocket hook 2020-07-09 10:14:03 -07:00
Philip Douglass
4c98a1cb20 Set white-space style based on customLoginInfoIsHTML 
Signed-off-by: Philip Douglass <philip.douglass@amadeus.com>
 2020-07-09 18:56:19 +02:00
Philip Douglass
202a68aca0 Add customLoginInfoIsHTML test 
Signed-off-by: Philip Douglass <philip.douglass@amadeus.com>
 2020-07-09 18:56:19 +02:00
Philip Douglass
29666bf3b6 Remove white-space: pre-wrap from loginModalNotice 
Signed-off-by: Philip Douglass <philip.douglass@amadeus.com>
 2020-07-09 18:56:19 +02:00
Jake McDermott
ddbe20d41b
Include instance_id in host edit request 2020-07-09 11:27:45 -04:00
Ryan Petrello
140d9ae3ee
Merge pull request #4429 from wenottingham/label-maker 
Reintroduce label filtering
 2020-07-09 09:00:57 -04:00
Keith Grant
84bea3d348 websockets: show live inventory source sync status 2020-07-08 15:20:42 -07:00
softwarefactory-project-zuul[bot]
d0ac028265
Merge pull request #7489 from nixocio/ui_issue_7326 
Add edit credential types

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-08 20:53:09 +00:00
Ryan Petrello
7322e13436
add tests for clarified label permissions 2020-07-08 16:53:05 -04:00
softwarefactory-project-zuul[bot]
9065b29bd6
Merge pull request #7584 from ryanpetrello/jinja2-sandbox 
use jinja2.sandbox for credential type injectors

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-08 20:53:02 +00:00
softwarefactory-project-zuul[bot]
dbdc856ed3
Merge pull request #7576 from ryanpetrello/instance-group-capabilities 
show user capabilities for instance groups

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-08 20:05:55 +00:00
Ryan Petrello
1cf2f009ed
prevent unsafe jinja from being saved in the first place for cred types 
see: https://github.com/ansible/tower-security/issues/21
 2020-07-08 15:48:58 -04:00
Ryan Petrello
2bdd83e029
use jinja2.sandbox for credential type injectors 2020-07-08 15:48:47 -04:00
softwarefactory-project-zuul[bot]
e91395d517
Merge pull request #7497 from AlexSCorey/ApplicationTokens 
Adds Application Token List with delete functionality

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-08 19:42:17 +00:00
softwarefactory-project-zuul[bot]
19115a157e
Merge pull request #7555 from AlexSCorey/7433-UserTokensAdd 
Adds User TokenAdd Functionality

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-08 19:33:06 +00:00
Alex Corey
a9d4046ec5 Adds Application Token List with delete functionality 2020-07-08 15:13:31 -04:00
Alex Corey
bbc4522063 Adds User TokenAdd Functionality 2020-07-08 14:47:23 -04:00
softwarefactory-project-zuul[bot]
fb3271da3c
Merge pull request #7578 from squidboylan/raise_sleep_timeout 
Raise job length for testing job wait

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-08 18:36:42 +00:00
Caleb Boylan
56d800e851 Raise job length for testing job wait 2020-07-08 09:28:19 -07:00
Ryan Petrello
319308193c
show user capabilities for instance groups 2020-07-08 09:17:55 -04:00
Keith Grant
15ae0976dd add sync status indicator to inventory list 2020-07-07 16:37:08 -07:00
softwarefactory-project-zuul[bot]
f121dc59f6
Merge pull request #7529 from nixocio/ui_issue_7471 
Add stub files for Instance Groups

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-07 21:12:23 +00:00
softwarefactory-project-zuul[bot]
f050b73560
Merge pull request #7568 from jakemcdermott/fix-7534 
Update to ansible/angular-scheduler#v0.4.4

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-07 19:43:00 +00:00
Jake McDermott
bd624508e3
Update to ansible/angular-scheduler#v0.4.4 2020-07-07 15:04:07 -04:00
softwarefactory-project-zuul[bot]
b9fb9389e6
Merge pull request #7537 from jakemcdermott/fix-7483 
Fix custom credential field validation

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-07 19:02:53 +00:00
softwarefactory-project-zuul[bot]
bf28bdecb7
Merge pull request #7540 from keithjgrant/6618-websocket-projects-list 
Add Websocket support to Projects List

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-07 19:00:10 +00:00
softwarefactory-project-zuul[bot]
23cab61408
Merge pull request #7444 from AlexSCorey/7412-OrganizationEditButton 
Adds edit icon to the OrganizationTeams list 

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-07 17:32:34 +00:00
nixocio
777d44ec34 Add edit credential types 
Add feature to edit credential types.

See: https://github.com/ansible/awx/issues/7326
 2020-07-07 13:30:54 -04:00
Ryan Petrello
bc14e995fd
Merge pull request #4434 from ryanpetrello/jinja-injector-sandbox-validation 
prevent unsafe jinja from being saved in the first place for cred types
 2020-07-07 12:47:15 -04:00
Ryan Petrello
61d3a765ee
prevent unsafe jinja from being saved in the first place for cred types 
see: https://github.com/ansible/tower-security/issues/21
 2020-07-07 10:59:14 -04:00
Ryan Petrello
f943277ef0
Merge pull request #4433 from ghjm/webhook_error_detail 
Error detail in webhook and credential tests
 2020-07-07 10:35:21 -04:00
softwarefactory-project-zuul[bot]
9a6da9cea7
Merge pull request #7552 from ikke-t/fix-7545 
Allow anyone to start awx and awx_task [#7545]

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-07 14:34:16 +00:00
Ilkka Tengvall
8b4b1f5f81 Allow anyone to start awx and awx_task [#7545] 2020-07-07 15:04:23 +03:00
Graham Mainwaring
5a96af79d4 Reduce error detail in credential lookups 2020-07-06 21:41:28 -04:00
Graham Mainwaring
b7f37d5e26 Reduce error detail in webhook notification 2020-07-06 21:17:21 -04:00
Graham Mainwaring
d14aee70a1 Don't follow redirects in credential plugins 2020-07-06 17:18:30 -04:00
Ryan Petrello
8aa11f4848
Merge pull request #4430 from ryanpetrello/jinja2-injector-sandbox 
use jinja2.sandbox for credential type injectors
 2020-07-06 15:21:21 -04:00
Jake McDermott
05799d9795
Avoid non-unique field name collisions 
Custom credentials can have input fields named 'name', 'organization',
'description', etc. Underscore these variables to make collisions
less likely to occur.
 2020-07-06 14:08:53 -04:00
Jake McDermott
ea4b435ea7
Ignore required field validation for booleans 2020-07-06 14:08:46 -04:00
Ryan Petrello
2f1b4d81e1
use jinja2.sandbox for credential type injectors 2020-07-06 13:50:33 -04:00
Bill Nottingham
a88f03b372 Reintroduce label filtering 
Labels are visible if you have a role on the org they are in, or
on a job template they're attached to.
 2020-07-06 13:50:00 -04:00
softwarefactory-project-zuul[bot]
dbfb1780f1
Merge pull request #7553 from jakemcdermott/fix-7530 
Fix self-closing tags for jquery 3.5 compat

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2020-07-06 17:01:46 +00:00
Jake McDermott
a89eff3c1a
Remove self-closing tags 
jquery doesn't like self-closing tags. jquery doesn't like anything.
 2020-07-06 09:34:50 -04:00
JoelKle
699f186890 Fixed a bug, where the redis.conf first would be stored with mod 0600 
and in the next task changed to 0666.
This has broke the ability to rerun the playbook.

Signed-off-by: JoelKle <34544090+JoelKle@users.noreply.github.com>
 2020-07-03 08:59:28 +02:00
JoelKle
caab751215 Added the ability, to set the broadcast_websocket_secret variable. 
This is nessesary if you would like to rerun the playbook.

Signed-off-by: JoelKle <34544090+JoelKle@users.noreply.github.com>
 2020-07-03 08:59:28 +02:00