1
0
Fork 0
Commit graph

1572 commits

Author SHA1 Message Date
8144507893
Merge branch 'main' into issue-3187 2024-01-15 17:25:36 +05:30
5ef104b802 Issue-3187: addressing review comments 2024-01-15 17:22:33 +05:30
eb13eb9882
Invalidate active_shelf when switching editions 2024-01-13 19:00:57 +01:00
854eb36618 Export bookshelves and review date 2024-01-13 16:47:51 +00:00
1a682753c0 Issue-3187: changes 2024-01-09 15:31:05 +05:30
ce18d343e8 Fix pylint error and code format 2024-01-06 09:55:39 +01:00
c2622a510c Change else statement to None vs "" 2024-01-04 11:40:40 +01:00
30c9ec9611 Prevent lint error
See @hughrun 's explanation https://github.com/bookwyrm-social/bookwyrm/pull/3189#issuecomment-1876145423
2024-01-04 11:28:17 +01:00
51cb70d344 Change readhtrough order 2024-01-04 11:27:17 +01:00
9acb5f66fe Convert DateTime to date 2024-01-04 11:26:44 +01:00
766a2163dd Code formatting 2024-01-03 20:41:31 +01:00
db8c686dd3 Include book Readtrhough in the csv export 2024-01-03 15:43:15 +01:00
9c3e6384f8
Merge pull request #3118 from rosschapman/let-a-user-search-within-their-books
Let a user search books within their shelves
2024-01-02 18:37:33 -08:00
193a1c7d54 updates wording and fixes get or create logic 2024-01-02 13:28:25 -08:00
8be9e91d21 Re-use schedules rather than creating new ones 2024-01-02 13:18:26 -08:00
f36af42f41 Adds view to see scheduled tasks 2024-01-02 13:05:44 -08:00
5509941aa4 Adds schedule-able task to check for version updates 2024-01-02 13:05:26 -08:00
d6f7f76c4d Removes outdated/unused version and updating code
I had the bright idea of creating this update script but it doesn't work
and hasn't been maintained, so it's just sitting there causing confusing
and requiring weird things to exist in other places.

Now, the unused `version` field can be removed and I can scrap the
management command for getting versions.
2024-01-02 11:37:01 -08:00
ca79cb1ca7
Merge pull request #3054 from bookwyrm-social/user-migration
User migration via export file
2024-01-01 19:04:43 -08:00
a4172214d1 Updates size of filters panel label 2023-12-15 13:17:23 -08:00
fb36958444 Removes unused variable 2023-12-14 13:47:51 -08:00
44d21d1ba4 Updates view logic 2023-12-14 13:04:45 -08:00
bd3acdbf31 Puts string in template 2023-12-14 12:33:27 -08:00
4a4046a704 Shows message if empty and renames "search" to "filter" 2023-12-14 11:30:01 -08:00
7cca199a11 Merge branch 'main' into let-a-user-search-within-their-books 2023-12-14 10:25:05 -08:00
aac8aa1adf Fixes formatting 2023-12-06 11:36:15 -08:00
0f6e567b21 Clean up 2023-12-05 19:49:38 -08:00
979162da10 Uses filters, fixes for any shelf 2023-12-05 19:33:59 -08:00
b27ed847d5 Fixes result set passed to template 2023-12-05 16:36:58 -08:00
d93da4e86d Checkpoint 2023-12-05 15:46:08 -08:00
7f55495287 Merge branch 'move-ratings-and-reviews-when-switching-editions' of github.com:mattlehrer/bookwyrm into move-ratings-and-reviews-when-switching-editions 2023-11-30 11:15:33 +01:00
31a78a5c9e linted 2023-11-30 11:13:11 +01:00
539a9fa212
csv import and export fixes
Adds shelved and published dates for books and their imported reviews.
Provides option to create new (custom) shelves when importing books.

fixes #3004
fixes #2846
fixes #2666
fixes #2411
2023-11-25 17:34:12 +11:00
0276c15948
Merge branch 'main' into user-migration 2023-11-22 21:00:04 +11:00
c6dea2523c
Merge branch 'main' into softblock 2023-11-22 20:06:02 +11:00
2c9ebba5d7
fix reject PR
- rationalise activitypub.Reject and fix model being undefined
- fix not being able to follow users from followers page: 'delete' option now in user_options dropdown
- revert bookwyrm.js
- fix delete_follow_request deleting instead of rejecting
- add user id to 'remove-follow' path
2023-11-21 20:13:56 +11:00
7c2de92df3
Merge pull request #3128 from bookwyrm-social/test-themes
Give admins option to test if a theme loads correctly
2023-11-20 12:26:09 -08:00
cfe42305be Merge branch 'main' into test-themes 2023-11-20 10:02:23 -08:00
d828ba0bc6 Give admins option to test if a theme loads correctly
If a theme is uploaded incorrectly or has errors in it, users can still
select the theme but it will cause a 500 error on every page, making the
app unusable and also making it impossible for them to switch to a
functional theme.

A better fix would be to fail gracefully, but in lieu of that, this will
at least let admins confirm if a theme is broken safely.
2023-11-20 09:56:51 -08:00
6933f70af3
Merge branch 'bookwyrm-social:main' into move-ratings-and-reviews-when-switching-editions 2023-11-20 09:31:45 +01:00
d94b27b723
Merge branch 'main' into user-migration 2023-11-19 19:18:22 -08:00
1d5cc83347
Merge branch 'main' into permission-required 2023-11-19 19:12:32 -08:00
d8018cb937
Merge pull request #3125 from hughrun/instance-actor
hide instance actor from users
2023-11-19 19:11:17 -08:00
446854ccf0
fix saved list pagination
The SavedLists view was passing through an incorrect "path" value. Now it's not.
2023-11-20 12:45:39 +11:00
f011f2bce9
hide instance actor from users
The Instance Actor is required for signing http GET requests but is not a "user" and should not be otherwise interacted with.

- hides instance actor profile page, returning a 404
- excludes instance actor from search results and suggestions including in Getting Started
- replaces link to user profile in user admin page with a brief message box
- replaces panel in user admin page that allows for user to be suspended or removed with a message explaining why that is a very bad idea

fixes #3119
2023-11-20 12:17:52 +11:00
2ba0e3d7ff
Allow removing followers and fix follow rejections
* adds the ability to remove a user from your followers list
* fixes verbs.Reject to process reject activities for previously accepted follows in both directions

fixes #2635
2023-11-19 20:03:48 +11:00
a56ba0ce1c
always return 403 to POST requests
- POST requests need to receive a 403 error code
- minor wording updates
2023-11-18 13:41:52 +11:00
8ddafafa84
make naming consistent 2023-11-18 12:40:36 +11:00
d620bd7350
add handler for 403s
fixes #3104
2023-11-18 12:36:03 +11:00
f4da9fbf34 remove unnecessary loop.
ReviewRatings are a subclass and are included in the models.Review block
2023-11-16 20:37:46 +01:00