hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-15 14:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,760 Commits 8 Branches 89 Tags
8ed49e200bebf7cb7ccd9f9415eab6fa2a7211cc
Commit Graph

4760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Min RK
75acd6a67b Merge pull request #3264 from tlvu/add-user-agreement-to-login-screen 
Add optional user agreement to login screen
 2020-12-02 11:31:23 +01:00
Min RK
73ac6207af Merge pull request #3244 from mhwasil/fix-https-redirect-issues 
[Docs] Fix https reverse proxy redirect issues
 2020-12-02 11:30:09 +01:00
Min RK
e435fe66a5 Merge pull request #3292 from minrk/oldest-metrics 
bump oldest-required prometheus-client
 2020-12-02 11:27:27 +01:00
Min RK
d7569d6f8e bump oldest-required prometheus-client 
oldest-dependency tests caught an error with our base required version
 2020-12-02 11:20:30 +01:00
Min RK
ba6c2cf854 Merge pull request #3266 from 0mar/reduce_ssl_testing 
Test internal_ssl separately
 2020-12-02 10:59:39 +01:00
0mar
970b25d017 Added docstrings 2020-12-01 10:49:10 +01:00
0mar
671ef0d5ef Moved ssl options to proxy 2020-12-01 10:30:44 +01:00
Erik Sundell
77220d6662 Merge pull request #3289 from minrk/user-count 
fix and test TOTAL_USERS count
 2020-11-30 15:21:48 +01:00
Min RK
7e469f911d fix and test TOTAL_USERS count 
Don't assume UserDict contains all users

which assumption led to double-counting when a user in the db was loaded into the dict cache
 2020-11-30 13:27:52 +01:00
Erik Sundell
18393ec6b4 Merge pull request #3287 from minrk/bump-black 
bump black pre-commit hook to 20.8
 2020-11-30 10:26:55 +01:00
Min RK
28fdbeb0c0 update back pre-commit hook 
specify minimum target_version as py36

results in some churn
 2020-11-30 10:13:10 +01:00
Tim Head
5664e4d318 Merge pull request #3286 from Sangarshanan/patch-1 
Fix curl in jupyter announcements
 2020-11-30 07:47:27 +01:00
sangarshanan
24c83e721f Fix curl in jupyter announcements 
Running the Curl as is return a 500 with ```json.decoder.JSONDecodeError: Expecting property name enclosed in double quotes: line 1 column 2 (char 1)
```  Converting the payload to a proper Json
 2020-11-28 17:50:44 +05:30
0mar
cc73ab711e Disabled ssl testing 2020-11-27 17:50:47 +01:00
0mar
2cfe4474ac Submitting reason for skiptest 2020-11-27 17:26:44 +01:00
0mar
74766e4786 Resolving merge conflichts 2020-11-27 17:18:40 +01:00
0mar
ed461ff4a7 Merge branch 'tmp' into reduce_ssl_testing 
# Conflicts:
#	jupyterhub/tests/test_proxy.py
 2020-11-27 17:05:26 +01:00
0mar
184d87ff2a Skip SSL-free tests if not on SSL matrix 2020-11-27 17:00:09 +01:00
Min RK
06ed7dc0cf Merge pull request #3284 from minrk/12-cl 
Changelog for 1.2.2
 2020-11-27 14:41:08 +01:00
Min RK
a0b229431c Update docs/source/changelog.md 
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
 2020-11-27 14:40:59 +01:00
0mar
2a06c8a94c WIP: Attempt to access SSL parameters, failing due to self-signed certificate error 2020-11-27 13:26:32 +01:00
Min RK
91159d08d3 Changelog for 1.2.2 2020-11-27 10:09:54 +01:00
Erik Sundell
06a83f146b Merge pull request #3281 from olifre/patch-1 
CONTRIBUTING: Fix contributor guide URL
 2020-11-27 09:53:41 +01:00
Oliver Freyermuth
7b66d1656b CONTRIBUTING: Fix contributor guide URL 
The link has been changed.
 2020-11-27 09:39:29 +01:00
