External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity
11,607 Commits 54 Branches 19 Tags
Commit Graph

11607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane McDonald
b7317cbdc1 Merge pull request #5114 from sundeep-co-in/release_3.1.0 
add lang option in push/pull
 2017-02-14 12:29:33 -05:00
Ryan Petrello
78d6232a5f Merge pull request #5347 from ryanpetrello/fix-4788 
don't cache social-auth-core backends
 2017-02-14 12:06:01 -05:00
Ryan Petrello
e3653b0e18 Merge pull request #5301 from ryanpetrello/fix-5276 
fix several issues that are preventing usage of unicode as CTinT values
 2017-02-14 11:51:30 -05:00
Ryan Petrello
cae8950723 don't cache social-auth-core backends 
social-auth-core uses a global variable to cache backend settings:
78da4eb201/social_core/backends/utils.py (L9)

when loading backends, forcibly ignore this behavior to avoid
a thread-safety issue that causes #4788 #4045
 2017-02-14 11:35:42 -05:00
Jared Tabor
4ce69f2f9c Merge pull request #5335 from jaredevantabor/rbac-users 
Fixing console error on Add Permissions for Orgs->Users
 2017-02-14 09:41:26 -05:00
kensible
c3cbaf4830 Merge pull request #5331 from kensible/4657-saml-key-cert 
Changed inputs to textareas, support key and cert
 2017-02-14 09:39:37 -05:00
Michael Abashian
b65a10fff2 Merge pull request #5337 from mabashian/5332-expand-workflow 
Resize the workflow chart when expanded out to full screen
 2017-02-14 09:36:25 -05:00
Michael Abashian
f7bf54a9f3 Merge pull request #5339 from mabashian/5326-workflow-job-breaks 
Workaround for workflow node bug
 2017-02-14 09:35:42 -05:00
kensible
426bb4a055 Merge pull request #5323 from kensible/4617-inventory-search-bar 
Updated inventory search bar width and buttons
 2017-02-14 09:00:59 -05:00
Alan Rominger
138b672ba0 Merge pull request #5316 from AlanCoding/supervisor_dev 
Add supervisor option to development environment
 2017-02-14 08:47:27 -05:00
