mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-05-05 01:59:01 +00:00
Code Issues Projects Releases Wiki Activity
9295 commits 13 branches 35 tags 115 MiB
Commit graph

9295 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bart Schuurmans 7690247ab4 Font download: log the exact error 2024-03-18 20:34:47 +01:00
Bart Schuurmans 3367b20965 Font download: destination dir is allowed to exist 
Without this argument, an existing directory (but not the file) causes an error.
 2024-03-18 20:23:31 +01:00
Bart Schuurmans 748418590f docker-compose.yml: mount static_volume for flower 
Because flower also uses BookwyrmConfig, it wants to download fonts, and will download them to an
incorrect location if the static_volume is not mounted.
 2024-03-18 20:22:19 +01:00
Bart Schuurmans ccf2b16d73 requirements.txt: make typing-Pillow match Pillow 2024-03-18 19:52:40 +01:00
dependabot[bot] 3be227fc86 Bump pillow from 10.0.1 to 10.2.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.1 to 10.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/10.0.1...10.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-18 19:51:24 +01:00
Adeodato Simó a6dc5bd13f
Make get_file_size robust against typing errors 2024-03-18 15:03:07 -03:00
Adeodato Simó 518da3b9cf Merge from main into 'user-export' 
Conflicts:
	bookwyrm/models/bookwyrm_export_job.py
	requirements.txt
 2024-03-18 14:47:34 -03:00
Adeodato Simó 2cf7ed477d Consolidate test_posgres.py into test_book_search.py 
These are tests I missed when first writing trigger tests in
test_book_search.py.
 2024-03-17 22:38:44 -03:00
Adeodato Simó cceccd1ecf
Merge from main into 'trigger_migrations' 
Conflicts:
	requirements.txt
 2024-03-17 21:54:15 -03:00
Adeodato Simó beb49af514
Upgade django-pgtrigger to 4.11 2024-03-17 21:46:34 -03:00