mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-01-20 14:08:09 +00:00
Code Issues Projects Releases Wiki Activity
7959 commits 21 branches 36 tags 105 MiB
Commit graph

5911 commits

Author SHA1 Message Date
Mouse Reeve
ca5676c287 Uses a list of fields rather than exclusions for edit book form 2022-12-11 10:58:19 -08:00
Christof Dorner
9ea7029c2f Add apple-touch-icon to global layout 2022-12-10 17:57:05 +01:00
Jascha Urbach
8325fbd772
goodreads_key for books editable 
The field goodreads_key is now editable.
ID shows in ID section of book.
 2022-12-10 10:50:25 +01:00
Mouse Reeve
f779c57f33 Safely get or create permissions for tests/re-running 2022-12-06 14:25:50 -08:00
Mouse Reeve
a80e020344 Add direction to book page fields 2022-12-06 12:26:52 -08:00
Mouse Reeve
8d5192c816 Don't show HR under last author item in confirm view 2022-12-06 12:26:35 -08:00
Mouse Reeve
bffde6703c
Merge branch 'main' into html-in-activitypub 2022-12-05 17:46:31 -08:00
Mouse Reeve
aecb2d38d6 Visually separate authors when creating book 2022-12-05 17:44:08 -08:00
Mouse Reeve
fdaa24edfe Tweaks group query in migration for tests 2022-12-05 17:33:40 -08:00
Mouse Reeve
845bd2cc0d Only show themes to sys admin 2022-12-05 17:11:15 -08:00
Mouse Reeve
a2874bf460 Updates forms 2022-12-05 17:09:10 -08:00
Mouse Reeve
b8e403ce59 Fixes migration to give the correct perms 2022-12-05 17:04:58 -08:00
Mouse Reeve
c7234bff64 Update admin role for new perms 2022-12-05 16:58:23 -08:00
Mouse Reeve
933cb6440f Creates admin views for owner and admin registration settings 2022-12-05 16:58:11 -08:00
Mouse Reeve
dd9fbca7d7 Removes registration from site settings form 2022-12-05 16:19:15 -08:00
Mouse Reeve
9b087199ed Adds new role and permissions 2022-12-05 16:07:09 -08:00
Mouse Reeve
8951628e02 Don't try to markdownify a null field 2022-12-05 15:12:53 -08:00
Mouse Reeve
97358da503
Merge pull request #2452 from indutny/fix/gh-2451 
Fix serialization of JSON-LD subarrays
 2022-12-05 09:53:27 -08:00
Fedor Indutny
cdc833657f Fix serialization of JSON-LD subarrays 
Properties like "tag" could be lists containing multiple subclasses of
ActivityObject. Make sure to serialize them recursively instead of
outputting them as they are, because otherwise we could get a bunch of
nulls in the resulting JSON and that wouldn't necessarily be a valid
JSON-LD object.

Fix: #2451
 2022-12-04 18:12:39 -08:00
Mouse Reeve
e7a0c3e421 Fixes bug that caused imports to be disabled unexpectedly 2022-12-04 18:07:17 -08:00
Mouse Reeve
26a05d2182 Adds tests for impressum page 2022-12-04 13:13:05 -08:00
Mouse Reeve
4a89a9ec88 Adds missing template 2022-12-04 13:05:03 -08:00
Mouse Reeve
5172f67c35
Merge pull request #2450 from bookwyrm-social/impressum 
Adds database fields for legal page/impressum
 2022-12-04 12:12:26 -08:00
Mouse Reeve
b7b7b2680e Fixes unit test 2022-12-04 11:44:42 -08:00
Mouse Reeve
c4d252754e
Merge pull request #2466 from rickosborne/storygraph-csv-isbn 
StoryGraph import ISBN tweak
 2022-12-04 11:31:12 -08:00
Mouse Reeve
300573e66e
Merge pull request #2457 from viviicat/use-html-templates 
make use of templates instead of hidden divs which is more elegant
 2022-12-04 11:24:04 -08:00
Mouse Reeve
5be7dad6f7
Merge pull request #2469 from bookwyrm-social/typo-fix 
Typo fix
 2022-12-04 11:16:57 -08:00
Mouse Reeve
712455368c Typo fix 2022-12-03 18:21:47 -08:00
Rick Osborne
862260294a
StoryGraph import ISBN tweak 
Looks like SG updated their CSV headers just a little, so that the importer
hadn't been picking up the ISBN.
 2022-12-02 19:16:22 -08:00
Mouse Reeve
61d8748d59
Merge pull request #2459 from viviicat/dark-theme-contrast 
Dark theme contrast
 2022-11-26 20:43:53 -08:00
