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

11660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Meyers
d0d44e03e1 Merge pull request #5388 from chrismeyersfsu/fix-5275 
ensure job deps are created only once
 2017-02-15 17:11:27 -05:00
Michael Abashian
3ff4bb0d14 Merge pull request #5381 from mabashian/3852-search-related 
Pull related search fields from related_search_fields
 2017-02-15 16:47:04 -05:00
Michael Abashian
15ad450c9b Merge pull request #5382 from mabashian/5378-project-type-permissions 
Run through optionsRequestDataProcessing whenever the list data changes
 2017-02-15 16:33:38 -05:00
Michael Abashian
34f8468844 Merge pull request #5379 from mabashian/3850-dashboard-graph 
Roll d3.js back to 3.3.13
 2017-02-15 16:31:32 -05:00
Chris Meyers
6e9488a59b ensure job deps are created only once 2017-02-15 15:54:30 -05:00
Jared Tabor
4097ce6d74 Merge pull request #5374 from jaredevantabor/jobs-page-relaunch 
Relaunching on jobs page...
 2017-02-15 15:33:21 -05:00
Alan Rominger
0e4f3c8015 Merge pull request #5376 from AlanCoding/logger_full_reload 
Add supervisor command to restart select services on reload event
 2017-02-15 15:19:27 -05:00
AlanCoding
3023b4dfaa switch to new nested with pattern from PR review 2017-02-15 14:58:04 -05:00
Matthew Jones
785a8d0789 Fix an issue where smtplib can't handle unicode strings 
We probably do get this value as unicode originally but when we store
it, due to a recently fixed bug it will come out as *not* unicode.

So things were accidentally working because py2 smtplib uses hmac
which won't accept unicode.

This change adds a flag to encrypt_field that forces it to skip the
utf8 fixup from before for narrow use cases.
 2017-02-15 14:07:30 -05:00
AlanCoding
7e3a5fd2c2 move reload functionality to its own file 2017-02-15 13:42:49 -05:00
AlanCoding
186b672e4f move service definition into settings 2017-02-15 12:07:30 -05:00
jlmitch5
6545869684 Merge pull request #5369 from jlmitch5/fixManagementScheduleNumberInputs 
fix management schedule number inputs
 2017-02-15 11:34:27 -05:00
Michael Abashian
b3662ecdd6 Run through optionsRequestDataProcessing whenever the list data changes 2017-02-15 11:23:52 -05:00
Michael Abashian
c459e326b2 UI work to incorporate related_search_fields as valid fields when searching 2017-02-15 10:42:25 -05:00
Michael Abashian
4d9bcbfaea nvd3 1.7.1 needs version 3.3.13 of d3.js in order for the tooltip guideline to work 2017-02-15 10:35:58 -05:00
Bill Nottingham
8649ae8c4a Merge pull request #5373 from wenottingham/de-redis 
Conditionalize celeryd config on rabbitmq password.
 2017-02-15 10:14:45 -05:00
Bill Nottingham
9bf3258989 Merge pull request #5365 from wenottingham/become-your-best-uid 
Actually test effective uid rather than using ansible_user_id.
 2017-02-15 10:14:24 -05:00
Ryan Petrello
941189e8bc Merge pull request #5362 from ryanpetrello/fix-5324 
properly detect the backend name in failed social_auth callbacks
 2017-02-15 10:05:59 -05:00
Ryan Petrello
81b70718d2 Merge pull request #5372 from ryanpetrello/fix-5000 
only allow single selection for LOG_AGGREGATOR_TYPE
 2017-02-15 10:05:14 -05:00
kensible
f927eed7e7 Merge pull request #5359 from kensible/5338-modal-search-action-buttons 
Updated modal action buttons to be above search
 2017-02-15 09:52:12 -05:00
Michael Abashian
9c3ca9e67d Merge pull request #5363 from mabashian/5357-wfjt-activity-stream 
Fixed jt/wfjt links in activity stream
 2017-02-15 09:46:37 -05:00
Alan Rominger
b4b83e0248 Merge pull request #5342 from AlanCoding/unified_jobs_rel_m2m 
fixes for unified_jobs related m2m search listing
 2017-02-15 09:30:17 -05:00
