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
f6d635997c
Changed logging call
2020-11-24 10:03:16 +01:00
Omar Richardson
d7d27ad97a
Fixed scopes and added more specific logs/errors
2020-11-23 13:26:36 +01: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
Min RK
31a99b5b2c
Merge pull request #3169 from IvanaH8/yaml-adding-scopes
...
First step for implementing oauth scopes - update to rest-api.yml
2020-11-20 08:59:48 +01:00
Omar Richardson
d5e7a42135
More scope unit tests
2020-11-19 17:06:31 +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
Omar Richardson
71d99e1180
Update with expand group test
2020-11-19 09:57:50 +01:00
IvanaH8
18ed1b58cc
added roles to token model and POST /users/{name}/tokens request body
2020-11-19 09:17:03 +01:00
IvanaH8
c0cadc384d
adding roles to tokens
2020-11-19 08:22:52 +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
0mar
54cb31b3a9
Removed circular import
2020-11-18 17:29:15 +01:00
Omar Richardson
99c3f77c58
WIP Implemented scopes
2020-11-18 17:12:26 +01: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
