mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-06-10 09:19:27 +00:00
Code Issues Projects Releases Wiki Activity
3976 commits 16 branches 36 tags 94 MiB
Commit graph

3976 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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
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 b1022cf245
Merge pull request #1216 from bookwyrm-social/link-formatting 
Fixes detection of links with certain characters
 2021-07-07 11:20:15 -06: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
Mouse Reeve 52713ec8d5
Merge pull request #1211 from cincodenada/fix-resetdb 
Fix bw-dev resetdb, some tweaks to bw-dev
 2021-07-06 16:02:46 -06:00
Joel Bradshaw b4c6587972 Fix bw-dev resetdb, some tweaks to bw-dev 
The main fix here is for resetdb, it previously was failing to drop the
db for me, because `web` was up and running and using the database. This
commit spins up db by itself first so it can drop and re-create the
database successfully, then brings up web to run the migrations.

While I was in here, I also updated it so that when running `bw-dev`
without any command it will also print the helptext, rather than just
exiting silently, got rid of the double-echo of the helptext, and added
runweb/rundb commands to run arbitrary commands via bw-dev.
 2021-07-05 13:20:14 -07:00
Joachim 3ea1bcb256
Merge branch 'main' into storage-s3 2021-07-05 13:06:19 +02:00
Mouse Reeve 2e9ac1bf27
Merge pull request #1208 from cincodenada/fix-import-page 
Add backend parameter to Celery initializer
 2021-07-03 06:42:47 -07: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
Mouse Reeve 95db2ce867
Merge pull request #1206 from gra-ch/translation 
Add Tranditional Chinese translation
 2021-07-01 17:46:31 -07:00
gra-ch b720740762 Add Tranditional Chinese translation 2021-06-30 13:54:56 +08:00
Mouse Reeve 088c862e90
Merge pull request #1204 from bookwyrm-social/dev-import-bug 
Avoids template errors in dev when imports can't connect to redis
 2021-06-28 14:26:23 -07: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 1ae1712314
Merge pull request #1202 from bookwyrm-social/mouse-reeve-patch-1 
Adds prompt to include instance in bug reports
 2021-06-27 12:51:33 -07:00
Mouse Reeve a27adf596b
Adds prompt to include instance in bug reports 2021-06-27 12:14:55 -07:00
Mouse Reeve 290192204e Fixes user json views 
Fixes #1198
 2021-06-27 11:47:49 -07:00
Mouse Reeve 556ffa4194
Merge pull request #1199 from bookwyrm-social/search-index 
More efficient search index
 2021-06-27 08:03:14 -07:00
Mouse Reeve 55aa67cc00 Fixes pytest syntax 2021-06-27 07:31:01 -07:00