mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-05-16 15:33:15 +00:00
Code Issues Projects Releases Wiki Activity
7739 commits 13 branches 35 tags 115 MiB
Commit graph

7739 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mouse Reeve e91b6d3d05
Merge branch 'main' into readthroughs 2022-11-25 07:20:50 -08:00
Mouse Reeve 9dd0e22a47
Merge pull request #2426 from bookwyrm-social/password-reset-email 
Don't use task for password reset emails
 2022-11-23 22:10:47 -08:00
Mouse Reeve dd83e32f32 Fixes unit test 2022-11-23 22:00:34 -08:00
Mouse Reeve 2e882a447f
Merge pull request #2437 from cincodenada/fix/list-suggestions 
Fix: Slice queryset in list suggestions before we resolve it
 2022-11-23 21:47:05 -08:00
Mouse Reeve 4484d0baed
Merge pull request #2390 from jaschaurbach/fix-docker-compose 
Quote ports in docker-compose
 2022-11-23 17:44:43 -08:00
Joel Bradshaw 55bab0b70d Slice queryset before we resolve it 
This was accidentally querying ALL books in the database to generate
suggestions if we didn't have enough, which broke some stuff
 2022-11-23 19:26:09 +00:00
Mouse Reeve cc3cd5c98c Don't use task for password reset emails 2022-11-20 19:39:08 -08:00
Mouse Reeve fdc53d6c60
Merge pull request #2394 from jaschaurbach/show-2fa-code 
show otp_secret when setting up 2fa
 2022-11-19 10:25:15 -08:00
Mouse Reeve 2adcbdea2f
Merge pull request #2419 from bookwyrm-social/robots 
Expand robots.txt
 2022-11-19 10:24:55 -08:00
