External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 04:10:44 -03:30
Code Issues Packages Projects Releases Wiki Activity
21,788 Commits 54 Branches 19 Tags
Commit Graph

21788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
softwarefactory-project-zuul[bot]
e34833c8cb
Merge pull request #4300 from jakemcdermott/output-updown 
get more events on page down or up when needed

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-09 17:12:27 +00:00
softwarefactory-project-zuul[bot]
f22314caaf
Merge pull request #4257 from marshmalien/skeleton-template-add-form 
Skeleton template add form

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-09 17:06:46 +00:00
Marliana Lara
fb0c82598f
Address PR feedback 2019-07-09 12:37:50 -04:00
Jake McDermott
90f7e9375f get more events on page down or up when needed 
when we page up or down, check if we've moved into the upper or lower
threshold of the scrollbar and request more events to show if we have.
 2019-07-09 10:21:48 -04:00
softwarefactory-project-zuul[bot]
ccea920ea3
Merge pull request #4263 from fantashley/easy-custom-venvs 
Add dynamic custom venv setup

Reviewed-by: Shane McDonald <me@shanemcd.com>
             https://github.com/shanemcd
 2019-07-09 13:23:37 +00:00
softwarefactory-project-zuul[bot]
2d636806db
Merge pull request #4123 from clushie/update_openstacksdk_dependencies 
Fix outdated openstacksdk version and add pip-compile helper script

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-09 13:04:12 +00:00
softwarefactory-project-zuul[bot]
bda42332b7
Merge pull request #4295 from JakobP/bug/3857-improve-error-message 
Fix #3857. More informative error message for job templates

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-09 13:00:05 +00:00
Jakob Pedersen
e23ee41082 Fix issue #3857 with a more informative error message when the usercan not post to /#/templates/add_job_template 
The cause can be both missing permissions and no projects being available.

Related #3857

Signed-off-by: Jakob Pedersen <CONS_JPE@jysk.com>
 2019-07-09 10:47:19 +02:00
softwarefactory-project-zuul[bot]
2aa32f61f8
Merge pull request #4290 from ryanpetrello/csp-false-positive 
specify a ng-csp attribute so Angular doesn't autodetect

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-09 01:58:18 +00:00
Ashley Nelson
036e1ad82e Add dynamic custom venv setup 
Add support for python3 venvs
 2019-07-08 18:49:31 -05:00
Ryan Petrello
66321a6218
specify a ng-csp attribute so Angular doesn't autodetect 
without this, we're getting a false positive log message about an unsafe
eval (which is *actually* just angular auto-detecting whether or not
eval is supported)
 2019-07-08 17:32:41 -04:00
softwarefactory-project-zuul[bot]
1f31cc9394
Merge pull request #4101 from jbradberry/fix-4099 
Include defined fields from all parent classes of a HybridDictField

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-08 21:15:11 +00:00
Jeff Bradberry
758ad164fe Include defined fields from all parent classes of a HybridDictField 
since our settings registry adds a mixin class when doing validation on these.

related #4099
 2019-07-08 16:05:03 -04:00
softwarefactory-project-zuul[bot]
be975fc051
Merge pull request #4283 from falcon78921/wip-awx-minor-fix 
awx/ui: minor fix on Update on Project Update description

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-08 19:48:28 +00:00
softwarefactory-project-zuul[bot]
04ea39c315
Merge pull request #4282 from saito-hideki/issue/tower_3590 
Fix to use "type" as the condition value for Machine credential to cover I18N

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-08 19:36:31 +00:00
Hideki Saito
869d259433
Fix conditional values for handle internationalization 
Fix the variable for checking the credential type from "name" to "kind"
 in order to correctly handle I18N.

Signed-off-by: Hideki Saito <saito@fgrep.org>
 2019-07-08 15:03:35 -04:00
softwarefactory-project-zuul[bot]
7faff07bd9
Merge pull request #4279 from athenahealth/fix-csp-for-safari-websockets 
Update Content Security Policy to allow websockets

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-08 18:00:42 +00:00
softwarefactory-project-zuul[bot]
ca83b62c21
Merge pull request #4277 from jainnikhil30/devel 
add inventory name and id to meta vars

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-08 16:09:49 +00:00
James McClune
8aa33b9b4a awx/ui: minor fix on Update on Project Update description 
In the Inventory Source settings, one of the update options is titled
Update on Project Change. However, the tooltip is titled
Update on Project Update. Looking at the overall AWX codebase, I think
the definitions are fitted more towards Update on Project Update.

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
 2019-07-07 23:36:54 -04:00
Jeff Byrnes
987cfed649
Update Content Security Policy to allow websockets 
Per #4167 a reasonable CSP was put in place, but unfortunately this
broke WebSockets support in Safari.

This is a quick fix to return support immediately. A more secure
implemetation would be beneficial in the longer term, however.
 2019-07-05 16:12:27 -04:00
