Commit graph

8964 commits

Author SHA1 Message Date
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
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
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
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
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
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
Mouse Reeve
86d79f537a Adds merge migration 2024-01-01 19:29:24 -08:00
Mouse Reeve
fb16806afe
Merge pull request #3177 from dato/naturalday_partial_fixes
Adjustments to naturalday_partial
2024-01-01 19:16:16 -08:00
Mouse Reeve
ffeca9f908
Merge pull request #3150 from dato/get_representative_atomic
Make get_representative() atomic
2024-01-01 19:14:19 -08:00
Mouse Reeve
45d33c37ea
Merge pull request #3175 from dato/prefer_nodesource
dev-tools: ensure we install Node from upstream
2024-01-01 19:12:02 -08:00
Mouse Reeve
ca79cb1ca7
Merge pull request #3054 from bookwyrm-social/user-migration
User migration via export file
2024-01-01 19:04:43 -08:00
Mouse Reeve
5647477ba7
Merge pull request #3154 from bookwyrm-social/ukrainian
Adds Ukranian locale and updates locales
2024-01-01 18:54:43 -08:00
Adeodato Simó
4711b3bc19
naturalday_partial: simplify/refactor 2024-01-01 18:36:31 +01:00
Adeodato Simó
0d908b594c
naturalday_partial: do not naturalize dates with missing parts 2024-01-01 18:36:31 +01:00
Adeodato Simó
0e3936cb61
naturalday_partial: do naturalize date and datetime objects 2024-01-01 18:36:30 +01:00
Dato Simó
09b2dea995 dev-tools: ensure we install Node from upstream
Fixes: #3173 ("`bw-dev build` fails")
2024-01-01 09:01:21 -03:00
Mouse Reeve
3754718916 Updates locales again 2023-12-30 15:54:06 -08:00
Mouse Reeve
9b3f4933ac Fixes language code for Ukrainian 2023-12-17 06:57:05 -08:00
Mouse Reeve
47cdc14bc0
Update bookwyrm/migrations/0189_alter_user_preferred_language.py
Co-authored-by: Demid <grrrr@protonmail.com>
2023-12-17 06:54:39 -08:00
Mouse Reeve
430e4eb90d
Update bookwyrm/settings.py
Co-authored-by: Demid <grrrr@protonmail.com>
2023-12-17 06:52:49 -08:00
Ross Chapman
b728bb4323 Uses block trans 2023-12-16 12:05:35 -08:00
Ross Chapman
a4172214d1 Updates size of filters panel label 2023-12-15 13:17:23 -08:00
Ross Chapman
fb36958444 Removes unused variable 2023-12-14 13:47:51 -08:00
Ross Chapman
44d21d1ba4 Updates view logic 2023-12-14 13:04:45 -08:00
Ross Chapman
bd3acdbf31 Puts string in template 2023-12-14 12:33:27 -08:00
Ross Chapman
4a4046a704 Shows message if empty and renames "search" to "filter" 2023-12-14 11:30:01 -08:00
Ross Chapman
7cca199a11 Merge branch 'main' into let-a-user-search-within-their-books 2023-12-14 10:25:05 -08:00
Hugh Rundle
1649457372
Merge pull request #3156 from hughrun/user-migration
fix upsert_statuses
2023-12-13 20:59:47 +11:00