Mouse Reeve 1e5a6ec744
Merge branch 'main' into show-2fa-code 2022-11-19 10:09:27 -08:00
Mouse Reeve 7d51a69c71 Expand robots.txt 2022-11-19 10:03:40 -08:00
Hugh Rundle 6baa58260a
2fa qrcode fixes (#2407) 
* 2fa qrcode fixes

- add light background to qr code when using dark theme
- show OTP secret code under qr code for manual entry on apps if required

fixes #2386
fixes #2389

* fix code formatting

* revert changes re visible code

This conflicts with an existing PR.

* i code pretty
 2022-11-19 09:51:18 -08:00
Mouse Reeve e11811d461
Fancier UI around OTP codes 2022-11-19 09:48:44 -08:00
Mouse Reeve bbd2dc75f8
Merge pull request #2414 from henryistaken/patch-1 
Fix Quick Typo
 2022-11-19 09:32:27 -08:00
Henry c7ac936a9a
Fix Quick Typo 2022-11-18 23:24:18 -08:00
Mouse Reeve c5fb710f29 Fixes code of conduct link 2022-11-18 08:23:53 -08:00
Mouse Reeve 9aab14ee96
Merge pull request #2406 from bookwyrm-social/disable-imports 
Allow admins to disable starting imports
 2022-11-17 19:51:17 -08:00
Mouse Reeve 9c5fe7610b Fixes reference to site model 2022-11-17 15:41:30 -08:00
Mouse Reeve d36521c460
Merge pull request #2405 from bookwyrm-social/admins-list 
Fixes collecting list of admins
 2022-11-17 15:22:10 -08:00
Mouse Reeve 28567e2d8e Disable imports in the UI and view 2022-11-17 15:19:42 -08:00
Mouse Reeve 46b663b139 Rename new user to avoid duplication 2022-11-17 15:10:11 -08:00
Mouse Reeve bfca5706ea
Merge pull request #2404 from bookwyrm-social/embed-css 
Uses correct css paths in embeds
 2022-11-17 15:00:16 -08:00
Mouse Reeve 34f05c135b Adds unit tests for list of admins method 2022-11-17 14:59:46 -08:00
Mouse Reeve b1c6781036 Fixes collecting list of admins 2022-11-17 14:38:05 -08:00
Mouse Reeve 7c7c0e1a93 Admin UI to enable and disable importing 2022-11-17 14:23:39 -08:00
Mouse Reeve 474da162ba Uses correct css paths in embeds 2022-11-17 13:34:54 -08:00
Mouse Reeve 7e10b0cd1f
Merge pull request #2400 from bookwyrm-social/local-rss 
Only offer RSS feeds for local users
 2022-11-17 12:53:19 -08:00
Mouse Reeve 4ce51be827
Merge pull request #2401 from bookwyrm-social/resolve-remote-errors 
Change log level to info for connector exceptions
 2022-11-17 12:49:32 -08:00
Mouse Reeve b37a4322de Change log level to info for connector exceptions 
These errors in resolve_remote_id aren't really errors, they're
routine problems that we can expect from dealing with the outside world,
like a connection timeout, a server being down, a server being blocked,
et cetera. It's cluttering up the logs and causing unnecessary worry.
 2022-11-17 12:35:19 -08:00
Mouse Reeve 77d96bf245 Only offer RSS feeds for local users 2022-11-17 12:03:59 -08:00
Mouse Reeve d40cc21460
Merge pull request #2399 from bookwyrm-social/cache-fix 
Fixes user follow cache
 2022-11-17 11:36:20 -08:00
Mouse Reeve 6dd671ae5a Fixes user follow cache 2022-11-17 11:23:48 -08:00
Mouse Reeve 24f73f81f6 Update version number 2022-11-16 18:43:51 -08:00
Mouse Reeve 2dad14bdcf
Merge pull request #2395 from bookwyrm-social/settings-view-perms 
Fixes permissions on settings invite request page
 2022-11-16 18:33:20 -08:00
Mouse Reeve a546ab578b Fixes decorator on view method 2022-11-16 18:23:26 -08:00
Mouse Reeve fcdb7f106e Ticks version number 2022-11-16 18:19:23 -08:00
Mouse Reeve 5a7afe45a2 Fixes permissions on settings invite request page 2022-11-16 18:03:52 -08:00
Jascha Urbach 170aa7460a
Update 2fa.html 
Or now, because obviously I can not write HTML^^
 2022-11-16 20:35:28 +01:00
Jascha Urbach a98dbb97a5
fix error 
fix my copy paste error -.-
 2022-11-16 20:32:40 +01:00
Jascha Urbach c29256708a
show otp_secret when setting up 2fa 
solves #2389
 2022-11-16 20:30:06 +01:00
Mouse Reeve 39c5b0dc91
Merge pull request #2392 from jaschaurbach/Remove-dead-link-to-fediblock 
Remove dead URL
 2022-11-16 10:13:53 -08:00
Jascha Urbach be97fd2d39
Remove dead URL 
https://fediblock.org delivers a 410 Gone as respone.
 2022-11-16 18:24:19 +01:00
Mouse Reeve 55a603562c
Merge pull request #2387 from bookwyrm-social/admin-template 
Adds unit test for failing view
 2022-11-16 06:43:02 -08:00
Jascha Urbach cb187c880e
Quote ports in docker-compose 
Per sepcification in compose-file v3 ports are in quotes.

https://docs.docker.com/compose/compose-file/compose-file-v3/
 2022-11-16 12:38:49 +01:00
Mouse Reeve f95729a0c3 Adds unit test for failing view 2022-11-15 21:45:06 -08:00
Mouse Reeve 1a8580cdbc
Merge pull request #2385 from bookwyrm-social/search-improvements 
Simplify title/author search logic
 2022-11-15 20:21:45 -08:00
Mouse Reeve 47f1865c59 Remove trailing whitespace from queries 2022-11-15 20:09:00 -08:00
Mouse Reeve f0f65b8b73 Python formatting 2022-11-15 20:08:17 -08:00
Mouse Reeve fb60ffa512
Merge pull request #2384 from bookwyrm-social/search-improvements 
Simplify identifier searches
 2022-11-15 20:07:16 -08:00
Mouse Reeve 9185708224 Simplify how default edition is checked 
This logic is still totally bonkers, but this change puts a hard limit
on how many iterations the loop can go through and makes the query that
selects which edition to display a little simpler.
 2022-11-15 20:05:41 -08:00