softwarefactory-project-zuul[bot]
9b6644bc77
Merge pull request #4276 from ryanpetrello/ldap-tls-verify-off 
fix a bug that breaks OPT_X_TLS_REQUIRE_CERT=0 for LDAP authentication

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-05 15:58:47 +00:00
jainnikhil30
88a4362a7a add inventory name and id to meta vars 2019-07-05 20:37:36 +05:30
Ryan Petrello
0dcbafaccb
fix a bug that breaks OPT_X_TLS_REQUIRE_CERT=0 for LDAP authentication 2019-07-05 10:24:18 -04:00
Marliana Lara
7afaacb5e3
Add Job Template Add form skeleton and test 2019-07-03 15:44:52 -04:00
Marliana Lara
b06421b870
Rename TemplateForm to JobTemplateForm 2019-07-03 15:44:52 -04:00
softwarefactory-project-zuul[bot]
d4f50896de
Merge pull request #4260 from fantashley/fix-docker-module-name 
Change to docker_service for compatibility

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-03 12:28:35 +00:00
softwarefactory-project-zuul[bot]
71812c66d2
Merge pull request #4118 from DanielDisisto/patch-1 
Failing requirements update when scm_type != git

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-03 12:17:05 +00:00
softwarefactory-project-zuul[bot]
731d8c21e8
Merge pull request #4252 from ansible/jakemcdermott-fix-readme-snippet 
fix README snippet

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-03 11:55:05 +00:00
DanielDisisto
3247983823
Failing requirements update when scm_type != git 
The `git_result` variable is incorrectly checked as being `defined` vs. `not skipped`. This causes SVN (or any non-GIT) project update to fail consistently when `doesRequirementsExist.stat.exists` is true

Signed-off-by: DanielDisisto <daniel.disisto@didata.com.au>
 2019-07-03 07:51:01 -04:00
Ashley Nelson
485536d4cf Change to docker_service for compatibility 2019-07-02 16:03:43 -05:00
softwarefactory-project-zuul[bot]
b37040a85c
Merge pull request #4256 from ryanpetrello/inline-image-csp 
allow data: images in our Content Security Policy

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-02 17:13:10 +00:00
softwarefactory-project-zuul[bot]
84ad1cdfcd
Merge pull request #4250 from kialam/fix-254-delete-last-elem-list-page 
Fix 254 delete last elem list page

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-02 16:17:51 +00:00
Ryan Petrello
75a72637dd
allow data: images in our Content Security Policy 
support for custom login logos relies on data:image/*;base64
see: https://github.com/ansible/awx/issues/4253
 2019-07-02 11:35:56 -04:00
Kia Lam
74e4c17b63
Address PR feedback and format. 2019-07-02 09:54:07 -04:00
softwarefactory-project-zuul[bot]
c65ae87d69
Merge pull request #4175 from jainnikhil30/devel 
fix the hashivault v2 lookup

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-02 12:42:41 +00:00
Phileas Lebada
7feb6515e1 Bump openstacksdk version 
Signed-off-by: github.com/clushie <47661139+clushie@users.noreply.github.com>
 2019-07-02 13:56:26 +02:00
Phileas Lebada
d3b3b6e8f5 Add cosmetic change with updater.sh 
Signed-off-by: github.com/clushie <47661139+clushie@users.noreply.github.com>
 2019-07-02 13:56:26 +02:00
Phileas Lebada
48e02f373f Add pip-compile updater.sh script 
Signed-off-by: github.com/clushie <47661139+clushie@users.noreply.github.com>
 2019-07-02 13:56:26 +02:00
jainnikhil30
dbf8df479b
use path instead of *path while dong the join 2019-07-02 07:55:35 -04:00
jainnikhil30
764947c1ae
fix the hashivault v2 lookup 2019-07-02 07:55:32 -04:00
Jake McDermott
0b724682da
fix README snippet 2019-07-01 19:50:16 -04:00
softwarefactory-project-zuul[bot]
4fb055345d
Merge pull request #4199 from mabashian/264-notification-type-column 
Show notification type in its own column

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-01 22:57:50 +00:00
Kia Lam
d3ed6ac73a
Fix Template list as well. 2019-07-01 16:21:41 -04:00
Kia Lam
d22cafc42e
Add unit test. 2019-07-01 16:20:38 -04:00
Kia Lam
58444a75b9
Fix Org list returning a 404 by redirecting user to current page. 
- Update itemCount after an org has been successfully deleted.
- Update PaginatedDataList to get current page when the number of items has changed.
 2019-07-01 16:20:38 -04:00
softwarefactory-project-zuul[bot]
7178c1d9e0
Merge pull request #4200 from ansible/jakemcdermott-contrib-formatter 
run formatting check with ci

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-07-01 19:28:39 +00:00
Jake McDermott
945d9156a6 do formatting check with ci linter 2019-07-01 14:27:25 -04:00
Jake McDermott
bf86719412
add a note about running the formatter 2019-07-01 14:16:17 -04:00
mabashian
12c0b80102 Prettify files 2019-07-01 13:51:13 -04:00
mabashian
1d2c21249b Show notification type in its own column 2019-07-01 13:49:38 -04:00