Commit graph

2904 commits

Author SHA1 Message Date
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
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
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
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
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
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
Mouse Reeve
d1e33e14e2
Merge pull request #1154 from joachimesque/front-better-forms
Front-end: Better forms
2021-06-05 12:38:20 -07:00
Mouse Reeve
61e55628fa
Merge pull request #1131 from joachimesque/author-page-microformats
Author page microformats
2021-06-05 11:27:16 -07:00
Joachim
6f105fcdcc Front: Modal title fit 2021-06-02 18:56:24 +02:00
Joachim
49c057625a Smol fixes 2021-06-02 18:30:36 +02:00
Joachim
7d1e4aebbc Better forms 2021-06-02 18:17:53 +02:00
Mouse Reeve
2816d7cc88 Use "instance" consistently 2021-06-01 14:50:14 -07:00
Mouse Reeve
ff45238667
Merge pull request #1123 from eatsleepdeploy/add-max-upload-size-config
Add max upload size config
2021-06-01 14:09:50 -07:00
Joachim
cd7c0ccaea Enable env on GitHub Actions 2021-05-29 15:51:56 +02:00
Joachim
ba39dad06c Add save_and_cleanup test 2021-05-29 15:32:04 +02:00
Joachim
00b09cd07d Try with logging 2021-05-29 14:43:06 +02:00
Joachim
fbb262fe88 Try logging output 2021-05-29 13:44:43 +02:00
Joachim
cc0881b11c Try another way 2021-05-29 12:33:04 +02:00
Joachim
022182e114 See if the image is saved in DB in the Github Actions test environment 2021-05-29 11:33:37 +02:00
Joachim
b4e2d8c6e3 Better refresh object in test 2021-05-29 11:17:59 +02:00
Joachim
0f80456a08 Save as JPG 2021-05-28 23:42:04 +02:00
Joachim
872084d61a Update test_preview_images.py 2021-05-28 23:41:41 +02:00
Joachim
9cee119200 test 2021-05-28 23:29:28 +02:00
Joachim
0e28b79089 third time's the charm 2021-05-28 22:10:57 +02:00
Joachim
71bc35224b no, this will work 2021-05-28 22:00:26 +02:00
Joachim
8755b92c2e Fix GitHub FileNotFoundError 2021-05-28 21:40:20 +02:00
Joachim
2bf254bce7 Update test_preview_images.py 2021-05-28 21:26:13 +02:00
Joachim
ec159ebcb0 Test generating preview images 2021-05-28 21:24:45 +02:00
Joachim
08cebd7051 Lint 2021-05-28 17:26:43 +02:00
Joachim
61367c3f4f Protect generate_preview_images command
- add `--all` argument
- send computation intensive tasks to Celery
2021-05-28 17:25:20 +02:00
Joachim
f206f61e9a Use global switch to enable/disable preview images 2021-05-28 17:00:07 +02:00
Mouse Reeve
b29ca22227 A couple test mocks 2021-05-27 17:29:24 -07:00
Joachim
878cc5cb17 Lint 2021-05-27 23:21:47 +02:00
Joachim
f8df501239 Fix tests (for realz) 2021-05-27 23:19:17 +02:00
Joachim
d9d34d8220 Fix linting 2021-05-27 21:40:23 +02:00
Joachim
b7965ce2ae Fix tests 2021-05-27 21:37:27 +02:00
Joachim
b8bff8a882 Use field tracker to launch task on field change 2021-05-27 21:09:57 +02:00
Joachim
2ea1cd8319 Tests 2021-05-26 23:57:29 +02:00