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

19121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sami 477551325d Merge branch 'workflow-visualizer-search' of https://github.com/ansible/awx into workflow-visualizer-search 2018-10-18 15:07:08 -04:00
Daniel Sami fdedc472d1 lint fix 2018-10-18 15:06:37 -04:00
Daniel Sami f3ee93b67f Merge branch 'devel' into workflow-visualizer-search 2018-10-18 14:48:36 -04:00
Daniel Sami b4549e5581 added search for visualizer nodes 2018-10-18 14:38:10 -04:00
softwarefactory-project-zuul[bot] 3afed6adb7 Merge pull request #2383 from ansible/updateSettingsNav 
add additional settings sub navigation

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-18 17:55:26 +00:00
John Mitchell 1bc78fd429 fix selectors for settings sub pane 2018-10-18 13:37:45 -04:00
John Mitchell 6ce1b50751 update config e2e tests to fix syntax and linting issues 2018-10-18 13:37:45 -04:00
John Hill 6c87b88e2c Updating configuration/settings page 2018-10-18 13:37:45 -04:00
John Hill 10f21b8817 Updating e2e tests to match new settings nav 2018-10-18 13:37:45 -04:00
John Mitchell 0d1b25131d fix scope location of json fields of settings auth form 2018-10-18 13:37:45 -04:00
John Mitchell d2118b8d25 fix activity stream settings links 2018-10-18 13:37:44 -04:00
John Mitchell b852caaaa3 update configuration controllers to fix syntax warnings 2018-10-18 13:37:44 -04:00
John Mitchell b0dd10b538 sidenav sub pane feedback 
make height the same as side nav items
no tooltip for collapsed settings
 2018-10-18 13:37:44 -04:00
John Mitchell 8f4aa5511b update side nav settings pane show hide hover logic 2018-10-18 13:37:44 -04:00
John Mitchell 4b26ac06ba fix open/close on settings nav item hover 2018-10-18 13:37:44 -04:00
John Mitchell 4dc6452dea updating suit name and variabilize colors for sub nav pane 2018-10-18 13:37:43 -04:00
John Mitchell 5a17acb131 working commit 2018-10-18 13:37:43 -04:00
Haokun-Chen 6cfd9dbfe4 refactor configuration (settings) 
sub-nav added
 2018-10-18 13:37:41 -04:00
softwarefactory-project-zuul[bot] 110c5a8e84 Merge pull request #2431 from Numblesix/devel 
Added some Doc for ca_trust_dir

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-18 16:15:46 +00:00
Yanis Guenane b185c1e0a2 Merge branch 'devel' into devel 2018-10-18 18:00:16 +02:00
softwarefactory-project-zuul[bot] f1a4a62304 Merge pull request #2432 from Numblesix/ldap-doc 
Added some Doc for FREEipa

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-18 14:53:14 +00:00
Yanis Guenane 9f3e3bad54 Merge branch 'devel' into ldap-doc 2018-10-18 16:38:31 +02:00
softwarefactory-project-zuul[bot] 56525bc34f Merge pull request #2476 from AlanCoding/rm_changelog 
Remove changelog

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-18 14:15:21 +00:00
Yanis Guenane 3f2068e74e Merge branch 'devel' into ldap-doc 2018-10-18 15:53:34 +02:00
AlanCoding 6117f8297e remove changelog 2018-10-18 09:52:08 -04:00
softwarefactory-project-zuul[bot] 8953d06905 Merge pull request #2456 from wenottingham/insert-obvious-unchained-joke-here 
Update to latest django subminor to pick up assorted fixes.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-18 13:50:55 +00:00
Numblesix bf39a2a747 Added some Doc for FREEipa 2018-10-18 09:31:24 -04:00
Bill Nottingham f27ec8cd89 Update Django version in version check. 2018-10-18 09:23:59 -04:00
Bill Nottingham aec3244f52 Update to latest django subminor to pick up assorted fixes. 2018-10-18 09:23:57 -04:00
softwarefactory-project-zuul[bot] 07aaad53aa Merge pull request #2037 from ikke-t/ikke-t-selinux-fix 
fixes selinux permissions for awx data.

Reviewed-by: Shane McDonald <me@shanemcd.com>
             https://github.com/shanemcd
 2018-10-17 19:05:21 +00:00
Ilkka Tengvall 42a0192425 Merge branch 'devel' into ikke-t-selinux-fix 2018-10-17 21:44:48 +03:00
softwarefactory-project-zuul[bot] ac08033d3e Merge pull request #2472 from ryanpetrello/callback-receiver-log 
use the proper logger for the callback receiver

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-17 15:35:32 +00:00
Numblesix 6d0fed6d9a Added some Doc for ca_trust_dir 2018-10-17 11:32:26 -04:00
Ryan Petrello 53ae05094e use the proper logger for the callback receiver 2018-10-17 10:56:29 -04:00
softwarefactory-project-zuul[bot] 78c4d5005e Merge pull request #2461 from ryanpetrello/upgrade-celery-and-kombu 
upgrade to the latest kombu + celery

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-17 13:49:37 +00:00
Ryan Petrello 79002ae563 upgrade to the latest kombu + celery 2018-10-16 16:14:58 -04:00
softwarefactory-project-zuul[bot] 6c868c7552 Merge pull request #2449 from ryanpetrello/noisy-check-migrations 
silence the noisy error that's printed w/ `awx-manage check_migrations`

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-16 18:04:05 +00:00
Ryan Petrello 6e4f3efc4b silence the noisy error that's printed w/ awx-manage check_migrations 2018-10-16 13:48:03 -04:00
softwarefactory-project-zuul[bot] ce9da4edb7 Merge pull request #2454 from ryanpetrello/more-celery-cleanup 
allow users to specify BROKER_URL with passwords that contain : and @

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-16 16:30:33 +00:00
Ryan Petrello 6ff1fe8548 allow users to specify BROKER_URL with passwords that contain : and @ 2018-10-16 11:56:57 -04:00
softwarefactory-project-zuul[bot] 140b85688f Merge pull request #2451 from matburt/fixup_test_userlaunch 
Force openshift user behavior for uids over 2500

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-16 15:47:20 +00:00
Matthew Jones 0477581dea Fix up flake8 2018-10-16 11:30:07 -04:00
Matthew Jones d5c557c639 Proper parameterization for scm tests 2018-10-16 11:30:06 -04:00
Matthew Jones 8e60cb1270 Purge an unneeded ansible 2.4 version check 2018-10-16 11:30:05 -04:00
chris meyers 906eb98d8e fixes dispatcher test that inadvertently access db 
* Logger inadvertently triggered by dispatcher tests that do not need DB
access. Mock settings to sidestep DB access.
 2018-10-16 11:30:04 -04:00
Matthew Jones 119b9475ea Force openshift user behavior for uids over 2500 2018-10-16 11:30:04 -04:00
softwarefactory-project-zuul[bot] 12c8994faf Merge pull request #2450 from ryanpetrello/iso-deprovision-fix 
don't call rabbitmqctl forget_cluster_node for isolated instances

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-16 14:10:35 +00:00
Ryan Petrello f3e73bbed8 don't call rabbitmqctl forget_cluster_node for isolated instances 2018-10-16 09:47:53 -04:00
softwarefactory-project-zuul[bot] e2a1b7902c Merge pull request #2439 from jmferrer/change_openshift_vars_path 
Change openshift vars path.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2018-10-16 12:17:51 +00:00
jmferrer d65a3fa037 Restore per-deployment requirements. 2018-10-16 09:59:11 +02:00