rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity
4619 commits 16 branches 11 tags 32 MiB
Commit graph

3245 commits

Author SHA1 Message Date
Mouse Reeve
5fcea99029 Indicate reading status changes with comments 2021-08-16 13:39:56 -07:00
Mouse Reeve
48c6a3923a Save reading status update 2021-08-16 13:32:20 -07:00
Mouse Reeve
2d20fa4146 Adds reading status field to book statuses 2021-08-16 13:32:12 -07:00
Mouse Reeve
1e1bf83201 Create abstract parent class for book statuses 2021-08-16 13:14:29 -07:00
Mouse Reeve
6280671d92 Create comments when commentary is provided 2021-08-16 13:08:45 -07:00
Mouse Reeve
f12c5df288 Show "optional" helper on comment field 2021-08-16 12:58:22 -07:00
Mouse Reeve
0549dbaa6d Make comment optional 2021-08-16 12:48:52 -07:00
Mouse Reeve
011175a6e3 Appeases js linter 2021-08-16 12:44:36 -07:00
Mouse Reeve
e6b785d731 No-update mode for "want to read" 2021-08-16 12:28:04 -07:00
Mouse Reeve
257c9854c2 Move reading modal templates to their own dir 2021-08-16 11:30:11 -07:00
Mouse Reeve
7e1b606e1f Fixes link in status header for comments 2021-08-16 11:08:13 -07:00
Mouse Reeve
c1afd3f852
Merge pull request #1272 from bookwyrm-social/rss 
Updates rss feed view
 2021-08-16 11:59:24 -06:00
Mouse Reeve
5de3c75de3 Remove render from tests 2021-08-16 10:30:11 -07:00
Mouse Reeve
b8082ad233 Merge branch 'main' into rss 2021-08-16 10:25:33 -07:00
Mouse Reeve
7345b85ebd Granular RSS tests 2021-08-16 10:25:21 -07:00
Mouse Reeve
71404fae06 Adds local only filter to user admin view 2021-08-16 08:51:23 -07:00
Mouse Reeve
9af435bbeb Space getting removes in reply header 2021-08-12 19:18:37 -07:00
Mouse Reeve
26b7f2ec70 Fixes main nav menu 2021-08-12 14:43:42 -07:00
Mouse Reeve
6880657deb Fixes quote display 2021-08-12 06:42:21 -07:00
Mouse Reeve
45e82abda4
Merge branch 'main' into images-django-imagekit 2021-08-11 12:47:25 -06:00
Mouse Reeve
1be125fc1d Adds database constraint for readthrough dates 2021-08-11 11:19:06 -07:00
Mouse Reeve
19ddcedf14
Merge pull request #1283 from bookwyrm-social/fixes-poll 
Fixes polling variable name
 2021-08-11 11:42:37 -06:00
Mouse Reeve
26ff55ebee Fixes polling variable name 2021-08-11 09:19:25 -07:00
Mouse Reeve
c6e328706b Fixes required attr on content fields for composing quotes 2021-08-11 09:03:38 -07:00
Mouse Reeve
6a84309fac Fixes template links in reading progress fallback paths 2021-08-10 18:28:14 -07:00
Mouse Reeve
1b4db49035 Fixing bug preventing csv imports to match via title/author 2021-08-10 14:30:28 -07:00
Mouse Reeve
ef1896da18 Return confidence rating 2021-08-10 14:02:22 -07:00
Mouse Reeve
fa396d4bc8 Save best-guess search results on import 2021-08-10 13:54:52 -07:00
Mouse Reeve
ebabbf475a Translate error messages 2021-08-10 13:48:09 -07:00
Mouse Reeve
6301656a0e Fixes setting book results from title/author search 2021-08-10 13:46:20 -07:00
Mouse Reeve
eabe886347
Merge pull request #1271 from bookwyrm-social/template-refactor 
Always use underscores in html ids
 2021-08-09 09:04:47 -06:00
Mouse Reeve
fd56379518 Updates rss feed view 2021-08-09 07:38:43 -07:00
Mouse Reeve
820eeeb69a Lowercase "rate" 2021-08-09 07:29:08 -07:00
Mouse Reeve
21a954c7df Always use underscores in html ids 
Plus some other shifting around
 2021-08-08 19:44:12 -07:00
Mouse Reeve
187e2e0d08
Merge pull request #1270 from bookwyrm-social/request-exception 
Uses more general requests exception
 2021-08-08 19:42:32 -06:00
Mouse Reeve
02fac7a46b
Merge pull request #1269 from justinabrahms/close-span 
Close the span tag for an author.
 2021-08-08 19:26:02 -06:00
Mouse Reeve
65e982e35b Uses more general requests exception 2021-08-08 18:13:02 -07:00
Mouse Reeve
55d84d50ee Fixes loading editions from inventaire 2021-08-08 15:55:49 -07:00
Mouse Reeve
0462a3b0fc
Merge pull request #1266 from bookwyrm-social/discover-local 
Adds local discover view
 2021-08-08 16:09:15 -06:00
