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

6751 commits

Author SHA1 Message Date
Mouse Reeve 6d5752fb4e Adds merge migration for page numbering fix 2024-02-03 07:40:23 -08:00
Mouse Reeve 37aa7ad2f6 Merge branch 'freeform-page-number' of github.com:WesleyAC/bookwyrm into WesleyAC-freeform-page-number 2024-02-03 07:38:02 -08:00
Mouse Reeve 45cc3dc979
Merge pull request #3249 from dato/cookie_age_setting 
Set SESSION_COOKIE_AGE from environment
 2024-02-03 07:03:12 -08:00
Adeodato Simó 500e4eb4f5
Merge from main to avoid conflicts 2024-01-25 20:27:54 +01:00
Adeodato Simó 82f9aa9da4
Set SESSION_COOKIE_AGE from environment, default to one month 
While we do wish for a longer maximum age (up to one year, see #3082),
we only want to do that after termination of active sessions is
implemented (see #2278).

In the meantime, by reading and setting the variable from settings,
we allow site admins to alter the default.
 2024-01-25 20:27:24 +01:00
Rohan Sureshkumar c4596544a3 Issue-3187: fix failing tests 2024-01-24 19:18:46 +05:30
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
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 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 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 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
Carlos Camara 854eb36618 Export bookshelves and review date 2024-01-13 16:47:51 +00: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 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
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 381490e31d Adds management command to clear all deleted user data 2024-01-02 10:50:46 -08:00
Mouse Reeve 2a85378456 Removes part of migration causing upgrade issues 2024-01-02 09:57:41 -08:00
Mouse Reeve 913a19c8f0 Formats migration file 2024-01-01 19:33:49 -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 ca79cb1ca7
Merge pull request #3054 from bookwyrm-social/user-migration 
User migration via export file
 2024-01-01 19:04: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
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