Commit Graph

11686 Commits

Author SHA1 Message Date
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
Bill Nottingham 8b33557633 More cargo-culty translation markup 2017-02-14 11:58:02 -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
Bill Nottingham ff531088c9 Mark some stuff for translation.
Markup courtesy cargo-cults-r-us. For all your 'code changes without understanding' needs.
2017-02-14 11:46:02 -05:00
Ryan Petrello cae8950723 don't cache social-auth-core backends
social-auth-core uses a global variable to cache backend settings:
https://github.com/python-social-auth/social-core/blob/78da4eb201dd22fd2d8a4e38a1d17a73beabad24/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
Michael Abashian e41bbf5ebe Fixed org templates pagination by setting page_size 2017-02-14 11:26:52 -05:00
jaredevantabor a36ce01537 adding options callback for project type labels 2017-02-14 10:56:09 -05:00
Michael Abashian 57a4d60d58 Tweaked org job templates list query params 2017-02-14 10:47:20 -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
AlanCoding c3eff539d0 fixes for unified_jobs related m2m search listing 2017-02-14 08:59:02 -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
Chris Meyers 2432a3d3c3 Revert "remove partial dependency job id logic"
This reverts commit 4bb3a4909e616209fc291b2b3cee46469bc58f9e.
2017-02-13 16:16:43 -05:00