Mouse Reeve
c8e7e95c17 fixes logged out view test 2021-08-08 14:43:17 -07:00
Mouse Reeve
b7b780e45c Discover not directory wth??? 2021-08-08 14:17:02 -07:00
Mouse Reeve
e2f3c4602d test the correct view 2021-08-08 08:37:07 -07:00
Mouse Reeve
65fa2813c6 Show link to discover view 2021-08-08 08:07:20 -07:00
Mouse Reeve
2222c28305 Adds discover view tests 2021-08-08 08:03:04 -07:00
Mouse Reeve
3ce59d13d3 Mocks populate streams task 2021-08-08 07:32:23 -07:00
Mouse Reeve
c14bcf19cc Use activitystreams to populate discovery view 2021-08-07 18:56:05 -07:00
Mouse Reeve
590338138c Populate streams tasks 2021-08-07 17:44:40 -07:00
Mouse Reeve
48a8b014ba Populate local stream for discover view 2021-08-07 17:18:20 -07:00
Mouse Reeve
c28d077cb4 Simplifies query for landing page books 2021-08-07 17:12:38 -07:00
Mouse Reeve
b116df723f prevent large text from janking up view 2021-08-07 16:48:53 -07:00
Mouse Reeve
4d8bd3ad93 Cleans up landing page, since we're here 2021-08-07 16:37:51 -07:00
Mouse Reeve
33c8849552 Trim sooner 2021-08-07 16:18:15 -07:00
Mouse Reeve
650a6037a2 Trims status text 2021-08-07 15:51:53 -07:00
Justin Abrahms
1006096cd0 Close the span tag for an author. 2021-08-07 15:40:50 -07:00
Mouse Reeve
c685fb0296
Merge pull request #1265 from bookwyrm-social/generated-notes-activitystream 
Fixes generated notes not appearing in books stream
 2021-08-07 16:11:28 -06:00
Mouse Reeve
760bd5a63f Fixes reference to landing page books 2021-08-07 15:10:53 -07:00
Mouse Reeve
2eb37663b6 Adds mock to inbox test 2021-08-07 14:46:33 -07:00
Mouse Reeve
e3cbf30684 Local discovery view 2021-08-07 14:43:05 -07:00
Mouse Reeve
b5153f3df1 WIP 2021-08-07 12:33:45 -07:00
Mouse Reeve
040758c833 Renames "discover" 2021-08-07 11:25:09 -07:00
Mouse Reeve
cce7d9a648 Don't skip updates statuses when adding to streams 
Generated note books are added post-initial save
 2021-08-07 10:59:55 -07:00
Mouse Reeve
1dea2b307b
Merge pull request #1260 from bookwyrm-social/email-confirmation 
Email confirmation
 2021-08-07 09:32:25 -06:00
Mouse Reeve
026c6ac025 Mocks emailer in registration test 2021-08-07 08:01:14 -07:00
Mouse Reeve
38f614a526 Include generated notes in books stream 2021-08-07 07:56:30 -07:00
Mouse Reeve
68e4462486 Make email a required html field in register form 2021-08-07 07:43:30 -07:00
Mouse Reeve
226c325099 Adds plaintext code to emails 2021-08-07 07:37:18 -07:00
Mouse Reeve
0fa9fd7331 Registration with confirm email tests 2021-08-07 07:28:24 -07:00
Mouse Reeve
aad5de3b61 Improves cross-edition display for lists 2021-08-06 19:03:15 -07:00
Mouse Reeve
e198e663d1 Fixes names of site settings field in tests 2021-08-06 18:48:16 -07:00
Mouse Reeve
98a98f8e69 Updates test env 2021-08-06 18:13:51 -07:00
Mouse Reeve
5373663acf Merge branch 'main' into email-confirmation 2021-08-06 18:09:01 -07:00
Mouse Reeve
4d4a7bc20b
Merge pull request #1259 from bookwyrm-social/test-coverage 
Test coverage
 2021-08-06 19:07:48 -06:00
Mouse Reeve
cec6943069 Adds missing mock 2021-08-06 17:43:50 -07:00
Mouse Reeve
9077516fa1 Resend links 2021-08-06 17:39:22 -07:00
Mouse Reeve
1ad057d89d Confirmation templates 2021-08-06 17:23:44 -07:00
Mouse Reeve
5926224d7e Confirm email views 2021-08-06 16:26:46 -07:00
Mouse Reeve
247a7f7489 Email confirmation email 2021-08-06 15:38:37 -07:00
Mouse Reeve
3e2f1806e9 Adds email confirmation code field 2021-08-06 14:42:18 -07:00
Mouse Reeve
3082c4ce5c Tests invite create view 2021-08-06 11:55:20 -07:00
Mouse Reeve
568e30230a Adds start import view test 2021-08-06 11:43:55 -07:00
Mouse Reeve
0d2622e4ff Tests login view 2021-08-06 11:23:38 -07:00
Mouse Reeve
3abceb8563 Templatetag test 2021-08-06 10:33:14 -07:00
Mouse Reeve
9804d4cf51 Adds more book view tests 2021-08-06 10:19:38 -07:00
Joachim
6a365eafb4
Merge branch 'main' into images-django-imagekit 2021-08-06 19:16:01 +02:00
Mouse Reeve
134db20c57 Fixes directory view 2021-08-06 09:40:01 -07:00
Mouse Reeve
9030f0d08b Bookwyrm user was already set 2021-08-06 09:14:07 -07:00
Mouse Reeve
d126d7ba91 Disable comically inefficient book count comparisons 
Oops! Hopefully I can restore these in a way that doesn't break at even
a moderate scale
 2021-08-06 08:43:05 -07:00
Mouse Reeve
5f10e7535b
Merge pull request #1257 from bookwyrm-social/user-active-date 
Fixes over-reporting user last active date
 2021-08-05 22:26:14 -06:00
Mouse Reeve
6fa430efec
Merge pull request #1256 from bookwyrm-social/test-coverage 
Adds misc tests to improve coverage
 2021-08-05 20:52:35 -06:00