Mouse Reeve
7eb267fbd1
Merge pull request #2460 from viviicat/visual-tweaks 
Visual tweaks
 2022-11-26 20:38:58 -08:00
Vivianne Langdon
56519d569d fix broken css 2022-11-26 15:29:08 -08:00
Vivianne Langdon
1fa7262b52 padding for edit shelf form 2022-11-26 15:29:08 -08:00
Vivianne Langdon
3728ee67d1 edit-list/save button spacing 2022-11-26 15:29:08 -08:00
Vivianne Langdon
bfe2003e5c author book list read more spacing 2022-11-26 15:29:08 -08:00
Vivianne Langdon
ab43134cc0 many minor visual tweaks to fix spacing and usability 2022-11-26 15:29:08 -08:00
Vivianne Langdon
9738c96175 fix css which caused weird spacing for desc. field 2022-11-26 15:29:08 -08:00
Vivianne Langdon
6cf028994e dark theme: increase background color darkness, fix shepherd color 2022-11-26 13:18:11 -08:00
Vivianne Langdon
86d1c8552e use transparent buttons for reply and more 2022-11-26 13:17:48 -08:00
Vivianne Langdon
c2b447cf49 lint 2022-11-26 12:19:37 -08:00
Vivianne Langdon
c4398ff187 make use of templates instead of hidden divs which is more elegant 2022-11-26 12:14:48 -08:00
Vivianne Langdon
e0896e3828 fix input type 2022-11-26 11:54:55 -08:00
Vivianne Langdon
cac9dc2603 registration answer was not long enough client side, fixes #2377 for real 2022-11-26 11:33:16 -08:00
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
70d639440e Show impressum 2022-11-25 12:06:32 -08:00
Mouse Reeve
16f9232e1e Adds database fields for legal page/impressum 2022-11-25 11:02:42 -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
2d56ccfd50 Handles state in notifications where a list item was deleted 2022-11-25 08:55:33 -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
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
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
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
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
2d3ec93086 Updates unit tests 2022-11-17 14:06:43 -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
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
6dd671ae5a Fixes user follow cache 2022-11-17 11:23:48 -08:00
Mouse Reeve
fe7163be33 Render markdown to html when using activitypub 
This will produce better federated results outside of bookwyrm, and will
still display correctly within bookwyrm
 2022-11-17 11:05: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
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
f95729a0c3 Adds unit test for failing view 2022-11-15 21:45:06 -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
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
Mouse Reeve
eb61033626 Simplify identifier searches 
This commit removes code that deduplicated search results for identifier
searches. If it was the case that multiple books have the same
identifier, in theory this would produce better search results, but in
practice this doesn't happen very much, is probably worth seeing when
it does, and worsens the performance of identifier search overall.
 2022-11-15 19:42:40 -08:00
Mouse Reeve
807f8c02b2
Merge pull request #2382 from bookwyrm-social/invite-length 
Longer invite answer field
 2022-11-15 15:03:51 -08:00
Jascha Urbach
4c05e3b660
Merge branch 'main' into deactivate-2fa-with-manage.py 2022-11-15 23:52:52 +01:00
Mouse Reeve
c47a425cbe Longer invite answer field 
It was an oversight that it was only set to 50 characters I expect!
 2022-11-15 14:52:07 -08:00
Jascha Urbach
8a99482a2f
correct linter errors 
./bw-dev black

reformatted bookwyrm/management/commands/remove_2fa.py

All done! ✨ 🍰 ✨
1 file reformatted, 544 files left unchanged.
 2022-11-15 23:32:24 +01:00
Jascha Urbach
cd57537854
Remove TFA from user 
added bookwyrm/management/remove_2fa.py

changed bw-dev
 2022-11-15 23:20:21 +01:00
Mouse Reeve
317cf5fcf5 Generate fewer add_status_tasks 
Previously, every time a status was saved, a task would start to add it
to people's timelines. This meant there were a ton of duplicate tasks
that were potentially heavy to run. Now, the Status model has a "ready"
field which indicates that it's worth updating the timelines. It
defaults to True, which prevents statuses from accidentally not being
added due to ready state.

The ready state is explicitly set to false in the view, which is the
source of most of the noise for that task.
 2022-11-15 14:14:32 -08:00
Mouse Reeve
bf3043f91f Fixes column widths 2022-11-14 18:48:30 -08:00
Mouse Reeve
85337c73e5
Merge branch 'main' into footer-links 2022-11-14 18:46:42 -08:00
Mouse Reeve
4178eb81e4
Merge pull request #2366 from bookwyrm-social/footer-snippet 
Uses the same snippet for the footer across different templates
 2022-11-14 18:46:15 -08:00
