2
0
Fork 0
Commit graph

9656 commits

Author SHA1 Message Date
Dee Anzorge
7953a0099b nix: add changelog entry for 0.7.2-nix1 2024-01-18 18:43:03 +01:00
Dee Anzorge
1a887a0dfd Bump pyproject version to 0.7.2 2024-01-18 18:43:03 +01:00
Dee Anzorge
4ab109b4b4 Relax packaging dep
This is useful for building with poetry2nix, since it pulls in
`packaging` from Nixpkgs for building some of the deps, and `packaging`
in Nixpkgs is ahead of the previous dependency specifier.

It might be more desirable to figure out a way to get the stated version
of `packaging` into the `bookwyrm` package, but this is more expedient
at the moment.
2024-01-18 16:24:52 +01:00
Dee Anzorge
819a25da28 nix: update flake
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/bd645e8668ec6612439a9ee7e71f7eac4099d4f6' (2024-01-02)
  → 'github:NixOS/nixpkgs/842d9d80cfd4560648c785f8a4e6f3b096790e19' (2024-01-17)
• Updated input 'poetry2nix':
    'github:nix-community/poetry2nix/528d500ea826383cc126a9be1e633fc92b19ce5d' (2023-12-25)
  → 'github:nix-community/poetry2nix/e0b44e9e2d3aa855d1dd77b06f067cd0e0c3860d' (2024-01-12)
• Updated input 'utils':
    'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
  → 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15)
2024-01-18 16:20:41 +01:00
Dee Anzorge
a1bbca3fb0 Merge tag 'v0.7.2' into nix 2024-01-18 16:19:20 +01:00
Mouse Reeve
98bf187fbd Merge branch 'main' into production 2024-01-17 14:26:42 -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
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
Mouse Reeve
658140f18c Merge branch 'main' into production 2024-01-09 14:23:11 -08:00
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
Dee Anzorge
ac8088ebd7 nix: add changelog entry for 0.7.1-nix1 2024-01-05 23:51:28 +01: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
Dee Anzorge
2dccb6819a nix: update poetry2nix overrides
* drop unneeded overrides (ones upstream poetry2nix supplies now)
* use pyproject.toml where appropriate
* add bw-file-resubmit
2024-01-05 05:29:33 +01:00
Dee Anzorge
09930667cb nix: update flake
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e92039b55bcd58469325ded85d4f58dd5a4eaf58' (2023-11-29)
  → 'github:NixOS/nixpkgs/bd645e8668ec6612439a9ee7e71f7eac4099d4f6' (2024-01-02)
• Updated input 'poetry2nix':
    'github:nix-community/poetry2nix/7acb78166a659d6afe9b043bb6fe5cb5e86bb75e' (2023-12-01)
  → 'github:nix-community/poetry2nix/528d500ea826383cc126a9be1e633fc92b19ce5d' (2023-12-25)
• Updated input 'utils':
    'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12)
  → 'github:numtide/flake-utils/4022d587cbbfd70fe950c1e2083a02621806a725' (2023-12-04)
2024-01-05 02:41:49 +01:00
Dee Anzorge
ad2f198b15 Bump version in pyproject.toml to 0.7.1 2024-01-05 02:40:24 +01:00
Dee Anzorge
953aca29ba Merge tag 'v0.7.1' into nix 2024-01-05 02:39:23 +01: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
Mouse Reeve
d637b8033f Merge branch 'main' into production 2024-01-03 14:48:59 -08: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
381490e31d Adds management command to clear all deleted user data 2024-01-02 10:50:46 -08:00
Mouse Reeve
addfee0607
Merge pull request #3182 from bookwyrm-social/broken-migration
Removes part of migration causing upgrade issues
2024-01-02 10:50:35 -08:00
Mouse Reeve
2a85378456 Removes part of migration causing upgrade issues 2024-01-02 09:57:41 -08:00
Mouse Reeve
d9a640c809 Fixes version number 2024-01-02 08:36:42 -08:00
Mouse Reeve
b6f7a5c257 Bump version to 0.7.1. 2024-01-02 08:36:05 -08:00
Mouse Reeve
439b0bcd27 Merge branch 'main' into production 2024-01-02 08:32:10 -08:00
Mouse Reeve
0756c5ac5c
Merge pull request #3180 from bookwyrm-social/version-0-7-0
Version 0.7.0 miscellenea
2024-01-01 19:58:15 -08:00
Mouse Reeve
913a19c8f0 Formats migration file 2024-01-01 19:33:49 -08:00
Mouse Reeve
e2249f2515 Updates locales 2024-01-01 19:30:03 -08:00
Mouse Reeve
f72ada4780 Updates javascript cache buster just in case 2024-01-01 19:29:43 -08:00