2761 commits

Author	SHA1	Message	Date
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
Joachim	14bf7fca2e	Update book_cover.html	2021-08-03 18:03:34 +02: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	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	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	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	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