Commit Graph

7508 Commits

Author SHA1 Message Date
Jakub Klinkovský
dbd3813a1c async_generator is needed only for python<3.10
- the asynccontextmanager object is available in the standard contextlib
  module since Pyhton 3.7
- the aclosing object is available in the standard contextlib module
  since Pyhton 3.10
- JupyterHub currently requires Python 3.8 or newer
2024-04-24 23:11:10 +02:00
Simon Li
df04596172 Merge pull request #4798 from minrk/use_public_url
add full_url, full_progress_url to server models
2024-04-24 19:24:13 +02:00
Min RK
12f96df4eb fix condition for adding public_url to full_url
check directly if it is just a path, instead of trying to check other config that means it ought to be
2024-04-24 16:18:37 +02:00
Min RK
aecb95cd26 add full_url, full_progress_url to server models
if public_url is defined
2024-04-24 14:38:00 +02:00
Min RK
5fecb71265 Merge pull request #4797 from minrk/raise-not-redirect-loop
403 instead of redirect for token-only HubAuth
2024-04-24 11:08:00 +02:00
Min RK
e0157ff5eb don't try to login redirect with token-only HubAuth class
login via redirect is an artifact of the old services cookie,
removed in 2.0
2024-04-24 09:43:36 +02:00
Min RK
5ae250506b service-whoami: don't advertise link that won't work
whoami-api is api-only, it shouldn't be in the services dropdown
2024-04-23 10:09:05 +02:00
Min RK
8d298922e5 Merge pull request #4796 from manics/fix-redoc
Fix rest API djlint auto-formatting
2024-04-23 09:38:57 +02:00
Simon Li
18707e24b3 Forcibly disable djlint-reformat-jinja for redoc.html
Possible bug, djlint doesn't respect `djlint off` comments
2024-04-22 20:10:48 +01:00
Simon Li
3580904e8a redoc.html: revert djlint changes (breaks handlebar template) 2024-04-22 20:08:46 +01:00
Min RK
bcf5f49dd6 Bump to 5.0.0b1 5.0.0b1 2024-04-22 08:40:43 +02:00
Min RK
522f9d44d9 Merge pull request #4792 from minrk/changelog-5
changelog for 5.0, add migration doc
2024-04-22 08:40:27 +02:00
Min RK
b29e35650d update changelog with latest PRs 2024-04-19 17:11:38 +02:00
Min RK
168fa5c699 Merge pull request #4794 from minrk/pagination-count 2024-04-19 16:38:44 +02:00
Erik Sundell
cca80bc284 Merge pull request #4795 from minrk/docker-timeout
increase docker build timeout to 30 minutes
2024-04-19 15:03:08 +02:00
Min RK
a49c0fdb02 Merge pull request #4793 from minrk/jinja-autofmt
adopt djlint linter/autoformatter for jinja templates
2024-04-19 14:57:20 +02:00
Min RK
f73c0cea0b increase docker build timeout
apt step is taking a super long time sometimes
2024-04-19 14:56:01 +02:00
Min RK
46df414d6e fix group by in active state filter 2024-04-19 14:26:40 +02:00
Min RK
8f4942f669 Fix counts on list users queries
we had some joins to trigger eager loading,
but then `query.count()` returns the count of (user, group) and (user, spawner) pairs, not the count of users
but the `joinedload` options added later are the right way to do that,
so these joins are unnecessary
2024-04-19 12:01:16 +02:00
Min RK
75c947be59 address djlint lint
and autoformat js in templates
2024-04-19 10:46:50 +02:00
Min RK
2556cd0691 note that 5.0 is a prerelease 2024-04-19 10:32:29 +02:00
Min RK
43fff0a280 try to clarify allow_all/allow_existing_users 2024-04-19 10:32:17 +02:00
Min RK
d9ce1b917f add and run djlint formatter 2024-04-19 10:12:57 +02:00
Min RK
bf840c65d6 apply suggestions from review 2024-04-18 17:28:58 +02:00
Min RK
9e5af6f3ca Apply suggestions from code review
Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
2024-04-18 17:21:24 +02:00
Min RK
fb1614e20a Merge pull request #4784 from manics/token-api-doc
doc: list/get token response is different from post
2024-04-18 15:02:51 +02:00
Min RK
bb09070e16 add migration doc for 5.0 2024-04-18 15:01:08 +02:00
Min RK
e72f0976f9 changelog for 5.0 2024-04-18 14:59:42 +02:00
Min RK
99b37f1f0f Merge pull request #4774 from minrk/bs5
update bootstrap to v5
2024-04-18 12:10:55 +02:00
Min RK
039d457797 update selector in test_share 2024-04-18 09:15:15 +02:00
Min RK
cc7662ec87 remove unused requirejs shim for bootstrap 2024-04-18 09:12:16 +02:00
Min RK
aa89a63117 code review
Co-authored-by: Erik Sundell <erik.i.sundell@gmail.com>
2024-04-18 09:10:11 +02:00
Simon Li
9c1944d946 Duplicate Token/NewToken content instead of using yaml merge/anchors 2024-04-17 20:15:06 +01:00
Min RK
8153e53fb1 Merge pull request #4790 from minrk/token_id_user_model
add token_id to `/api/user`
2024-04-17 20:26:32 +02:00
Min RK
3f5d220af4 update accept-share for bs5
make it a card, matching oauth
2024-04-17 19:53:57 +02:00
Min RK
7d7db9774f consistent submit buttons 2024-04-17 15:44:17 +02:00
Min RK
01e7d00829 update oauth page test locators 2024-04-17 15:37:22 +02:00
Min RK
3d7a3393e1 darker nav 2024-04-17 15:32:10 +02:00
Min RK
ab40f29056 remove unnecessary width on property tables 2024-04-17 14:56:02 +02:00
Min RK
6c4eba2682 avoid wrapping text on add-item button 2024-04-17 14:46:28 +02:00
Min RK
88fe734585 version footer is not a nav 2024-04-17 14:40:43 +02:00
Min RK
89fa76fae8 start using some css variables where we can 2024-04-17 14:32:54 +02:00
Min RK
2919a2b6c2 remove use of deprecated text-muted 2024-04-17 14:28:02 +02:00
Min RK
af5b3e0c31 update spawn form for bs5 2024-04-17 10:38:46 +02:00
Min RK
c94dcc435c add token_id to self model 2024-04-17 09:27:31 +02:00
Min RK
6a17797719 fix locator on token table 2024-04-17 09:08:02 +02:00
Min RK
6d7bde996b set variant on server buttons
variant determines the color
2024-04-17 08:58:30 +02:00
Min RK
fdd421bfa9 use card for authorize layout 2024-04-16 17:56:37 +02:00
Min RK
5e3b1601d7 use justify-content-center to center columns
no longer need to use offsets
2024-04-16 15:01:32 +02:00
Min RK
e766d7a885 update test expectations for some bs5 classes 2024-04-16 14:43:06 +02:00