mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-01 22:11:16 +00:00
Code Issues Projects Releases Wiki Activity
9310 commits 21 branches 36 tags 103 MiB
Commit graph

9310 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mouse Reeve
0818d5aabb
Merge branch 'main' into report-actions 2023-07-16 07:13:42 -07:00
Mouse Reeve
0832a2fa8e
Merge branch 'main' into reactivation-bug 2023-07-16 07:13:34 -07:00
Mouse Reeve
c2a7b9a77b
Merge pull request #2903 from bookwyrm-social/prettier-update 
Fixes prettier JS complaints
 2023-07-16 07:13:23 -07:00
Mouse Reeve
245ae35a81 Pin prettier version in github workflow 2023-07-16 06:57:31 -07:00
Mouse Reeve
d56b9f14a2 Handles changing user perms from report 2023-07-16 06:36:32 -07:00
Mouse Reeve
040dca0c31 Places first item of report history at top 2023-07-16 06:11:26 -07:00
Mouse Reeve
a7e6919b96 Fixes confirm email slow and adds test 2023-07-16 05:55:38 -07:00
Mouse Reeve
61037cf38a
Merge pull request #2883 from hughrun/modal-fix 
Ensure report button triggers modal
 2023-07-15 19:58:36 -07:00
dependabot[bot]
7f3a8f27ab
build(deps): bump django from 3.2.19 to 3.2.20 
Bumps [django](https://github.com/django/django) from 3.2.19 to 3.2.20.
- [Commits](https://github.com/django/django/compare/3.2.19...3.2.20)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-05 23:27:36 +00:00
Hugh Rundle
dd92c53410
Merge pull request #2887 from hughrun/federation 
add `FEDERATION.md` so other app maintainers understand how BookWyrm behaves in the fediverse.
 2023-07-03 09:21:40 +10:00
Hugh Rundle
fad1eb8952
clean up and add stopped-reading shelf type 2023-07-03 08:38:53 +10:00
Hugh Rundle
c875b18e34
complete FEDERATION.md initial file 2023-07-01 14:23:02 +10:00
Hugh Rundle
1841d196ff
Ensure report button triggers modal 
Clicking on "report" in any context closed the dropdown menu and required a second click on the dropdown to trigger the modal.
With this change, the modal opens as expected.

Reverses part of #2322
 2023-06-26 12:22:14 +10:00
Hugh Rundle
e783c90693
add FEDERATION info 2023-06-26 08:27:14 +10:00
Mouse Reeve
6a949c24e2 Typo fix 2023-06-21 15:52:32 -07:00
Mouse Reeve
11f1a4662e Don't allow invalid account reactivation 2023-06-21 15:47:20 -07:00
Mouse Reeve
4f6a235d77 Reverses order of report action list 2023-06-21 15:05:02 -07:00
Jascha Ezra Urbach
a601be4708
Merge branch 'main' into 2678 2023-06-01 16:53:28 +02:00
Mouse Reeve
65e3a31354
Merge pull request #2864 from bookwyrm-social/locales 
Update locales
 2023-05-30 11:37:01 -07:00
Mouse Reeve
c6d23ba26a Record statuses deleted in reports 2023-05-30 11:35:47 -07:00
Mouse Reeve
0bb0537215 Updates version number 2023-05-30 11:00:12 -07:00
Mouse Reeve
ca3054fdac
Merge pull request #2827 from hughrun/2571 
Retain subjects and authors when new book form fails validation
 2023-05-30 10:51:52 -07:00
Mouse Reeve
9056a5d9e7
Merge pull request #2842 from bookwyrm-social/set-remote-server 
Set remote servers synchonously where possible
 2023-05-30 10:51:39 -07:00
Mouse Reeve
a1b3fc1a79 Update locales 2023-05-30 10:50:09 -07:00
Mouse Reeve
d251f4201b
Merge pull request #2857 from bpeel/no-rating 
Show “no rating” instead of blank stars if the review has no rating
 2023-05-30 10:42:09 -07:00
Mouse Reeve
aec99ba173
Merge pull request #2862 from kvibber/rssdate 
Add dates to RSS feeds and sort by most recent first
 2023-05-30 10:36:01 -07:00
Mouse Reeve
bf0225fe93
Merge pull request #2858 from bookwyrm-social/dependabot/pip/requests-2.31.0 
build(deps): bump requests from 2.28.2 to 2.31.0
 2023-05-29 19:54:48 -07:00
Mouse Reeve
a4ccd45537
Merge pull request #2812 from hughrun/gts 
Fix federation with GoToSocial and inconsistent KeyId in headers
 2023-05-29 19:54:00 -07:00
Kelson Vibber
70679856bd apply linter 2023-05-28 22:42:37 -07:00
Kelson Vibber
c21d580fd8 sort feed by most recent 2023-05-28 22:38:53 -07:00
Kelson Vibber
98f5cd9393 apply linting 2023-05-28 22:25:01 -07:00
Kelson Vibber
637e0376d4 rss dates 2023-05-28 21:55:26 -07:00
Philip James
9ff28d97b1
Merge pull request #6 from bookwyrm-social/main 
Update to upstream
 2023-05-24 23:42:35 -07:00
dependabot[bot]
76fc0dfcc4
build(deps): bump requests from 2.28.2 to 2.31.0 
Bumps [requests](https://github.com/psf/requests) from 2.28.2 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.28.2...v2.31.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-23 05:59:52 +00:00
Neil Roberts
603b2d9502 Show “no rating” instead of stars if the review has no rating 
The stars.html template now outputs a span containing “no rating” when
the stars represent a non-existent or zero rating. This text is already
translated because it was previously added as a invisible text only for
screen readers. The span is given a special CSS class so that it can be
styled as italic in the stylesheet.

There is now also an extra span in book.html to group the stars with the
“(2 reviews)” text. This is needed because the outer div is using a flex
layout and it eats the spacing between the two parts otherwise.

Fixes #2856
 2023-05-22 15:40:18 +02:00
Mouse Reeve
affaf3d0ba Fixes tests and incorrect class method reference 2023-05-22 06:39:23 -07:00
Mouse Reeve
b3a519c082 Converts report "comments" into broader "actions" table 
This table will now track all actions taken on a report, like resolving
it, re-opening it, suspending the reported user, et cetera, in addition
to comments. When there are multiple admins, this change will make it
easier to understand what actions have been taken by whom on a report.
 2023-05-16 11:00:33 -07:00
Mouse Reeve
ab146f652a Adds action types to report comments table 2023-05-16 09:02:43 -07:00
Mouse Reeve
ee1dd612fb
Merge pull request #2853 from bookwyrm-social/locales 
Updates locales
 2023-05-15 13:46:18 -07:00
Mouse Reeve
aae8b1ac14 Updates locales 2023-05-15 11:52:36 -07:00
Mouse Reeve
24d59315df
Merge pull request #2843 from bookwyrm-social/user-reports-link 
Show all (not just open) reports when linked from user admin
 2023-05-15 06:04:42 -07:00
Mouse Reeve
d6a321dda9
Merge pull request #2839 from WesleyAC/optimize-get-audience-user-id-only 
Optimize get_audience by only fetching IDs
 2023-05-15 06:03:40 -07:00
Mouse Reeve
120a0f1882
Merge pull request #2852 from bpeel/remove-from-translate-shelf-name 
Use the translated shelf name in the “remove from” shelf button
 2023-05-15 05:43:13 -07:00
Mouse Reeve
3a5ddf33a9
Merge pull request #2850 from bpeel/other-edition-translate-shelf 
Use the translated shelf name in the message for when another edition is shelved
 2023-05-15 05:39:13 -07:00
Mouse Reeve
0e0d9d2d08 Updates ignore html error list 2023-05-15 05:31:07 -07:00
Neil Roberts
666f09c576 Use the translated shelf name in the “remove from” shelf button 
The button to remove a book from a shelf when looking at the book’s page
wasn’t using the translated shelf name. It was also concatenating
strings instead of using a placeholder, which is difficult to translate
in some languages. This fixes it to use the translate_shelf_name
function and use the same placeholder string as in other places.
 2023-05-15 11:26:12 +02:00
Neil Roberts
a4ea4082e6 Use the translated shelf name in message when another edition is shelved 
In the page for an edition, if the user has a different edition of the
same work on a shelf then a message is shown. Previously the name of the
status shelves wasn’t being translated.
 2023-05-12 15:33:51 +02:00
Jascha Ezra Urbach
70a5153271
Merge pull request #2838 from bpeel/merge-works-command 
Add a management command to merge works
 2023-05-11 16:29:58 +02:00
Jascha Ezra Urbach
45127c9648
Merge pull request #2847 from bookwyrm-social/dependabot/pip/django-3.2.19 
build(deps): bump django from 3.2.18 to 3.2.19
 2023-05-11 16:27:19 +02:00
dependabot[bot]
1139d214a0
build(deps): bump django from 3.2.18 to 3.2.19 
Bumps [django](https://github.com/django/django) from 3.2.18 to 3.2.19.
- [Commits](https://github.com/django/django/compare/3.2.18...3.2.19)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-09 22:15:37 +00:00