Mouse Reeve
2e7dd9d4ef Fixes over-reporting user last active date 2021-08-05 19:52:15 -07:00
Mouse Reeve
b3fa8de65a fixes book mock in user view tests 2021-08-05 19:28:23 -07:00
Mouse Reeve
6b7e3f2061 Adds books stream mock 2021-08-05 19:28:23 -07:00
Mouse Reeve
061deaefda Removes invalid argument 2021-08-05 19:28:23 -07:00
Mouse Reeve
120938bee9 Update books feed on shelve 2021-08-05 19:28:05 -07:00
Mouse Reeve
48175023bc Mocks broadcast 2021-08-05 18:58:32 -07:00
Mouse Reeve
41742d6698 Adds inventaire get connector test 2021-08-05 18:16:23 -07:00
Mouse Reeve
d0114d2e83 Adds test for book add description view 2021-08-05 18:07:36 -07:00
Mouse Reeve
d390b395e6 fixes book mock in user view tests 2021-08-05 17:47:49 -07:00
Mouse Reeve
70a535adb7 Adds books stream mock 2021-08-05 17:19:39 -07:00
Mouse Reeve
70f4ecf870 Removes invalid argument 2021-08-05 17:13:47 -07:00
Mouse Reeve
30288c6ebb Update books feed on shelve 2021-08-05 16:43:22 -07:00
Mouse Reeve
d7307463d5
Merge branch 'main' into activitystreams-celery 2021-08-05 16:11:15 -06:00
Mouse Reeve
f3a757951c Tests for books stream 2021-08-05 14:28:17 -07:00
Mouse Reeve
142d0da3b7 Removes outdated tests 2021-08-04 20:01:44 -07:00
Mouse Reeve
6841a66e76 Python formatting 2021-08-04 19:57:39 -07:00
Mouse Reeve
1fbca70820 Move activitystreams updates to tasks 2021-08-04 19:54:47 -07:00
Mouse Reeve
c8250ac94c Python formatting 2021-08-04 19:25:44 -07:00
Mouse Reeve
1c0472efc2 Fixes references to public streams 2021-08-04 19:19:24 -07:00
Mouse Reeve
75f586c109 Removes unused stream code 2021-08-04 19:09:00 -07:00
Mouse Reeve
9d19092205 Updates tests 2021-08-04 18:22:06 -07:00
Mouse Reeve
9d75bc3982 Display books timeline 2021-08-04 17:53:44 -07:00
Mouse Reeve
5a9dbc50da Adds books stream 2021-08-04 17:25:31 -07:00
Mouse Reeve
a8d6dbd8a6 Adds books stream audience 2021-08-04 16:56:08 -07:00
Mouse Reeve
699d9307e3
Merge pull request #1251 from bookwyrm-social/prospective-follow-display 
Prospective follow display
 2021-08-04 14:58:52 -06:00
Mouse Reeve
f5c129dce7 Also in suggestion area 2021-08-04 13:38:06 -07:00
Mouse Reeve
708a813905
Merge pull request #1249 from bookwyrm-social/goal-page 
Handle goal pages for unset years
 2021-08-04 14:16:45 -06:00
Mouse Reeve
54f6da2382 Use current year in goal tests 2021-08-04 12:59:06 -07:00
Mouse Reeve
12fb969821 Python formatting 2021-08-04 12:40:15 -07:00
Mouse Reeve
a679a46bca Limit authors displayed in status 2021-08-04 12:36:54 -07:00
Mouse Reeve
535ff5e6d8 Handle goal pages for unset years 2021-08-04 12:05:24 -07:00
Mouse Reeve
392eb83bb3 Fixes edit user view tests 2021-08-04 11:30:23 -07:00
Mouse Reeve
9bbdde1597 Python formatting 2021-08-04 10:58:23 -07:00
Mouse Reeve
bd7bf4ee96 Resolve conflict between inherited privacy and default privacy 2021-08-04 10:55:03 -07:00
Mouse Reeve
e486bcf2c8 Cleans up edit user post privacy select 2021-08-04 10:49:14 -07:00
Mouse Reeve
2b1d647c85 Adds merge migration 2021-08-04 10:46:56 -07:00
Mouse Reeve
63c8301eb9 Merge branch '253-user-post-privacy-v2' of https://github.com/ibrand/bookwyrm into ibrand-253-user-post-privacy-v2 2021-08-04 10:44:30 -07:00
Mouse Reeve
97b643ac72
Merge pull request #1243 from bookwyrm-social/fixes-set-remote-server 
Fixes remote server not getting set
 2021-08-04 11:35:49 -06:00
Mouse Reeve
6db6aa6cb1 Fixes removing user from recs on follow 2021-08-04 09:49:05 -07:00
Mouse Reeve
89acfa4f3e Patches stray redis calls 2021-08-04 08:50:50 -07:00
Joachim
cd1a1b2e67 Fix R1725: Consider using Python 3 style super() without arguments 2021-08-04 11:58:53 +02:00
Joachim
bf3175f8d5 lint 2021-08-04 11:51:41 +02:00
Joachim
73fd098068 Better naming of context variable 2021-08-04 11:42:18 +02:00
Joachim
14c606301c Fixes "I/O Operation on Closed File error" 
https://github.com/matthewwithanm/django-imagekit/issues/391#issuecomment-766708283
 2021-08-04 10:28:59 +02:00