AlanCoding
d8f133d175 Add supervisor command to restart select services on reload event 2017-02-15 09:13:59 -05:00
kensible
e8027bda44 Merge pull request #5355 from kensible/5345-empty-list-margin 
Updated top margin for empty lists
 2017-02-15 08:16:42 -05:00
Alan Rominger
02962698d7 Merge pull request #5370 from AlanCoding/invite_beat_to_join 
add celery beat to supervisor group
 2017-02-14 22:24:04 -05:00
jaredevantabor
b89edcac16 relaunching on jobs page should always keep user on jobs page, for all job types 2017-02-14 20:58:07 -05:00
Jared Tabor
2b7f43efba Merge pull request #5364 from jaredevantabor/permissions-breadcrumb 
removing breadcrumb from permission modal states
 2017-02-14 20:42:04 -05:00
jaredevantabor
c44f4526df removing breadcrumb from permission modal states 2017-02-14 20:19:10 -05:00
Ryan Petrello
28f3f178f0 only allow single selection for LOG_AGGREGATOR_TYPE 
see: #5000
 2017-02-14 17:06:44 -05:00
Shane McDonald
31eda05231 Merge pull request #5368 from shanemcd/tweak-ui-language-lookup-logic 
Tweak logic used by UI to detect language
 2017-02-14 16:59:22 -05:00
Shane McDonald
065bd6041c Default to empty string for UI language detection 
When removing all “Languages” from Firefox, the UI breaks and you see an error in the console that says “langInfo is undefined”. This fixes that.
 2017-02-14 16:54:32 -05:00
Ryan Petrello
045994a472 properly detect the backend name in failed social_auth callbacks 
don't assume that the callback URL contains the correct social_auth
backend name; instead, store it temporarily in the session at
`/login/sso/`

see: #5324
 2017-02-14 16:19:39 -05:00
Ryan Petrello
16888f26cc Merge pull request #5366 from ryanpetrello/fix-racy-test-failure 
fix a test that fails due to a race between async logging requests
 2017-02-14 16:05:45 -05:00
John Mitchell
3bc4d515d7 fix disabling stuff 2017-02-14 15:46:24 -05:00
Shane McDonald
be686e0acc Tweak logic used by UI to detect language 
Chromium and WebKit based browsers have the window.navigator.languages attribute, which is an ordered array of preferred languages as configured in the browser’s settings.

Although changing the language in Chrome results in an Accept-Language header being added to requests, window.navigator.language still returns the language specified by the OS.

I’ve tested this with Firefox, Chrome, IE 11, and Edge.

Connect #5360
 2017-02-14 15:37:52 -05:00
Ryan Petrello
ee8c82df4a fix a test that fails due to a race between async logging requests 2017-02-14 15:18:03 -05:00
Michael Abashian
758aafec11 Fixed jt/wfjt links in activity stream 2017-02-14 15:12:05 -05:00
Jared Tabor
8df1088c99 Merge pull request #5346 from jaredevantabor/rbac-users 
Project types on permissions modal
 2017-02-14 15:11:58 -05:00
John Mitchell
e17a4c4712 fix management schedule number inputs 2017-02-14 15:11:00 -05:00
Michael Abashian
0a679b32bd Merge pull request #5349 from mabashian/5264-scan-job-template 
Set project/playbook to defaults when null
 2017-02-14 14:58:25 -05:00
Michael Abashian
30595470f7 Set project/playbook to defaults when null 2017-02-14 14:44:29 -05:00
Michael Abashian
b75b44a998 Merge pull request #5343 from mabashian/5262-org-template-list 
Tweaked org job templates list query params
 2017-02-14 14:43:39 -05:00
jaredevantabor
576984922d auditing .every() and replacing with .forEach() 2017-02-14 14:36:19 -05:00
Ken Hoes
f2d840021f Updated modal action buttons to be above search 2017-02-14 14:23:08 -05:00
Matthew Jones
8553b8eda6 Ignore hipchat certificate verification 2017-02-14 14:21:51 -05:00
jlmitch5
aff3dbea73 Merge pull request #5353 from jlmitch5/fixFirefoxJobResultsPane 
Fix firefox job results pane
 2017-02-14 14:14:36 -05:00
Ken Hoes
8eaaf37825 Updated top margin for empty lists 2017-02-14 13:07:17 -05:00
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
John Mitchell
da981f413f hack to get firefox to make the pane height correct 2017-02-14 12:03:30 -05:00