Shane McDonald
7282e4c332 Fix globbing pattern for l10n files 
TIL **/* only searches direct child directories on Linux, but is recursive on macOS
 2017-02-13 20:33:06 -05:00
Shane McDonald
409090789c Add l10n files to data_files in setup.py 2017-02-13 20:00:30 -05:00
Michael Abashian
0e6e116fa3 Explicitly setting an order_by fixes the issue of workflow nodes coming back out of whack on page 2 and beyond 2017-02-13 19:02:35 -05:00
AlanCoding
9a88091042 get supervisorctl to work in dev supervisor env 2017-02-13 17:36:35 -05:00
AlanCoding
b5aad8cbed bypass the makefile target for most commands in dev supervisor 2017-02-13 17:36:35 -05:00
AlanCoding
d1a71fb7be add supervisor option to development environment 2017-02-13 17:36:34 -05:00
Alan Rominger
3f0c42c1f6 Merge pull request #5329 from AlanCoding/disable_sig_jobs 
Disable computed fields in cleanup_jobs
 2017-02-13 17:35:24 -05:00
Alan Rominger
0d396384bc Merge pull request #5334 from AlanCoding/orphan_wfjt_cap 
Special case for user capability with null WFJT organization
 2017-02-13 17:06:50 -05:00
Alan Rominger
42184d2416 Merge pull request #5333 from AlanCoding/jt_related_search 
Surface labels related search for job templates
 2017-02-13 17:03:01 -05:00
AlanCoding
770580b612 special case for user capability with null WFJT organization 2017-02-13 16:25:05 -05:00
Alan Rominger
c5da81eb19 Merge pull request #5305 from AlanCoding/celery_dynamic_option 
Get celery logging autoreload + don't reconfigure the whole config
 2017-02-13 16:22:40 -05:00
Ryan Petrello
5a8a647cf0 default log aggregator username and password to an empty string 
other configuration options seem to follow this pattern; the UI code
seems to expect that it can send across an empty string

see: #5276
 2017-02-13 16:09:31 -05:00
Ryan Petrello
64a973ae02 work around a unicode handling bug in python-memcached that affects py2 
see: https://github.com/linsomniac/python-memcached/issues/79
see: #5276
 2017-02-13 16:09:31 -05:00
Ryan Petrello
2c7cb4a370 add utf-8 support to utils.common.encrypt_field/decrypt_field 2017-02-13 16:09:31 -05:00
AlanCoding
fbe712dcd1 refactor adding logger loop from PR review 2017-02-13 15:45:05 -05:00
Michael Abashian
6b66a61dad Resize the workflow chart when expanded out to full screen 2017-02-13 15:32:48 -05:00
jaredevantabor
4035910e3e changing to ng-if so that directive doesn't fire off 2017-02-13 15:20:14 -05:00
AlanCoding
603dfea580 get rid of HTTPSHandler subclass which is not needed 2017-02-13 15:07:33 -05:00
Chris Meyers
6371fcaa92 Merge pull request #5328 from chrismeyersfsu/fix-5275 
remove partial dependency job id logic
 2017-02-13 14:56:22 -05:00
AlanCoding
31098d1b5d surface labels related search for job templates 2017-02-13 14:34:40 -05:00
jlmitch5
691612d899 Merge pull request #5296 from jlmitch5/jobResultsPerformanceAgain 
more job results performance stuff
 2017-02-13 14:31:15 -05:00
Ryan Petrello
c88e115d40 Merge pull request #5330 from ryanpetrello/fix-5322 
work around a DRF issue that causes CharField to cast `None` to `"None"`
 2017-02-13 14:14:47 -05:00
Ken Hoes
4e6773b922 Changed inputs to textareas, support key and cert 2017-02-13 13:49:58 -05:00
Wayne Witzel III
df4fe4df2b Merge pull request #5327 from wwitzel3/issue-4730 
Allow execute role to see their schedules
 2017-02-13 12:51:53 -05:00
Chris Meyers
b693b06706 remove partial dependency job id logic 
* Late in the release we added job dependency tracking to the DB. We
decided not to use this information in the scheduler. However, I
half-ass added code to the scheduler to use it. Note that we still
determine inv and job update dependency by using a hack of the related
creation time, job.created-2 and job.created-1 respectively.

This removes any use of job dependent id expect for purposes of chain
failing.
 2017-02-13 12:48:00 -05:00
Ryan Petrello
1ebb641c1e work around a DRF issue that causes CharField to cast None to "None" 
see: #5322
 2017-02-13 12:43:13 -05:00
Wayne Witzel III
ee25be1e67 Allow execute role to see their schedules 2017-02-13 12:34:47 -05:00
AlanCoding
b0e992d6ab disable computed field signals in cleanup_jobs 2017-02-13 12:34:21 -05:00
Matthew Jones
8c4d4a0543 Protect Tower from Ansible core making changes to the event uuids 2017-02-13 11:55:08 -05:00
Ken Hoes
2cbf61bc32 Updated inventory search bar width and buttons 2017-02-13 10:58:51 -05:00
kensible
0548a2ba75 Merge pull request #5250 from kensible/4876-disabled-tooltip 
Added disabled tooltips in CTinT
 2017-02-13 10:43:09 -05:00
jlmitch5
e66537db71 Merge pull request #5288 from jlmitch5/fixExtraVarsJobResultsWidth 
fix extra vars on job results page width
 2017-02-13 10:21:52 -05:00
Michael Abashian
445ef69cde Merge pull request #5315 from mabashian/5264-jt-edit-scan-job 
Fix bug with scan job template not loading Default project correctly
 2017-02-13 09:41:37 -05:00
Michael Abashian
02b0b97390 Merge pull request #5310 from mabashian/5278-activity-stream 
Update name/description whenever the activities array changes
 2017-02-13 09:40:10 -05:00
Jake McDermott
69ab439d82 Merge pull request #5318 from jakemcdermott/5155_invalidate_token_on_logout 
invalidate token on logout
 2017-02-13 09:24:30 -05:00
Ken Hoes
263aa866a3 Removed help tooltip for disabled in file fields 2017-02-13 08:15:13 -05:00
Jake McDermott
f02b5415af add auth token to logout request header 2017-02-12 21:07:13 -05:00
Jared Tabor
d661651068 Merge pull request #5314 from jaredevantabor/copy-move-group 
Copy/Move Hosts
 2017-02-12 18:03:55 -08:00
Michael Abashian
392242b1a5 Merge pull request #5309 from mabashian/5042-schedule-type-sort 
Restore the ability to specify a search field for column sorting
 2017-02-10 20:25:20 -05:00
Michael Abashian
b2fa3d80ae Merge pull request #5306 from mabashian/4796-workflow-resize 
Workflow editor/details graph responsiveness
 2017-02-10 20:24:54 -05:00