Joachim
843127efa8 Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-08-04 10:00:20 +02:00
Mouse Reeve
cbf5747308 Mock mocks mocks 2021-08-03 21:59:48 -07:00
Mouse Reeve
630ee3b766 Mocks for user admin 2021-08-03 15:22:51 -07:00
Mouse Reeve
3970df312a Fixes inbox tests 2021-08-03 15:09:38 -07:00
Mouse Reeve
eeb8ae19db Python formatting 2021-08-03 14:05:52 -07:00
Mouse Reeve
f35855ce69 Moore moocks 2021-08-03 13:50:12 -07:00
Mouse Reeve
5d2324a4a0 Edit user test mocks 2021-08-03 13:03:24 -07:00
Mouse Reeve
c23f341980 Move annotated user function tests 2021-08-03 12:48:44 -07:00
Mouse Reeve
777d177c67 Adds more mocks 2021-08-03 12:41:41 -07:00
Mouse Reeve
1f2fea4a8e Use update_fields for password_change 2021-08-03 12:37:28 -07:00
Mouse Reeve
ee9c5a2a4b Adds mock to fields 2021-08-03 12:33:42 -07:00
Mouse Reeve
ebc0680288 Fixes logic error in detecting changed fields when serializing 2021-08-03 12:21:11 -07:00
Mouse Reeve
b059cbdd18 Adds missing import and mock 2021-08-03 12:02:47 -07:00
Mouse Reeve
1aff6322ea Makes test user undiscoverable 2021-08-03 11:59:49 -07:00
Mouse Reeve
fc93e08767 Fixes missing mocks in suggested user test 2021-08-03 11:56:33 -07:00
Mouse Reeve
2b6423792c Use update_fields when saving preview images 2021-08-03 11:47:52 -07:00
Mouse Reeve
19acfeeb72 Removes delete redis action 2021-08-03 10:44:48 -07:00
Mouse Reeve
be044bce0d Updates mocks 2021-08-03 10:25:53 -07:00
Mouse Reeve
88967e589b Uses better mock pattern in relationships model 2021-08-03 09:46:04 -07:00
Mouse Reeve
cfbe1b29cd Pass update fields when ticking last active date 2021-08-03 09:12:22 -07:00
Joachim
14bf7fca2e Update book_cover.html 2021-08-03 18:03:34 +02:00
Mouse Reeve
a84a744e8d Track changed fields in activity to model code 2021-08-03 08:48:15 -07:00
Joachim
ce4553b367 Add simple tag to provide fallback if original image doesn't exist 2021-08-03 17:45:52 +02:00
Mouse Reeve
ee7bdc956a Streamline saves on user create 2021-08-03 07:43:03 -07:00
Mouse Reeve
851410006a Fixes remote server not getting set 
Omg this took so long for me to figure out
 2021-08-03 07:00:31 -07:00
Mouse Reeve
62befa9295 Merge branch 'main' into suggestions-redis 2021-08-02 20:40:06 -07:00
Mouse Reeve
6d82bafdc0
Merge pull request #1242 from bookwyrm-social/image-federation 
Fixes image federation
 2021-08-02 21:30:24 -06:00
Mouse Reeve
9093170660 Correct test structure 2021-08-02 20:16:17 -07:00
Mouse Reeve
39b2f37947 One (hopefully) last fix 2021-08-02 20:07:46 -07:00
Mouse Reeve
a334970692 Fixes path for image field in test 2021-08-02 20:00:02 -07:00
Mouse Reeve
815dbc81e3 Remove static tempaletag from image_serializer 2021-08-02 19:50:33 -07:00
Mouse Reeve
68f9b67fd9 Updates test 2021-08-02 19:30:42 -07:00
Mouse Reeve
b7563ca221 Adds test 2021-08-02 19:01:23 -07:00
Mouse Reeve
9e6f78c0f5 Fixes linting issue 2021-08-02 19:01:16 -07:00
Mouse Reeve
8ef1d0d3ac Fixes image federation 2021-08-02 18:55:08 -07:00
Mouse Reeve
df9787dd7a Removes stale data before doing repopulation 
This probably is only an issue when there are very few users, like my
test instance
 2021-08-02 18:14:44 -07:00
Mouse Reeve
af8851fc2e
Merge pull request #1241 from bookwyrm-social/ambiguous-ordering 
Resolves ambiguous ordering in views
 2021-08-02 19:02:46 -06:00
Mouse Reeve
c00b35dc7c Stray file 2021-08-02 17:55:17 -07:00
Mouse Reeve
dd6cce92f8 Merge branch 'main' into suggestions-redis 2021-08-02 17:49:48 -07:00
Mouse Reeve
4dddd67d0c Resolves ambiguous ordering in views 2021-08-02 17:48:29 -07:00
Mouse Reeve
2beaa0f0b7
Merge pull request #1238 from bookwyrm-social/test-mocks 
Refactors test mocks
 2021-08-02 18:47:52 -06:00
Mouse Reeve
338dfd4909 More test fixes 2021-08-02 17:31:25 -07:00
Mouse Reeve
85be4ecfeb Trying to fix mocks in inbox create tests 2021-08-02 16:58:24 -07:00
Mouse Reeve
fc8db58cdb Merge branch 'main' into suggestions-redis 2021-08-02 16:40:57 -07:00
Mouse Reeve
dca7057745
Merge pull request #1240 from bookwyrm-social/login-redirect 
Stay on page when logging in from top bar
 2021-08-02 17:39:16 -06:00
