Bart Schuurmans
471233c1dc
Use different export job fields for the different storage backends
...
This way, the database definition is not depdendent on the runtime configuration.
2024-03-24 12:46:42 +01:00
Bart Schuurmans
073f62d5bb
Add exports_volume to docker-compose.yml
...
Exports should be written to a Docker volume instead of to the bind mount (= source directory). This
way they are shared between different containers even when they run on different machines.
2024-03-24 12:08:29 +01:00
Bart Schuurmans
a770689245
Merge branch 'main' into user-export
2024-03-24 12:07:14 +01:00
Bart Schuurmans
69f464418d
Remove problematic migration
...
This migration is dependent on the runtime configuration (.env); a structural fix will follow.
2024-03-24 12:06:44 +01:00
Bart Schuurmans
f11c80162a
Merge pull request #3331 from Minnozz/revert-docker-mount-ro
...
Revert "docker-compose.yml: make all bind mounts read only"
2024-03-24 11:30:56 +01:00
Bart Schuurmans
7c2fa746ae
Revert "docker-compose.yml: make all bind mounts read only"
...
This reverts commit 864304f128
2024-03-24 11:23:23 +01:00
Hugh Rundle
03587dfdc7
migrations
2024-03-24 20:56:20 +11:00
Hugh Rundle
dd27684d4b
set signed s3 url expiry with env value
...
Adds S3_SIGNED_URL_EXPIRY val to .env and settings (defaults to 15 mins)
Note that this is reset every time the user loads the exports page
and is independent of the _creation_ of export files.
2024-03-24 20:53:49 +11:00
Bart Schuurmans
caebebeb37
Merge pull request #3261 from bSolt/book-series-3256
...
Add book series by title in feed posts
2024-03-23 20:01:03 +01:00
Bart Schuurmans
592914dc91
Render series number with comma and outside of link on book page
2024-03-23 19:51:20 +01:00
Bart Schuurmans
2915133223
Merge branch 'main' into book-series-3256
2024-03-23 19:37:07 +01:00
Bart Schuurmans
2d2ccd51df
Factor out book series info into separate template
2024-03-23 19:35:24 +01:00
Bart Schuurmans
4a690e675a
BookDataModel: add dry_run argument to merge_into
2024-03-23 19:28:57 +01:00
Bart Schuurmans
fb82c7a579
Add test for merging authors
2024-03-23 19:28:57 +01:00
Bart Schuurmans
6f191acb27
BookDataModel: fix absorbing data from array and partial date fields
2024-03-23 19:28:57 +01:00
Bart Schuurmans
7fb079cb43
PartialDate: fix __eq__ method
2024-03-23 19:28:57 +01:00
Bart Schuurmans
7066e2815b
BookDataModel.merge_into: return and log absorbed fields
2024-03-23 19:28:57 +01:00
Bart Schuurmans
e04cd79ff8
Redirect to new URL when a merged object is requested
2024-03-23 19:28:57 +01:00
Bart Schuurmans
5e123972e8
BookDataModel: implement merge_into method
2024-03-23 19:28:57 +01:00
Bart Schuurmans
b3753ab6da
Add MergedBookDataModel
2024-03-23 19:28:57 +01:00
Bart Schuurmans
b8995bd4b1
Add tests for author search
2024-03-23 19:26:51 +01:00
Bart Schuurmans
769d9726e5
Add book search test cases for author aliases
2024-03-23 19:26:51 +01:00
Bart Schuurmans
36222afa79
Switch author search from TrigramSimilarity to SearchQuery
2024-03-23 19:26:51 +01:00
Bart Schuurmans
0795b4d171
Include Author aliases in Book search vector
2024-03-23 19:26:51 +01:00
Bart Schuurmans
2de35f3fc7
Calculate Author search vector with name and aliases
2024-03-23 19:26:51 +01:00
Mouse Reeve
bac52eef3e
Merge pull request #3275 from ccamara/wikidata
...
Add wikidata field for authors
2024-03-23 08:12:09 -07:00
Mouse Reeve
8bbac458a6
Merge pull request #3217 from dato/switch_edition_invalidate_active_shelves
...
Invalidate `active_shelf` when switching editions
2024-03-23 07:59:40 -07:00
Mouse Reeve
5b71e94888
Merge branch 'main' into user-export
2024-03-23 07:55:46 -07:00
Mouse Reeve
a914a44fba
Removes unnecessary redeclaration of wikidata model field in Author
2024-03-23 07:54:54 -07:00
Mouse Reeve
8e088a6d53
Merge branch 'main' into switch_edition_invalidate_active_shelves
2024-03-23 07:53:24 -07:00
Mouse Reeve
b508b4cd33
Merge pull request #3323 from Minnozz/docker-bind-ro
...
Docker: make bind mounts of source code read only
2024-03-23 07:51:00 -07:00
Mouse Reeve
886d6ec9f7
Merge branch 'main' into docker-bind-ro
2024-03-23 07:48:27 -07:00
Mouse Reeve
21f75da75e
Merge pull request #3328 from Minnozz/escape-query-in-link
...
Escape search query in generated URLs
2024-03-23 07:46:04 -07:00
Mouse Reeve
20db968315
Merge pull request #3322 from Minnozz/fix-font-download
...
Fix font download
2024-03-23 07:36:43 -07:00
Bart Schuurmans
c3d25c59c5
Escape search query in generated URLs
...
Otherwise, a query containing '&' or other special characters results in a broken URL.
2024-03-21 16:48:34 +01:00
Bart Schuurmans
3cde6dbe5a
Merge pull request #3326 from Minnozz/black-required-version
...
black: specify major version 22 only
2024-03-21 16:30:56 +01:00
Bart Schuurmans
682bb3b62f
dev-tools: relax black version constraint
2024-03-21 16:25:29 +01:00
Bart Schuurmans
b5b9eddaf0
CI: relax black version constraints
2024-03-20 12:46:37 +01:00
Bart Schuurmans
ab430e0208
requirements.txt: add black
...
This way, IDEs can be set up to use the black version from the environment instead of a globally
available/bundled black version.
2024-03-20 12:43:17 +01:00
Bart Schuurmans
e13e4237f4
black: specify required-version
...
This ensures consistent formatting among different contributors / development setups.
https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html#required-version
2024-03-20 12:26:21 +01:00
Bart Schuurmans
762786839c
Merge pull request #3134 from dato/trigger_migrations
...
Support trigger migrations
2024-03-20 12:11:34 +01:00
Bart Schuurmans
4ca52c0b38
Merge branch 'main' into trigger_migrations
2024-03-20 11:47:54 +01:00
Bart Schuurmans
6a87713f9f
Recalculate all book search vectors after fixing the author trigger
2024-03-20 11:45:12 +01:00
Mouse Reeve
d08147c6d9
Merge pull request #3244 from bookwyrm-social/dependabot/pip/pillow-10.2.0
...
Bump pillow from 10.0.1 to 10.2.0
2024-03-19 15:10:30 -07:00
Bart Schuurmans
f423834bd0
Catch the correct exception type from Pillow
2024-03-19 12:42:52 +01:00
Mouse Reeve
d304ceb437
Merge pull request #3324 from bookwyrm-social/dependabot/pip/django-3.2.25
...
Bump django from 3.2.24 to 3.2.25
2024-03-18 15:05:30 -07:00
dependabot[bot]
47afe34d97
Bump django from 3.2.24 to 3.2.25
...
Bumps [django](https://github.com/django/django ) from 3.2.24 to 3.2.25.
- [Commits](https://github.com/django/django/compare/3.2.24...3.2.25 )
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-03-18 21:48:21 +00:00
Bart Schuurmans
4d23edddca
Make sure /images/ and /static/ exist now that the bind mount is read only
...
Otherwise the static_volume and media_volume can't be mounted there.
2024-03-18 21:35:12 +01:00
Bart Schuurmans
68cb94daf2
docker-compose.yml: don't automatically start dev-tools by assigning profile
2024-03-18 21:34:51 +01:00
Bart Schuurmans
864304f128
docker-compose.yml: make all bind mounts read only
...
Except dev-tools, since it needs to be able to change the source.
2024-03-18 21:34:09 +01:00
