1
0
Fork 0
Commit graph

1307 commits

Author SHA1 Message Date
7b3b357756 Merge branch 'main' into form-conflict 2022-03-16 16:51:57 -07:00
922cc61a5f
Merge pull request #1998 from oragegu/question_invite_correct
Custom question option and field for spammed bookwyrm instances
2022-03-16 16:49:00 -07:00
0cf2c07069
Merge branch 'main' into url-names 2022-03-16 16:32:07 -07:00
68dc5962ee Merge branch 'main' into add-edition 2022-03-16 16:16:55 -07:00
f2b0b306e9
Merge pull request #1934 from tversteeg/partially-read-shelf
Add 'Stopped Reading' shelf
2022-03-16 13:51:15 -07:00
Thomas Versteeg
ee414598bf
Merge branch 'main' into partially-read-shelf 2022-03-15 08:28:02 +00:00
81b7dca4b9 Merge branch 'main' into celerybeat 2022-03-14 15:13:09 -07:00
488d702473 Separate admin user list into tabbed lists 2022-03-14 09:27:18 -07:00
Corentin Feys
771fa5a00a
Merge branch 'main' into question_invite_correct 2022-03-13 23:44:20 +01:00
corentin-feys
74a1697cda fix to pass register pytest 2022-03-13 23:04:14 +01:00
3885ae789b Manually add theme path rather than options 2022-03-13 13:15:42 -07:00
c7efa23405 Display error message for remote failure 2022-03-13 12:38:29 -07:00
739b394ccc Catch error when trying to update book 2022-03-13 12:31:21 -07:00
OragePika, aka "FANS DON'T CARE
974c569fc1
Merge branch 'main' into question_invite_correct 2022-03-13 13:14:23 +01:00
Thomas Versteeg
9e6dfb4706
Merge branch 'main' into partially-read-shelf 2022-03-12 10:38:56 +00:00
Vivianne Langdon
a4391f35c1 black 2022-03-11 22:31:40 -08:00
Vivianne Langdon
d6767e42fc fix variable clash 2022-03-11 22:28:05 -08:00
Vivianne Langdon
cf53134577 disable linting unused-argument 2022-03-11 21:19:20 -08:00
Vivianne Langdon
598a0587cf Fix issue with tabs on bottom of book page 2022-03-11 21:10:22 -08:00
Vivianne Langdon
f2d7bdbf27 in progress fixes for pylint 2022-03-11 20:14:45 -08:00
Vivianne
9fa8caba45
Merge branch 'bookwyrm-social:main' into url-names 2022-03-11 19:55:06 -08:00
e0ffcddd3c
Merge pull request #2003 from bookwyrm-social/modal-button-pattern
Consistent positioning of success buttons
2022-03-10 14:29:39 -08:00
cbcd5c7a57 Adds elided page range to editions 2022-03-10 09:49:17 -08:00
cc2b774fb5 Updates wording on content warning field 2022-03-10 09:16:50 -08:00
Orage Pika
0c429ee6d7 bw-dev blacked 2022-03-09 16:04:58 +01:00
corentin-feys
bb7d080f65 Replaced tabs with spaces 2022-03-07 21:20:42 +01:00
Orage Pika
5fbb5c655b custom questions 2022-03-07 18:49:59 +01:00
34a4c18397
Merge branch 'main' into partially-read-shelf 2022-03-05 19:23:35 -08:00
Vivianne Langdon
8838875879 Fix failure to 404 2022-03-02 04:07:13 -08:00
Vivianne Langdon
81594892ef Fix test for unit test requests 2022-03-02 03:42:29 -08:00
Vivianne Langdon
05f11e68c5 Hopefully knocking out many of the unit test fails 2022-03-02 03:11:02 -08:00
Vivianne Langdon
440e2f8806 black 2022-03-02 01:47:08 -08:00
Vivianne Langdon
2b483488aa Remove slugs from shelf as their id has text in it already 2022-03-02 01:37:58 -08:00
Vivianne Langdon
d8181d6d66 Redirect to correct url with slug 2022-03-02 01:12:32 -08:00
Vivianne Langdon
ebf463fc91 Generation of slugs and new urls to handle slugs
- TODO: redirect to correct slug if not found.
2022-03-02 00:21:23 -08:00
043fd54d70
Merge branch 'main' into themes 2022-02-28 13:27:05 -08:00
e1ea847441
Merge pull request #1986 from bookwyrm-social/instance-refresh
Instance refresh
2022-02-28 13:26:22 -08:00
81cfcff939 Reload instance data 2022-02-28 13:11:01 -08:00
f4aa202292 Adds counts of blocked and federated instances 2022-02-28 12:27:54 -08:00
ec93d1812a Block access to follow views 2022-02-28 12:04:47 -08:00
Thomas Versteeg
1e3f9246d6 Produce a proper status 2022-02-28 20:56:59 +01:00
Thomas Versteeg
539775f370 Merge remote-tracking branch 'upstream/main' into partially-read-shelf 2022-02-28 20:44:55 +01:00
142cc5437a Move sorting to separate function 2022-02-28 10:41:40 -08:00
b2b3ba653e Refactors how success/failure messages how on list page 2022-02-28 10:29:58 -08:00
202696f913 Don't show lists a book is already on in add form 2022-02-28 10:03:24 -08:00
c82042f506 Delete themes 2022-02-28 09:55:23 -08:00
8259d16ee9 Check available themes in form 2022-02-27 11:20:11 -08:00
3dfbb3272e Theme selector 2022-02-27 10:00:50 -08:00
0870eccad9 Adds unscheduler 2022-02-26 10:24:23 -08:00
2a436800c4 Schedules automod task 2022-02-26 10:14:47 -08:00