Mouse Reeve
00c8f2a88a Python formatting 2021-08-02 16:35:53 -07:00
Mouse Reeve
4a7da32f96 Fixes mock in inbox create tests 2021-08-02 16:33:23 -07:00
Mouse Reeve
806638888e Stay on page when logging in from top bar 
Was this bugging other people? It bugged me to no end.
 2021-08-02 16:24:36 -07:00
Mouse Reeve
c56c6aa8e4 Uses elided page range for directory view 2021-08-02 16:15:14 -07:00
Mouse Reeve
0a7afdb1c0 Python formatting 2021-08-02 16:07:39 -07:00
Mouse Reeve
6d8bced0f1 Refactors test mocks 2021-08-02 16:05:40 -07:00
Mouse Reeve
2370f60436
Update bookwyrm/templates/snippets/book_cover.html 
Co-authored-by: Joachim <joachim.robert@protonmail.com>
 2021-08-02 14:46:56 -06:00
Mouse Reeve
9b97fbc0ae
Fixes error in merge 2021-08-02 12:56:11 -07:00
Mouse Reeve
af34dc6520
Merge branch 'main' into images-django-imagekit 2021-08-02 13:43:59 -06:00
Mouse Reeve
acab222f8f
Merge pull request #1231 from bookwyrm-social/search-remote 
Automatically search remote endpoints if a local search is empty
 2021-08-02 13:30:12 -06:00
Joachim
d70469d2e0 Better .env vars defaults 2021-08-01 11:47:39 +02:00
Joachim
1a53f5c18a Update renamed layout.html 2021-08-01 11:38:44 +02:00
Joachim
78aa31afd5 Merge remote-tracking branch 'upstream/main' into storage-s3 2021-08-01 11:38:32 +02:00
Kylie
a6b8d44627 Summary display updates 2021-07-31 20:30:21 -04:00
Kylie
3f01cf8788
Update user_card.html 2021-07-31 19:58:12 -04:00
Kylie
1c7ed30d65
Update sanitize_html.py 2021-07-31 19:54:59 -04:00
Kylie
d75f33cfb2 Apply preserve-whitespace to profile summaries 2021-07-31 13:16:47 -04:00
Kylie
f2186d6861 Add preserve-whitespace CSS tag 2021-07-31 13:15:49 -04:00
Kylie
7af7a7b575 Recognize profile summary linebreaks + whitespace 2021-07-30 23:50:21 -04:00
Mouse Reeve
0ed0f45b32 Fixes logged out state for user search 2021-07-28 16:43:49 -07:00
Mouse Reeve
d5c36dbc28 Updates search remote value 2021-07-28 13:52:16 -07:00
Mouse Reeve
bf99a07153 Automatically search remote endpoints if a local search is empty 2021-07-28 13:29:24 -07:00
Mouse Reeve
7f44693e0c Renames feed layout file to be more consistent with other templates 2021-07-28 13:21:42 -07:00
Mouse Reeve
c9602e28ce Use consistant header size 2021-07-28 13:19:56 -07:00
Mouse Reeve
436afb0ebd Fixes heirarchy and classes in feed layout 2021-07-28 13:17:56 -07:00
Mouse Reeve
b84ffeda08
Merge pull request #1221 from cincodenada/shelved-date 
Add shelved date, populate from Goodreads import
 2021-07-19 17:11:22 -06:00
Joel Bradshaw
f867b1c81d Update tests for shelved_date 
Also make dates while we're at it
 2021-07-13 22:08:15 -07:00
Joel Bradshaw
eadf5cf410 Use shelved date for display 
I'm not sure if there's a better way to access this field, accessing via
book.shelfbook__shelved_date in the template didn't seem to work
 2021-07-13 21:26:38 -07:00
Joel Bradshaw
a16d759766 Add shelved_date field and populate it on import 2021-07-13 21:04:11 -07:00
Mouse Reeve
3f15e4410e Fixes link to edit book 2021-07-12 16:17:20 -07:00
Mouse Reeve
6ffd8a7822
Merge pull request #1217 from bookwyrm-social/activitypub-pagination 
Fixes pagination for ordered collections
 2021-07-07 12:30:45 -06:00
Mouse Reeve
88c23117ff Fixes outbox pagination 2021-07-07 10:56:19 -07:00
Mouse Reeve
1d90ccdcaa
Merge pull request #1215 from bookwyrm-social/user-status-counts 
Hide deleted status counts from book page
 2021-07-07 11:55:18 -06:00
Mouse Reeve
b41d9440fd Adds tests for ordered collection page generator 2021-07-07 10:53:25 -07:00
Mouse Reeve
23631c3c4f Fixes failing links 2021-07-07 09:49:22 -07:00
Mouse Reeve
b3cd9483d3 Adds test for misinterpreted links 2021-07-07 09:47:07 -07:00
Mouse Reeve
fede777e9b Hide deleted status counts from book page 2021-07-07 09:37:21 -07:00
Joachim
3ea1bcb256
Merge branch 'main' into storage-s3 2021-07-05 13:06:19 +02:00
Joel Bradshaw
ecff6dd051 Make it black 2021-07-03 00:22:55 -07:00
Joel Bradshaw
28a76662fe Add backend parameter to Celery initializer 
This fixed an error when viewing imports for my setup
 2021-07-02 23:53:42 -07:00
gra-ch
b720740762 Add Tranditional Chinese translation 2021-06-30 13:54:56 +08:00
Mouse Reeve
9461784a18 Python formtting 2021-06-28 13:54:38 -07:00
Mouse Reeve
e13ddb10d0 Avoids template errors in dev when imports can't connect to redis 2021-06-28 13:50:04 -07:00
Mouse Reeve
290192204e Fixes user json views 
Fixes #1198
 2021-06-27 11:47:49 -07:00
