Neil Roberts
d80cefd416
Add a management command to merge works
2023-04-26 15:54:37 +02:00
Mouse Reeve
7211906697
Merge pull request #2837 from bookwyrm-social/revert-2798-celery-increase-ping-timeout
...
Revert "Increase Celery ping timeout for monitoring page"
2023-04-26 06:13:03 -07:00
Zach Flanders
3f205f1b10
Merge branch '2678' of https://github.com/zachflanders/bookwyrm into 2678
2023-04-25 21:06:13 -05:00
Zach Flanders
858a93e98a
fixing migration
2023-04-25 21:05:11 -05:00
Zach Flanders
f43d7f8c70
fixing test and other checks
2023-04-25 21:00:16 -05:00
Mouse Reeve
7bd9623b68
Revert "Increase Celery ping timeout for monitoring page"
2023-04-25 18:24:23 -07:00
Zach Flanders
1985c2d284
Merge branch 'main' into 2678
2023-04-25 19:47:07 -05:00
Zach Flanders
575e1bac4c
responding to review comments
2023-04-25 19:46:38 -05:00
Mouse Reeve
b77ae9e783
Ticks version number
2023-04-25 17:42:32 -07:00
Mouse Reeve
b92836ee7b
Merge pull request #2836 from bookwyrm-social/locales
...
Updates locales
2023-04-25 17:41:51 -07:00
Mouse Reeve
4e025b5105
Updates locales
2023-04-25 17:21:54 -07:00
Mouse Reeve
8fa89f5ece
Merge pull request #2821 from bpeel/merge-commands
...
Add management commands to merge a pair of editions or authors
2023-04-25 16:27:12 -07:00
Mouse Reeve
ac48457748
Merge pull request #2770 from bookwyrm-social/import-rating-parser
...
Catch value errors when parsing imported ratings
2023-04-25 16:21:25 -07:00
Mouse Reeve
cbb027c56c
Merge pull request #2778 from ranok/upstream_pr
...
Move the search request logic into the AbstractConnector
2023-04-25 16:20:24 -07:00
Zach Flanders
6b39052fcc
Adding test for sort_title population
2023-04-25 07:17:23 -05:00
Zach Flanders
a3013c6224
updating list view
2023-04-25 00:20:54 -05:00
Zach Flanders
21d9cb5fe5
updating shelf view
2023-04-25 00:15:58 -05:00
Zach Flanders
a94a4732ec
add support for title sort to ignore initial article
2023-04-24 23:29:55 -05:00
Mouse Reeve
718939834a
Fixes check on isbn list length in LT importer
2023-04-18 10:04:20 -07:00
Jacob Torrey
84834eb5d3
Run bw-dev black to fix formatting
...
Signed-off-by: Jacob Torrey <jacob@jacobtorrey.com>
2023-04-17 15:06:41 +00:00
Mouse Reeve
ed5471c7ab
Merge pull request #2832 from bookwyrm-social/fix-api/instance
...
Fix language constant to show correct lang in API
2023-04-16 19:10:38 -07:00
Jascha Urbach
0cae89b2b6
Update wellknown.py
...
./bw-dev black
2023-04-16 17:30:27 +02:00
Jascha Urbach
f3b1b1d8e4
Fix language constant to show correct lang in API
...
api/v1/instance had "en" hardcoded as language. This fix takes LANGUAGE_CODE from settings.py/.env and takes the first two letters as response.
2023-04-16 17:28:05 +02:00
Hugh Rundle
5f5886edea
Actually fix ensure_transient_values_persist call
...
oops
2023-04-16 19:58:53 +10:00
Hugh Rundle
6f025af99f
fix ensure_transient_values_persist call
2023-04-16 19:06:04 +10:00
Hugh Rundle
74f08323d1
Merge branch 'main' into 2571
2023-04-16 18:11:39 +10:00
Hugh Rundle
fb3cb229e9
Fixes #2571
...
Persist book.subjects and add_author when form validation fails.
This does not resolve the problem of cover image uploads being dropped because this is a broader problem and is covered separately in #2760
(we should investigate the plugin ` django-file-resubmit`)
2023-04-16 17:58:03 +10:00
Mouse Reeve
290b740392
Merge pull request #2805 from WesleyAC/stop-ignoring-task-results
...
Stop ignoring task results
2023-04-15 09:03:43 -07:00
Jascha Ezra Urbach
c918617a6a
Merge branch 'main' into import-rating-parser
2023-04-15 17:21:27 +02:00
Jascha Ezra Urbach
fadbc76aaa
Merge pull request #2789 from bpeel/translatable-shelf-name
...
Fix two places where the reading status shelf name wasn’t translated
2023-04-15 16:59:59 +02:00
Jascha Ezra Urbach
d788105eeb
Merge pull request #2814 from WesleyAC/bw-dev-pick-docker-compose-command
...
Choose installed docker compose command in bw-dev
2023-04-15 16:52:38 +02:00
Jascha Ezra Urbach
dfcc61a3e1
Merge pull request #2816 from bpeel/missing-translatable-strings
...
Fix a few strings that weren’t marked as translatable
2023-04-15 16:51:51 +02:00
Jascha Urbach
e28562949b
./bw.-dev black
...
get rid of the black error.
2023-04-15 16:31:15 +02:00
Neil Roberts
bd893e29de
Add management commands to merge editions and authors
2023-04-15 11:59:40 +02:00
Neil Roberts
71e2486d01
Move the merging code from deduplicate code to common module
...
That way it can be used in a new command to merge individual items.
2023-04-15 11:59:40 +02:00
Neil Roberts
2bbc9a16ad
Fix deduplicating books that are on a shelf or in a list
...
Previously when the deduplicate_book_data script tried to merge an
edition that was on a shelf or in a list then it would fail because when
the canonical book was added to the shelf or the list then it wouldn’t
set the extra fields of the linking table for the “through” model of the
field. These would end up defaulting to NULL, but that is not valid for
some of the fields in ShelfItem and ListItem so postgres wouldn’t accept
it.
To fix that, this patch makes it skip updating fields that have a
non-autogenerated linking table. The linking table would appear as a
separate model anyway so the book will be moved via that instead.
Fixes : #2817
2023-04-15 11:59:12 +02:00
Neil Roberts
3619d8960b
Mark two strings as translatable in the getting started questionnaire
2023-04-14 16:49:00 +02:00
Neil Roberts
f520d1b7f8
Make the text on the search button translatable
2023-04-14 16:40:50 +02:00
Hugh Rundle
a0b7112c9c
Merge branch 'main' into gts
2023-04-14 18:24:02 +10:00
Hugh Rundle
98726585f6
oops black
2023-04-14 18:20:06 +10:00
Hugh Rundle
8a8af4e909
fix tests and make pylint happier
2023-04-14 18:03:51 +10:00
Hugh Rundle
123628c66a
fix tests and formatting
2023-04-13 22:33:54 +10:00
Hugh Rundle
56a062d01f
pylint fixes
2023-04-13 20:21:35 +10:00
Hugh Rundle
c7adb62831
make get_legacy_key more DRY
2023-04-13 19:48:20 +10:00
Hugh Rundle
a6676718cb
formatting
2023-04-13 13:27:51 +10:00
Hugh Rundle
e3261c6b88
fix incoming GTS mentions and DMs
...
GoToSocial sends 'tag' values as a single object if there is only one
user mentioned, rather than an array with an object inside it.
This causes Bookwyrm to reject the tag since it comes through as a
dict rather than a list.
This commit fixes this at the point the incoming AP object is transformed
so that "mention" tags are turned into a mention_user.
2023-04-13 13:21:05 +10:00
Wesley Aptekar-Cassels
43b34610a6
Choose installed docker compose command in bw-dev
...
Docker is removing support for docker-compose, and it doesn't appear to
be possible to install it anymore. Instead, it has been replaced with
compose V2 which is a docker plugin called with 'docker compose' (no
hyphen). See https://docs.docker.com/compose/compose-v2/
Thanks to @Neriderc for noticing this in #2781 .
2023-04-11 21:51:31 -04:00
Wesley Aptekar-Cassels
8e25ae34d6
Merge pull request #2782 from ranok/list_fix
...
Small quality of life improvements to list handling
2023-04-11 12:31:58 -04:00
Wesley Aptekar-Cassels
843147e16b
Merge pull request #2808 from bpeel/series-no-author
...
Don't show the series as a link if the book has no author
2023-04-11 12:25:52 -04:00
Hugh Rundle
c450947eee
update comment to identify bug
2023-04-11 18:57:55 +10:00
