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

9369 commits

This branch
This branch
All branches
Author SHA1 Message Date
Milan
a59dcfc890 nginx: fix missing ttf static files 2024-01-18 17:03:02 +01:00
Rohan Sureshkumar
8e2649ba3b Issue-3187: change variable name and code formatting 2024-01-18 21:23:25 +05:30
Rohan
d73141792d
Merge branch 'main' into issue-3187 2024-01-18 21:19:20 +05:30
Hugh Rundle
469172947b
cleanup and linting 2024-01-18 18:43:45 +11:00
Hugh Rundle
833f26fd0e
Merge branch 'main' into user-export 2024-01-18 18:24:56 +11:00
Mouse Reeve
fb5fae4251
Merge pull request #3219 from bSolt/issue-3178 
Fix awkward clipping on about page
 2024-01-17 15:31:52 -08:00
Mouse Reeve
c22f189c86
Merge pull request #3216 from dato/dev-tools_require_bookworm 
Ensure dev-tools uses bookworm
 2024-01-17 15:31:43 -08:00
Mouse Reeve
61a6ee29d8
Merge pull request #3224 from hughrun/move-fix 
Pass correct user id in Move notification
 2024-01-17 14:25:28 -08:00
Mouse Reeve
a585321ef9
Merge pull request #3226 from hughrun/disable-exports 
Disable user exports
 2024-01-17 14:23:29 -08:00
Hugh Rundle
45d6f1f890
Merge pull request #3215 from ccamara/export_bookshelf 
Export bookshelves and review date
 2024-01-17 21:20:32 +11:00
Hugh Rundle
b990d9ccd8
Pass correct user id in Move notification 
We were passing the *requesting* user's moved_to value to the Move notification template, instead of the id of the user that they are being notified about.
Additionally, the id_to_username template tag had no fallback for if the user_id is None.

This resolves both problems and removes an unnecessary space in a template for when the logged in user made the move.

Fixes #3196
 2024-01-17 21:06:04 +11:00
Hugh Rundle
ea7f3c297e
allow js and css 2024-01-17 20:12:06 +11:00
Hugh Rundle
d640e4ac96
disable user exports by default 
- new setting to enable user exports defaults to False
- add setting to enable and disable user exports
- do not allow user exports when using s3 storage
- do not serve non-image files from /images/ (requires update to nginx settings)
- increase default file upload limit to 100MB to enable user exports to be imported (can be changed in .env)
 2024-01-16 21:32:13 +11:00
Carlos Camara
ddbda3ab9c Fix test_export 2024-01-16 08:12:59 +00:00
bSolt
76a3874662 add bulma classes to fix awkward spacing 2024-01-15 23:25:52 -07:00
Rohan
8144507893
Merge branch 'main' into issue-3187 2024-01-15 17:25:36 +05:30
Rohan Sureshkumar
70adf878e8 Merge branch 'issue-3187' of https://github.com/rsk2/bookwyrm into issue-3187 2024-01-15 17:23:17 +05:30
Rohan Sureshkumar
5ef104b802 Issue-3187: addressing review comments 2024-01-15 17:22:33 +05:30
Hugh Rundle
d4d2734dab
ignore exports dir 2024-01-14 14:14:20 +11:00
Hugh Rundle
62cc6c298f
oops 
- remove test export files
- check in emblackened files
 2024-01-14 12:19:59 +11:00
Hugh Rundle
cbd08127ef
initial work on fixing user exports with s3 
- custom storages
- tar.gz within bucket using s3_tar
- slightly changes export directory structure
- major problems still outstanding re delivering s3 files to end users
 2024-01-14 12:14:44 +11:00
Adeodato Simó
eb13eb9882
Invalidate active_shelf when switching editions 2024-01-13 19:00:57 +01:00
Adeodato Simó
9a487b0442
Ensure dev-tools uses bookworm 
In 1937177e1 ("dev-tools: use apt source for Node instead of setup script"),
I introduced the use of `Signed-By` with a public key block, which is only
supported in bookworm (bullseye only supports fingerprints, TTBOMK).

