mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-18 07:33:57 +00:00
Code Issues Projects Releases Wiki Activity
4176 commits 21 branches 36 tags 102 MiB
Commit graph

4176 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
3ec41701e7
Merge pull request #1239 from bookwyrm-social/directory-elided-pages 
Uses elided page range for directory view
 2021-08-02 17:28:03 -06: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
9e5536c7d5 Don't double-run black and pylint 2021-08-02 16:08:41 -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
7980d74b01
Merge pull request #1235 from bookwyrm-social/test-speed 
Tweaks for test CI
 2021-08-02 13:59:04 -06:00
Mouse Reeve
1791b5b9fa Try running tests in parellel 2021-08-02 12:34:18 -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
Mouse Reeve
b40b8c2d0e
Merge pull request #1163 from joachimesque/storage-s3 
Use S3 as static and media storage
 2021-08-02 08:29:09 -06:00
Mouse Reeve
8d476804c2 Potential speedups 2021-08-01 07:38:16 -07: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
Mouse Reeve
1333b0b3c3 Simplifies env for django tests 2021-07-31 21:42:37 -07:00
Mouse Reeve
d76106ded5
Merge pull request #1234 from EvilDrPurple/main 
Recognize profile summary linebreaks + whitespace
 2021-07-31 22:37:35 -06:00
Kylie
d062f6eb12
Merge pull request #4 from EvilDrPurple/recognize-whitespace 
Recognize whitespace
 2021-07-31 20:31:46 -04: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
cdbb911b46
Merge pull request #3 from EvilDrPurple/recognize-whitespace 
Recognize whitespace
 2021-07-31 13:19:49 -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
27445950b3
Merge pull request #2 from EvilDrPurple/revert-1-recognize-whitespace 
Revert "Recognize profile summary linebreaks + whitespace"
 2021-07-31 13:14:00 -04:00
Kylie
f996cc7d10
Revert "Recognize profile summary linebreaks + whitespace" 2021-07-31 13:13:43 -04:00
Kylie
b3e437fd18
Merge pull request #1 from EvilDrPurple/recognize-whitespace 
Recognize profile summary linebreaks + whitespace
 2021-07-30 23:54:55 -04:00
Kylie
7af7a7b575 Recognize profile summary linebreaks + whitespace 2021-07-30 23:50:21 -04:00
Mouse Reeve
1e48ca95a6
Merge pull request #1233 from GuDzpoz/main 
Updated zh_Hans translation
 2021-07-30 07:38:20 -06:00
GuDzpoz
1feb5d9f86 Updated zh_Hans translation; compiled zh_Hant translation. 2021-07-30 18:14:21 +08:00
Mouse Reeve
0ed0f45b32 Fixes logged out state for user search 2021-07-28 16:43:49 -07:00
Mouse Reeve
08a2c352a5
Merge pull request #1230 from bookwyrm-social/feed-layout 
Fixes html and css class heirarchy on feed layout
 2021-07-28 14:54:42 -06: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
Mouse Reeve
d1cefb6900
Merge pull request #1220 from bookwyrm-social/edit-book-link 
Fixes link to edit book
 2021-07-14 17:51:53 -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