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

9282 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bart Schuurmans
3aefbb548e Allow serving BookWyrm on a non-standard port 2024-04-24 15:30:47 +02:00
Bart Schuurmans
baea105c18 pytest.ini env values should be unquoted 
Otherwise the quotes end up in the strings.
 2024-04-24 15:30:47 +02:00
Bart Schuurmans
c73d1fff6a Remove unnecessary exceptions from validate_url_domain 2024-04-24 15:30:47 +02:00
Bart Schuurmans
3d183a393f
Merge pull request #3360 from hughrun/move-fix 
refactor Move for more redundancy
 2024-04-24 15:30:19 +02:00
Bart Schuurmans
f24fdf73b5 Update to match newer code style 2024-04-24 15:08:48 +02:00
Bart Schuurmans
839ab2fafd
Merge branch 'main' into move-fix 2024-04-24 14:56:32 +02:00
Bart Schuurmans
637f19b208
Merge pull request #3336 from Minnozz/s3-url-protocol 
Support AWS_S3_URL_PROTOCOL
 2024-04-24 14:53:55 +02:00
Bart Schuurmans
031223104f Clarify AWS_S3_URL_PROTOCOL in .env.example 2024-04-24 14:46:57 +02:00
Hugh Rundle
6684d60526
refactor Move for more redundancy 
As outlined in #3354, a use `Move` fails if the user is moving from a BookWyrm server to another BookWrym server.
This is because:

1. the original code did not announce changes to alsoKnownAs;
2. the original code always checked the locally saved profile rather than refetching the remote data;

This commit fixes both these problems by forcing `MoveUser` to always perform a "refresh" of the local data from the remote, and by saving the user with broadcast=True when updating alsoKnownAs ids.
 2024-04-22 13:35:08 +10:00
Bart Schuurmans
bf5c08dbf3 Add docker-compose.override.yml to .gitignore 2024-04-15 13:17:00 +02:00
Bart Schuurmans
be872ed672 Support AWS_S3_URL_PROTOCOL 
- Allow setting in .env
- Default to PROTOCOL (same as before)
- Propagate to django-storages so it generates the correct URLs in sass_src
 2024-04-15 13:16:51 +02:00
Bart Schuurmans
70f803a1f6
Merge pull request #3353 from dato/fix_quotation_str_pagenum 
Fix creation of quotations with no end position
 2024-04-15 13:11:55 +02:00
Adeodato Simó
4304cd4a79
use re.escape 2024-04-13 21:26:41 -03:00
Adeodato Simó
8733369605
test_quotation_page_serialization: add test with no position 2024-04-13 21:26:41 -03:00
Adeodato Simó
df78cc64a6
Quotation._format_position: do not treat page numbers as integers 
Fixes: #3352
 2024-04-13 21:26:41 -03:00
Adeodato Simó
f844abcad9
test_quotation_page_serialization: use strings for page numbers 
This follows from #3273, "Allow page numbers to be text, instead of
integers".
 2024-04-13 21:26:39 -03:00
Bart Schuurmans
21a39f8170
Merge pull request #3228 from hughrun/user-export 
Fix user exports to deal with s3 storage
 2024-04-13 22:53:58 +02:00
Hugh Rundle
c3c46144fe
add merge migration 2024-04-13 12:39:40 +10:00
Hugh Rundle
d48d312c0a
Merge branch 'main' into user-export 2024-04-13 12:26:13 +10:00
Hugh Rundle
501fb45528
export avatars to own directory 
Saving avatars to /images is problematic because it changes the original filepath from avatars/filename to images/avatars/filename.
In this PR prior to this commit, imports failed as they are looking for a file path beginning with "avatar"
 2024-04-13 12:03:35 +10:00
Bart Schuurmans
7d581759da
Merge pull request #3342 from hbrunn/main-pilkit 
[FIX] make sure to get Pillow>=10 compatible pilkit
 2024-04-11 14:52:22 +02:00
Bart Schuurmans
d5a536ae36 Change pilkit constraint to the version that does work 2024-04-11 14:45:13 +02:00
Bart Schuurmans
26f92db5d8 Merge branch 'main' into main-pilkit 2024-04-11 14:43:10 +02:00
Bart Schuurmans
5686c5ae5d
Merge pull request #3356 from Minnozz/quick-fix-frontend-ci 
Install same version of eslint in CI as in dev-tools
 2024-04-10 22:10:07 +02:00