Python's Docker images already use bookworm by default, but we explicitly
require it now to avoid build errors if someone has a very old image laying
around (see, e.g., #3190).

(This can be dropped after Debian 13 ‘trixie’ is released.)
 2024-01-13 17:55:21 +01:00
Carlos Camara
854eb36618 Export bookshelves and review date 2024-01-13 16:47:51 +00:00
Hugh Rundle
b04ebe397b
Merge pull request #3189 from ccamara/2965_export_readthrough 
Export ReadThrough in the csv export
 2024-01-12 16:35:41 +11:00
Hugh Rundle
5d13bf8e49
Merge branch 'main' into 2965_export_readthrough 2024-01-12 16:12:01 +11:00
Rohan
6dc95a82d6
Merge branch 'bookwyrm-social:main' into issue-3187 2024-01-09 17:06:22 +05:30
Rohan Sureshkumar
1a682753c0 Issue-3187: changes 2024-01-09 15:31:05 +05:30
Mouse Reeve
a4599d0374
Merge pull request #3205 from bookwyrm-social/revert-3079-deleted_user_follow_request 
Revert "Don't show notification for user follow request if the user is inactive"
 2024-01-08 10:28:27 -08:00
Mouse Reeve
83ff880603
Revert "Don't show notification for user follow request if the user is inactive" 2024-01-07 08:31:48 -08:00
Carlos Camara
ce18d343e8 Fix pylint error and code format 2024-01-06 09:55:39 +01:00
Carlos Camara
93cab480d6 Code format 2024-01-06 09:50:14 +01:00
Mouse Reeve
1966f1d9a3
Merge pull request #3199 from bookwyrm-social/dependabot/pip/pycryptodome-3.19.1 
Bump pycryptodome from 3.16.0 to 3.19.1
 2024-01-05 16:54:55 -08:00
dependabot[bot]
f267fc3235
Bump pycryptodome from 3.16.0 to 3.19.1 
Bumps [pycryptodome](https://github.com/Legrandin/pycryptodome) from 3.16.0 to 3.19.1.
- [Release notes](https://github.com/Legrandin/pycryptodome/releases)
- [Changelog](https://github.com/Legrandin/pycryptodome/blob/master/Changelog.rst)
- [Commits](https://github.com/Legrandin/pycryptodome/compare/v3.16.0...v3.19.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-05 17:42:04 +00:00
Wesley Aptekar-Cassels
6cd2c91135 Allow page numbers to be text, instead of integers. 
Fixes: #2640
 2024-01-04 19:09:39 -05:00
Carlos Camara
c2622a510c Change else statement to None vs "" 2024-01-04 11:40:40 +01:00
Carlos Camara
ebcc81dd73 Revert changes to default book 
These changes were introduced by mistake in my previous commit.
 2024-01-04 11:33:26 +01:00
Carlos Camara
30c9ec9611 Prevent lint error 
See @hughrun 's explanation https://github.com/bookwyrm-social/bookwyrm/pull/3189#issuecomment-1876145423
 2024-01-04 11:28:17 +01:00
Carlos Camara
51cb70d344 Change readhtrough order 2024-01-04 11:27:17 +01:00
Carlos Camara
9acb5f66fe Convert DateTime to date 2024-01-04 11:26:44 +01:00
Carlos Camara
ae5950f187 Add readthrough fields to text_export.py 2024-01-04 11:10:38 +01:00
Carlos Camara
766a2163dd Code formatting 2024-01-03 20:41:31 +01:00
Carlos Camara
db8c686dd3 Include book Readtrhough in the csv export 2024-01-03 15:43:15 +01:00
Mouse Reeve
597378bb78
Merge pull request #3183 from bookwyrm-social/erase_user_command 
Adds management command to clear all deleted user data
 2024-01-02 20:13:03 -08:00
Mouse Reeve
9c3e6384f8
Merge pull request #3118 from rosschapman/let-a-user-search-within-their-books 
Let a user search books within their shelves
 2024-01-02 18:37:33 -08:00
Mouse Reeve
01db77a745 Adds success message 2024-01-02 18:29:55 -08:00
Mouse Reeve
d287581620 Fixes html validation error 2024-01-02 13:31:18 -08:00
Mouse Reeve
193a1c7d54 updates wording and fixes get or create logic 2024-01-02 13:28:25 -08:00
Mouse Reeve
8be9e91d21 Re-use schedules rather than creating new ones 2024-01-02 13:18:26 -08:00
Mouse Reeve
f36af42f41 Adds view to see scheduled tasks 2024-01-02 13:05:44 -08:00