Mouse Reeve
3238be4748 Restores weights to original calculation 2021-06-26 19:07:09 -07:00
Mouse Reeve
62b6bfe1ee Annotation and filtering order 2021-06-26 18:55:09 -07:00
Mouse Reeve
8844e46259 Removes stray print statement 2021-06-26 18:40:53 -07:00
Mouse Reeve
a3badc5700 Adds preview mock to postgres tests 2021-06-26 18:36:17 -07:00
Mouse Reeve
36fe64c3ae Fixes patch import in test 2021-06-26 16:48:57 -07:00
Mouse Reeve
6470033ac9 Fixes search query syntax 
mad about the lack of django docs on this, jeez
 2021-06-26 16:20:18 -07:00
Mouse Reeve
789f823d5d Fixes python formatting 2021-06-26 13:20:23 -07:00
Mouse Reeve
62b5a00102 Adds test mocks from psql tests 2021-06-26 13:13:12 -07:00
Mouse Reeve
e168720420 Adds test for stop word null state 2021-06-26 12:42:36 -07:00
Mouse Reeve
68fc5f2b5a Trigger search vector update when author is edited 2021-06-26 12:34:05 -07:00
Mouse Reeve
2fa5fabb7b Fixes default edition ranking test 2021-06-26 09:57:56 -07:00
Mouse Reeve
61785cee66 Set defualt min confidence to 0 2021-06-26 09:12:23 -07:00
Mouse Reeve
3998aa5f2a Fixes edit author form 2021-06-26 09:05:00 -07:00
Mouse Reeve
b4b2105527 Fixes edit book form 2021-06-26 08:54:52 -07:00
Mouse Reeve
deb1b9943a Uses simple dictionary as backup for english dictionary 
Creates search vectors with stop words if the english version is empty,
and uses a SearchQuery OR with simple and english on the view side.
 2021-06-24 10:56:27 -07:00
Mouse Reeve
04c51a6598 Uses simple dictionary for names 2021-06-24 10:01:07 -07:00
Mouse Reeve
adb0253abf Remove default minimum search confidence 2021-06-23 17:41:29 -07:00
Mouse Reeve
7c15fbbb0b More efficient search index 
Co-authored-by: asmr-hex <0.0@asmr.software>
 2021-06-23 16:54:59 -07:00
root
ad3dc16005 Removrd Bio from Your books 2021-06-22 13:18:23 +00:00
Mouse Reeve
ae1d0343ba
Merge pull request #1191 from bookwyrm-social/getdata-fix 
Catch all exceptions from requests when loading remote data
 2021-06-20 12:09:14 -07:00
Mouse Reeve
2f279bbbd4
Merge pull request #1193 from bookwyrm-social/cover-images 
Safer cover image naming
 2021-06-20 12:08:35 -07:00
Mouse Reeve
4a5e4e8ca2 Safer cover image naming 2021-06-20 09:38:01 -07:00
Mouse Reeve
7a44a9b516 Use catch-all requests exception 2021-06-20 09:23:57 -07:00
Mouse Reeve
95a19a44f8 Don't error out when invalid urls are entered 2021-06-20 09:13:57 -07:00
Joachim
7818a4347f Specify width (250px) on Instance Description image 2021-06-20 15:57:08 +02:00
Joachim
0c83882a11 Fix lint 2021-06-19 19:44:14 +02:00
Joachim
e251b687dc Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-06-19 19:32:56 +02:00
Joachim
2fbbf522ce Update preview_images.py 2021-06-19 17:46:18 +02:00
Joachim
bcb6e1c40a Fix storage media removal 2021-06-19 17:10:25 +02:00
Joachim
dee63d8825 Rename MEDIA_PATH to MEDIA_FULL_URL and handle protocol 2021-06-19 17:09:53 +02:00
Joachim
582c2d4f25 Fix Python formating 2021-06-19 12:04:30 +02:00
Joachim
c9c7a673d7 Fix template dependency 2021-06-19 12:02:48 +02:00
Joachim
8af13e5f7d Fix for pylint 2021-06-19 12:01:41 +02:00
Joachim
6607c8b185 Better handling of absolute URLs with domain + scheme 2021-06-19 11:54:19 +02:00
Joachim
d862be0564 Merge remote-tracking branch 'upstream/main' into storage-s3 2021-06-19 11:53:05 +02:00
Mouse Reeve
beb42b17f1 Removes unused import 2021-06-18 16:56:33 -07:00
Mouse Reeve
98ae586889 Newline in following template 2021-06-18 16:52:12 -07:00
Mouse Reeve
5b6048e4c6 Merge branch 'main' into suggestions-redis 2021-06-18 16:48:04 -07:00
Mouse Reeve
8e7c43baa7 Fixes preview tests 2021-06-18 15:58:21 -07:00
Mouse Reeve
60626eaca1 Catches straggler preview_image signal 2021-06-18 15:28:43 -07:00
Mouse Reeve
59938e2d46 Linter fixes for models 2021-06-18 15:24:10 -07:00
Mouse Reeve
d8d6f57373 Linting fixes for preview image code 2021-06-18 15:08:36 -07:00
Mouse Reeve
a20c4d583c Merge branch 'main' into pylint 2021-06-18 14:48:31 -07:00
Mouse Reeve
ea556bd83b
Merge pull request #1142 from joachimesque/opengraph-image-generation 
Generate OpenGraph images for books, users, and site.
 2021-06-18 14:47:54 -07:00
