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

7760 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mouse Reeve 8ec984c3ff Tick version number 2022-11-25 14:37:34 -08:00
Mouse Reeve df42712b8e
Merge pull request #2449 from bookwyrm-social/empty-csv 
Don't start imports with empty CSVs
 2022-11-25 12:31:13 -08:00
Mouse Reeve 8b068e94d5 Headers aren't one of the rows 2022-11-25 12:19:49 -08:00
Mouse Reeve ccb60f45c3
Merge pull request #2447 from bookwyrm-social/fix-inventaire-import 
Fixes error on importing from inventaire
 2022-11-25 10:54:10 -08:00
Mouse Reeve 304757091e Fixes checking csv length to consider headers 2022-11-25 10:53:42 -08:00
Mouse Reeve 41d5102c72
Merge pull request #2448 from bookwyrm-social/search-review-counts 
Show review counts in search results
 2022-11-25 10:49:10 -08:00
Mouse Reeve 0a12be8279 Appease pylint 2022-11-25 10:41:04 -08:00
Mouse Reeve e94e72a594 Python formatting 2022-11-25 10:40:06 -08:00
Mouse Reeve 61d1e67349
Merge pull request #2418 from jaschaurbach/Fix-wrong-URL-behind-proxy 
set HTTP_X_FORWARDED_PROTO in .env
 2022-11-25 10:40:00 -08:00
Mouse Reeve d3cad15ee1
Merge pull request #2445 from bookwyrm-social/list-null-notification 
Handles state in notifications where a list item was deleted
 2022-11-25 10:39:02 -08:00
Mouse Reeve c3acbb9bd0
Merge pull request #2446 from bookwyrm-social/settings-federation-table 
Make the federated servers table display correctly on mobile
 2022-11-25 10:38:53 -08:00
Mouse Reeve 015af2c1e7 Don't start imports with empty csvs 
Fixes #2353
 2022-11-25 10:35:16 -08:00
Mouse Reeve becc90d485 Show review counts in search results 
Fixes #2317
 2022-11-25 10:06:51 -08:00
Mouse Reeve 44d308abad Fixes error on importing from inventaire 2022-11-25 09:35:26 -08:00
Mouse Reeve e72cb43bb2 Make the federated servers table display correctly on mobile 2022-11-25 09:09:57 -08:00
Mouse Reeve d8860f2a4d
Merge pull request #2443 from bookwyrm-social/edit-links 
Fixes editing links
 2022-11-25 08:56:19 -08:00
Mouse Reeve 748acc9a79
Merge pull request #2444 from bookwyrm-social/update-locales 
Updates locales
 2022-11-25 08:56:07 -08:00
Mouse Reeve 2d56ccfd50 Handles state in notifications where a list item was deleted 2022-11-25 08:55:33 -08:00
Mouse Reeve be33fe6040 Updates locales 2022-11-25 08:32:10 -08:00
Mouse Reeve 81ab08aaa3 Fixes editing links 2022-11-25 08:28:45 -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
Jascha Urbach 484484fd4b
Apologies for my lack of coding skills 2022-11-20 17:57:03 +01:00
Jascha Urbach 3c1b38ed2c
one should import what one declares... 
... andn not what one thinks was declared^^
 2022-11-20 17:47:26 +01:00
Jascha Urbach 31ea868ddc
Update to actual READ the file... 2022-11-19 20:40:36 +01: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
Jascha Urbach 4e2324f06b
Add HTTP_X_FORWARDED_PROTO:false to Test 
that it does not fail any more :)
 2022-11-19 18:02:34 +01:00
Jascha Urbach 238a1b0e88
set HTTP_X_FORWARDED_PROTO in .env 
This fixes #2397.

The description in .env is whith a warning and a link to the official documentation about what this setting is doing if set to true.
 2022-11-19 17:54:44 +01: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