Mouse Reeve
fe82599de9 Include privacy policy and code of conduct in footer 2022-11-14 18:37:27 -08:00
Mouse Reeve
dbe74f6388 Uses the same snippet for the footer across different templates 2022-11-14 18:18:27 -08:00
Mouse Reeve
914479f1c9
Merge pull request #2365 from bookwyrm-social/url-typo 
Small fixes - typo in a url and emails about reports
 2022-11-14 18:13:09 -08:00
Mouse Reeve
5b358094ab Fixes report emails always claiming to be about links 2022-11-14 18:03:36 -08:00
Mouse Reeve
e655f5c2f3 Fixes typo in url regex 2022-11-14 16:06:40 -08:00
Mouse Reeve
36f511ebb7
Merge pull request #2140 from cincodenada/ignore-does-not-exist 
Ignore VariableDoesNotExist errors in debug logging
 2022-11-14 12:26:06 -08:00
Mouse Reeve
a91d9f67be
Merge pull request #2362 from bookwyrm-social/revoke-image-tasks 
Adds management command to revoke preview image tasks
 2022-11-14 12:20:05 -08:00
Mouse Reeve
b812a5c73e Adds management command to revoke preview image tasks 2022-11-14 12:09:16 -08:00
Ell Bradshaw
c9adb7ff12 Linting fixes 2022-11-14 01:04:20 -08:00
Ell Bradshaw
b3603bc3f5 Merge branch 'main' into ignore-does-not-exist 2022-11-14 00:31:34 -08:00
André Jaenisch
530d7de309
Use variable instead of string 
Signed-off-by: André Jaenisch <andre.jaenisch@posteo.de>
 2022-11-13 16:59:05 +01:00
Mouse Reeve
ddcaf8e3b8 Use asyncio for broadcasting 2022-11-10 15:41:56 -08:00
Mouse Reeve
49d0590599 Another tweak to how import wait times are calculated 2022-11-10 13:59:27 -08:00
Mouse Reeve
eae1866992
Allow users to temporarily deactivate their accounts (#2324) 2022-11-10 13:40:54 -08:00
Mouse Reeve
bbdba9e793 Python formatting 2022-11-10 13:13:53 -08:00
Mouse Reeve
8f2de48b0a Comments out unrelated test block 2022-11-10 13:05:42 -08:00
Mouse Reeve
48d4149151 Fixes null state 2022-11-10 12:39:07 -08:00
Mouse Reeve
f80e2465ed Adds tests for recent import average time 2022-11-10 12:29:36 -08:00
Mouse Reeve
f0d3ceefa0 Cache import time 
Also uses a type hint
 2022-11-10 12:27:38 -08:00
Mouse Reeve
784dab3d41 Fixes to how import times are estimated 
The wrong attr was being used to grab the number of seconds, and imports
that were stopped were being counted
 2022-11-10 11:42:38 -08:00
Mouse Reeve
9e0867af91 Make the import admin table sortable 2022-11-07 11:32:45 -08:00
Mouse Reeve
16c92a62c4
Merge pull request #2337 from bookwyrm-social/invite-table-scroll 
Makes the invite request table side scroll for mobile
 2022-11-07 10:55:39 -08:00
Mouse Reeve
4b01103f84 Makes the invite request table side scroll for mobile 
Fixes #2335
 2022-11-07 10:44:49 -08:00
Mouse Reeve
1f022496dd Fixes duplicate notification on import 2022-11-07 10:36:31 -08:00
Mouse Reeve
b64f0511a5 Another mock 2022-11-07 10:07:37 -08:00
Mouse Reeve
141d3aa813 Updates mocks in tests 2022-11-07 09:50:05 -08:00
Mouse Reeve
493fd68af4 Merge branch 'main' into cancel-imports 2022-11-07 09:06:13 -08:00
Mouse Reeve
6e748c5476 Typo fix 2022-11-05 18:16:59 -07:00
Mouse Reeve
817047bdeb Use stop functionality in import admin view 2022-11-05 15:44:00 -07:00
Mouse Reeve
76fb4c9280 Revoke tasks 2022-11-05 15:41:06 -07:00
Mouse Reeve
6792b3d7b8 adds button to stop job 2022-11-05 14:44:09 -07:00
Mouse Reeve
7a36de5ebe Start and stop jobs from the model 2022-11-05 14:35:27 -07:00
Mouse Reeve
97513a43d6 Set import job status when job starts and finishes 2022-11-05 13:47:06 -07:00
Mouse Reeve
59fe9e4d3b Show import status in table 2022-11-05 13:44:07 -07:00
Mouse Reeve
9cfcad20e0 Avoid divide by zero error 2022-11-05 13:33:57 -07:00