Mouse Reeve
c7d14cb957 Fixes regex import in urls file 2021-06-18 14:40:28 -07:00
Mouse Reeve
9e5c7053e9 More pylint fixes 2021-06-18 14:29:24 -07:00
Mouse Reeve
381d160105 Fixes init file 2021-06-18 14:17:05 -07:00
Mouse Reeve
4479864008 Updates code for linter 2021-06-18 14:12:56 -07:00
Mouse Reeve
20f74ba02b More disables 2021-06-18 13:23:06 -07:00
Mouse Reeve
7775d943d4 Fixes list link to user profile 2021-06-18 12:11:07 -07:00
Joachim
7e26a38403 Fix summary image format 2021-06-18 19:15:36 +02:00
Joachim
5d41781e6a Fix scheme 2021-06-18 19:15:24 +02:00
Joachim
e07672fff1 Fix tests 2021-06-18 18:28:24 +02:00
Mouse Reeve
22636041ba Use null instead of zero for unrated review 2021-06-17 17:47:46 -07:00
Mouse Reeve
973b23856c
Merge branch 'main' into opengraph-image-generation 2021-06-17 15:17:54 -07:00
Mouse Reeve
321554f17e
Merge pull request #1181 from bookwyrm-social/search-cleanup 
Minor simplifications to search queries
 2021-06-17 14:57:17 -07:00
Mouse Reeve
4141323783
Merge pull request #1148 from arkhi/frontend/subtitle 
Update subtitle behaviour
 2021-06-17 14:55:55 -07:00
Mouse Reeve
1f071d3c18
Merge pull request #1180 from bookwyrm-social/search-timeout 
Adds timeouts to get requests
 2021-06-17 14:51:05 -07:00
Mouse Reeve
59643c02a3 Python formatting 2021-06-17 14:48:19 -07:00
Mouse Reeve
5d3639e47f Minor simplications to search queries 2021-06-17 14:46:58 -07:00
Mouse Reeve
c16baea40d
Merge pull request #1175 from bookwyrm-social/dedplicate-boosts 
Don't show duplicated statuses after boosts
 2021-06-17 13:43:43 -07:00
Mouse Reeve
2a6339cf21 Fixes redis interaction mock 2021-06-17 13:10:01 -07:00
Mouse Reeve
8b657bbcb1 Updates model test 2021-06-17 12:58:37 -07:00
Mouse Reeve
cf3869ad32 Adds timeouts to get requests 2021-06-17 12:34:54 -07:00
Fabien Basmaison
cc03460e00 Avoid space within parenthesises for series when no number is provided. 2021-06-17 17:18:55 +02:00
Fabien Basmaison
7f01dcf3b9 Merge branch 'main' into frontend/subtitle 2021-06-17 17:12:23 +02:00
Mouse Reeve
75df210193 Python formatting 2021-06-14 17:01:53 -07:00
Mouse Reeve
8946332023 More fixes for more tests 2021-06-14 16:56:47 -07:00
Mouse Reeve
27a3d0ae96
Merge branch 'main' into 253-user-post-privacy-v2 2021-06-14 16:47:57 -07:00
Mouse Reeve
0d16d3c5a4
Merge pull request #1177 from bookwyrm-social/user-page-scroll 
Small ui fixes
 2021-06-14 16:41:32 -07:00
Mouse Reeve
c3a09a6331 More test fixes 2021-06-14 16:39:54 -07:00
Mouse Reeve
ef71da7ef0 Fixes interaction tests 2021-06-14 16:23:17 -07:00
Mouse Reeve
c4f7f34ad4 Fixes edit readthrough toggle display 2021-06-14 16:04:58 -07:00
Mouse Reeve
3600f6ca3c Handle overflow text in notifications 2021-06-14 16:00:17 -07:00
Mouse Reeve
a82bf99bd6 Icon-only link display on mobile for text links 2021-06-14 15:55:26 -07:00
Mouse Reeve
fe2309f0bc Fixes orientation of edition want to read menu 2021-06-14 15:45:39 -07:00
Mouse Reeve
f307edf732 Use elided page range for invites 2021-06-14 15:39:54 -07:00
Mouse Reeve
5a236e333f Fixes directory profile link 2021-06-14 15:33:03 -07:00
Mouse Reeve
cd014e43ad Python formatting 2021-06-14 15:29:07 -07:00
Mouse Reeve
2a606eec3e scroll horizontally on user page shelf preview 2021-06-14 15:27:37 -07:00
Mouse Reeve
290a99bf17 Fixes renaming images on save 2021-06-14 15:19:54 -07:00
Mouse Reeve
52adfbf5da Don't show duplicated statuses after boosts 2021-06-14 14:47:59 -07:00
Mouse Reeve
6d42f2bb1e
Merge pull request #1172 from bookwyrm-social/import-lookup 
Don't try title/author search when isbn search fails
 2021-06-14 12:49:54 -07:00
Mouse Reeve
f4a6e18759
Merge pull request #1173 from bookwyrm-social/series-space 
Fixes trailing space in series text
 2021-06-14 12:49:41 -07:00
Mouse Reeve
6e6354bcce Fixes trailing space in series text 
Fixes #1145
 2021-06-14 12:34:11 -07:00
Mouse Reeve
d4e2a06092
Merge pull request #1171 from bookwyrm-social/import-text 
Clarifies wording on pending imports
 2021-06-14 12:31:38 -07:00