0mar
40176a667f Attempt to patch proxy, unsuccessful 2020-11-26 12:22:43 +01:00
Omar Richardson
e02345a4e8 WIP: Moved ssl options to new method 2020-11-26 09:24:44 +01:00
Long Vu
1408e9f5f4 Merge remote-tracking branch 'origin/master' into add-user-agreement-to-login-screen 2020-11-25 10:31:38 -05:00
Long Vu
b66d204d69 login page: no javascript needed for the optional accept terms and conditions feature 
Bonus user gets a pop-up notification to check the checkbox.

Tested on Mozilla Firefox
(https://user-images.githubusercontent.com/11966697/100246404-18115e00-2f07-11eb-9061-d35434ace3aa.gif)
and Google Chrome.

Feedback from @minrk.
 2020-11-25 10:30:22 -05:00
Omar Richardson
164447717f Fix formulation 2020-11-20 15:30:23 +01:00
Omar Richardson
0472ef0533 Central internal_ssl switch 2020-11-20 15:27:50 +01:00
Erik Sundell
202efae6d8 Merge pull request #3177 from minrk/user-state-filter 
add ?state= filter for GET /users
 2020-11-20 11:06:15 +01:00
Min RK
2e043241fb Merge pull request #3261 from minrk/next-append-query 
Only preserve params when ?next= is unspecified
 2020-11-20 09:47:20 +01:00
Min RK
fa61f06fed Merge pull request #3237 from alexweav/cleanup-leftover-proxy 
[proxy.py] Improve robustness when detecting and closing existing proxy processes
 2020-11-20 09:45:53 +01:00
Min RK
8b19413fa1 Merge pull request #3242 from consideRatio/pr/py36-async-await 
Assume py36 and remove @gen.coroutine etc.
 2020-11-20 09:31:43 +01:00
Min RK
7c2e7692b0 Merge pull request #3265 from ideonate/master 
Fix RootHandler when default_url is a callable
 2020-11-20 09:14:46 +01:00
Tim Head
ce11959b1a Merge pull request #3267 from slemonide/patch-1 
Update services.md
 2020-11-19 14:07:56 +01:00
fyrzbavqr
097974d57d Update services.md 
Fix small typo
 2020-11-19 04:14:54 -08:00
Omar Richardson
09ff03ca4f Superfluous import statement 2020-11-19 13:10:48 +01:00
Omar Richardson
313f050c42 Reduced ssl on for active tests only 2020-11-19 12:58:38 +01:00
Omar Richardson
4862831f71 Trying with different configuration 2020-11-19 12:08:10 +01:00
Omar Richardson
c46beb976a Moving ssl tests to testing matrix 2020-11-19 11:59:03 +01:00
Long Vu
11a85d1dc5 login page: allow full override of the optional accept terms and conditions feature 
The text was already overridable but the endblock was at the wrong
location.

Now the javascript can also be overridden.
 2020-11-18 14:25:49 -05:00
Dan Lester
67c4a86376 Fix RootHandler when default_url is a callable 2020-11-18 12:55:44 +00:00
Long Vu
e00ef1aef1 Merge remote-tracking branch 'origin/master' into add-user-agreement-to-login-screen 2020-11-17 17:27:30 -05:00
Long Vu
fb5f98f2fa login page: add optional feature to accept terms and conditions in order to login 
The feature is disabled by default.

If enabled (by setting `login_term_url`), user will have to check the
checkbox to accept the terms and conditions in order to login.
 2020-11-17 17:24:38 -05:00
Alex Weaver
82a1ba8402 Import psutil and perform cmdline check on Windows onlyy 2020-11-17 13:02:35 -06:00
Alex Weaver
7f53ad52fb Assume that fapermission errors when getting process metadata indicate a non-running proxy 2020-11-17 12:55:34 -06:00
agp8x
73cdd687e9 fix formatting 2020-11-17 15:36:30 +01:00
agp8x
af09bc547a change metric prefix to jupyterhub 2020-11-17 15:29:37 +01:00
Min RK
3ddc796068 verify that tornado gen.coroutine and run_on_executor are awaitable 
- our APIs require that methods return 'awaitables'
- make sure that the older ways to create tornado 'yieldables' still produce 'awaitables'
 2020-11-17 12:38:42 +01:00