Bart Schuurmans
9d9e64399c Install same version of eslint in CI as in dev-tools 2024-04-10 21:26:34 +02:00
Mouse Reeve
b6aba44e42
Merge pull request #3355 from bookwyrm-social/merge-migration 
Adds merge migration
 2024-04-09 06:04:15 -05:00
Mouse Reeve
3ffbb242a4 Black 2024-04-09 05:59:01 -05:00
Mouse Reeve
af0bd90c15 Adds merge migration 2024-04-09 05:57:27 -05:00
Mouse Reeve
73630331d1
Merge pull request #3299 from Minnozz/absorb 
Track which Author/Work/Edition a duplicate has been merged into
 2024-04-09 05:55:44 -05:00
Mouse Reeve
ca6dbcb483
Merge pull request #3348 from Minnozz/more-indexes 
Define more indexes for slow queries
 2024-04-04 15:18:07 -07:00
Bart Schuurmans
e1c54b2933 Remove optimizations with adverse effects 
`if not audience` actually causes the entire query to be evaluated, before .values_list() is called.
 2024-04-04 13:47:56 +02:00
Bart Schuurmans
439cb3ccaa Remove unnecessary conversions between list and set 2024-04-04 13:15:31 +02:00
Bart Schuurmans
321397a349 Specify which column DISTINCT should apply to 2024-04-03 21:28:22 +02:00
Bart Schuurmans
464a0298c6 Add index for finding active (and local) users 2024-04-03 21:27:52 +02:00
Bart Schuurmans
0501ce39cd Add index for looking up User by username 2024-04-03 21:15:24 +02:00
Bart Schuurmans
4d5a30d953 Add index for looking up KeyPair by remote id 2024-04-03 21:11:27 +02:00
Bart Schuurmans
5cfe7eca6f Add index for finding all statuses in a thread 2024-04-03 21:11:09 +02:00
Bart Schuurmans
5082806b82
Merge pull request #3338 from Minnozz/fix-nginx-location 
Make nginx config safer
 2024-04-03 19:22:16 +02:00
Mouse Reeve
d1d91f0c2b
Merge pull request #3347 from bookwyrm-social/dependabot/pip/pillow-10.3.0 
Bump pillow from 10.2.0 to 10.3.0
 2024-04-03 10:01:59 -07:00
dependabot[bot]
ea0ade955b
Bump pillow from 10.2.0 to 10.3.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.2.0 to 10.3.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.2.0...10.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-03 16:45:11 +00:00
Mouse Reeve
f085d3d0fe
Merge pull request #3346 from Minnozz/status-remote-id-index 
Add index on Status.remote_id
 2024-04-02 13:02:35 -07:00
Bart Schuurmans
4bbdd0b2d0 Add index on Status.remote_id 
This field is often used in WHERE-clauses in queries that are very slow on bookwyrm.social.
 2024-04-02 21:54:30 +02:00
Mouse Reeve
f28800af7f
Merge pull request #3339 from Minnozz/fix-file-leaks 
Fix resource leaks
 2024-03-31 12:43:19 -07:00
Bart Schuurmans
72ed878eeb
Merge pull request #3343 from Minnozz/update-codeql 
Update CodeQL workflows to v3
 2024-03-30 22:01:49 +01:00
Bart Schuurmans
f666951934 Update CodeQL workflows to v3 
https://github.blog/changelog/2024-01-12-code-scanning-deprecation-of-codeql-action-v2/
 2024-03-30 21:56:44 +01:00
Holger Brunn
fcd0087589 [FIX] make sure to get Pillow>=10 compatible pilkit 2024-03-30 01:58:41 +01:00
Bart Schuurmans
ffee29d8e2 Fix resource leaks 
Rewrite places where files (or other resources) are opened but not closed to "with" blocks, which
automatically call close() at the end of the scope.

Also simplify some tests where images need to be saved to a model field: an opened file can be
passed directly to FileField.save().
 2024-03-29 20:14:10 +01:00
Bart Schuurmans
75bc4f8cb0 Make nginx config safer 
Instead of allowing all image files anywhere, and disallowing non-image file under /images/, only
allow image files under /images/ and don't match non-image files elsewhere. They get proxied to web
instead and result in a 404 there.

For example, the old config allowed /exports/foo.jpg to be served, while the new config does not.
 2024-03-29 15:04:38 +01:00
Bart Schuurmans
e7ae0fdf93
Merge pull request #3337 from prolibre/apport-perso 
flower 2.0.1 fixes a few link bugs (particularly for favicon)
 2024-03-29 14:45:59 +01:00
Bart Schuurmans
5d597f1ca9 Use new "with ()" style 2024-03-29 14:25:08 +01:00