Mouse Reeve
46be7292fd Don't try title/author search when isbn search fails 2021-06-14 12:30:43 -07:00
Mouse Reeve
9a67c61487 Clarifies wording on pending imports 
Fixes #1118
 2021-06-14 11:59:44 -07:00
Mouse Reeve
e98138e84f Show users as deleted in admin view 2021-06-14 11:38:54 -07:00
Mouse Reeve
607bfa9160 Python formatting 2021-06-14 11:16:41 -07:00
Mouse Reeve
557aa2005b Adds test for delete view 2021-06-14 11:15:00 -07:00
Mouse Reeve
8cd6712db3 Let users delete their accounts 2021-06-14 10:44:25 -07:00
Mouse Reeve
7ae64c2a68 Splits user view out and adds template 2021-06-14 10:01:21 -07:00
Fabien Basmaison
17635b47db Fix case where there is no subtitle. 
Consequentially change back author to being a subtitle.
 2021-06-11 09:41:55 +02:00
Fabien Basmaison
cf751a8efa Merge branch 'main' into frontend/subtitle 2021-06-11 08:49:46 +02:00
Mouse Reeve
a4afbccb3a Fixes straggling reading view test name 2021-06-09 11:36:17 -07:00
Mouse Reeve
ce4a57e5c9 Reading status view name 2021-06-09 11:16:52 -07:00
Mouse Reeve
4107f7ddf1 Updates readthrough tests 2021-06-09 11:07:15 -07:00
Mouse Reeve
3c7c8a1797 Fixes urls in fallback mode 2021-06-09 11:05:05 -07:00
Mouse Reeve
113ced2900 Merge reading status views into one view 2021-06-09 10:53:52 -07:00
Fabien Basmaison
6be97a6102 Be consistent between variable name & logic. Equal is already too short. 2021-06-09 19:03:15 +02:00
Fabien Basmaison
c4072cbc04 Be nice to Black and follow styleguides. 2021-06-09 18:54:05 +02:00
Fabien Basmaison
0ecea5710b Use gettext to add subtitle to short titles (use variable for length). 2021-06-09 18:51:20 +02:00
Fabien Basmaison
f58c1d1138 Tweak styles for subtitle: 
- Make it bold as the title while preserving consistency with other subtitles.
- Pull the author closer to the subtitle to preserve a descending visual and typographic scales.
 2021-06-09 12:20:34 +02:00
Fabien Basmaison
5047b8bf94 Do not break document structure with ratings. 2021-06-09 11:12:38 +02:00
Fabien Basmaison
b9562e44e3 Merge branch 'main' into frontend/subtitle 2021-06-09 10:14:34 +02:00
Mouse Reeve
625ab46059 Removes start reading with progress test 
There's no way to do this from the ui???? I don't tihnk there ever
was???
 2021-06-08 15:03:50 -07:00
Mouse Reeve
a00fdc6864 Updates tests for reading views 2021-06-08 14:42:55 -07:00
Mouse Reeve
e65bc09e7a Linter fixes 2021-06-08 12:42:45 -07:00
Mouse Reeve
eb12506985 No script fallback mode 2021-06-08 12:40:01 -07:00
Mouse Reeve
3356c652ee Adds standalone modal views for reading steps 2021-06-08 11:55:18 -07:00
Mouse Reeve
b5d0a9e0b4 Removes deplicate progress code form reading views 2021-06-08 11:43:30 -07:00
Mouse Reeve
1231d40e80 Want to read view 2021-06-08 11:23:53 -07:00
Mouse Reeve
45146b4999 Convert start and finish reading into view classes 2021-06-08 11:10:39 -07:00
Joachim
689fefb096 Merge remote-tracking branch 'upstream/main' into storage-s3 2021-06-08 18:20:57 +02:00
Mouse Reeve
948a5dea10 Cleans up .env and settings files 
Some outdated stuff doesn't need to be in there
 2021-06-07 12:53:57 -07:00
Joachim
4359505124 Update book.py 2021-06-07 19:54:16 +02:00
Joachim
d105ae9c78 Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-06-07 19:53:11 +02:00
Joachim
2731ea9aa9 Add env var to enable/disable thumbnail generation 2021-06-07 19:52:25 +02:00
Joachim
f287a19f12 Update settings.py 2021-06-07 18:31:01 +02:00
Joachim
715cb46e1e Lint 2021-06-07 18:15:48 +02:00
Joachim
b448d40514 Use the right snippets on Templates 2021-06-07 18:13:24 +02:00
Joachim
cba34780d8 Use S3 as static and media storage 
TODO

- [ ] Write some documentation for non-AWS, S3-compatible services
- [ ] Make a management command to move existing media to the new S3 bucket
- [ ] See if Nginx can reverse-proxy the S3 bucket in order to keep the files accessible through the domain name
 2021-06-07 18:12:48 +02:00
Mouse Reeve
5b40069d99
Merge pull request #1153 from bookwyrm-social/instance-language 
Use "instance" consistently
 2021-06-06 14:07:49 -07:00
Joachim
7ed2ed116a ✨ lint ✨ 2021-06-06 21:13:16 +02:00
Joachim
1f2c296cfd This should now work 2021-06-06 21:12:21 +02:00
Mouse Reeve
4ea672f2a1
Merge pull request #1157 from bcj/bcj/urlencode-redis-password 
URL-Encode password in broker_url
 2021-06-05 12:51:25 -07:00
Mouse Reeve
c8d2df1203
Merge pull request #1155 from joachimesque/front-modal-title-fit 
Front: Modal title fit
 2021-06-05 12:43:35 -07:00