mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-01 14:01:35 +00:00
Code Issues Projects Releases Wiki Activity
9310 commits 21 branches 36 tags 103 MiB
Commit graph

9310 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ross Chapman
68f54cf5a4 Initial commit to create PR 2023-11-16 17:20:23 -08:00
Matt Lehrer
f4da9fbf34 remove unnecessary loop. 
ReviewRatings are a subclass and are included in the models.Review block
 2023-11-16 20:37:46 +01:00
Matt Lehrer
bf81192d73
Merge branch 'main' into move-ratings-and-reviews-when-switching-editions 2023-11-16 10:49:05 +01:00
Sean Molenaar
e144ce19fa
fix: add include import from django.urls 2023-11-16 10:48:06 +01:00
Matt Lehrer
bd920a4630 move reviews to new edition 2023-11-16 10:38:45 +01:00
Matt Lehrer
7684101f15 move ratings to new edition 2023-11-16 10:38:41 +01:00
Mouse Reeve
06568aab88
Merge pull request #3105 from dato/notify_invitation_request 
Create notifications for incoming invite requests
 2023-11-15 17:27:34 -08:00
Mouse Reeve
5bf27d4fb2
Merge pull request #3115 from bookwyrm-social/dependabot/pip/aiohttp-3.8.6 
Bump aiohttp from 3.8.5 to 3.8.6
 2023-11-15 17:12:59 -08:00
Mouse Reeve
1a7a843dea Re-creates migrations and removes failing test 
I think the test was failing because it was extremely brittle, not
because of anything wrong with the code itself.
 2023-11-15 17:08:15 -08:00
Mouse Reeve
62f985edb8 Merge branch 'main' into user-migration 2023-11-15 16:46:18 -08:00
Hugh Rundle
54ec5e2ae0
Fix migrations properly (#3116) 
* Revert "fix migrations and linting"
This reverts commit 53e410627f.
* really fix migrations
 2023-11-15 19:54:16 +11:00
dependabot[bot]
63530294d4
Bump aiohttp from 3.8.5 to 3.8.6 
Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.8.5 to 3.8.6.
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](https://github.com/aio-libs/aiohttp/compare/v3.8.5...v3.8.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-11-14 23:35:55 +00:00
Sean Molenaar
da4214ad61 feat: add OAuth authentication 
Issue GH-2292
 2023-11-14 14:18:35 +01:00
Adeodato Simó
01d4381898
Create notifications for incoming invite requests 
Closes: #2066
 2023-11-14 07:09:04 -03:00
Mouse Reeve
ab9cea1742
Merge pull request #3112 from dato/makemigrations_check 
Check no missing migrations in django-tests workflow
 2023-11-13 15:21:44 -08:00
Adeodato Simó
b81170c149
Add missing migration from #3099 2023-11-13 19:56:00 -03:00
Adeodato Simó
a884825b3c
Check no missing migrations in django-tests workflow 2023-11-13 19:56:00 -03:00
Hugh Rundle
bbc78f03ae
fix DB migrations (#3111) 
fix migrations and linting
 2023-11-14 07:21:27 +11:00
Hugh Rundle
d5762f1d52
Merge branch 'main' into user-migration 2023-11-13 21:17:07 +11:00
Hugh Rundle
891b72c79c
update user export file to use ActivityPub objects where possible. (#3109) 
* add more context to user export page
* fix BookData fields wrong for files
* use to_activity and to_model where possible
* fixes for import and export
- use AP JSON where possible
- minor template wording updates
* import fixes and updates tests
* minor cleanup
* remove todo for mastodon
 2023-11-13 21:14:03 +11:00
Mouse Reeve
ddf94f8714
Merge pull request #3097 from Tak/fix-initdb 
Fix `bw-dev initdb`
 2023-11-12 09:37:42 -08:00
Mouse Reeve
43324cf43a
Merge pull request #3099 from dato/notification_type_top_level 
Create NotificationType as class, not through API
 2023-11-12 09:34:28 -08:00
Hugh Rundle
1bedcdaebd
Merge branch 'main' into file-resubmit 2023-11-11 13:14:52 +11:00
Hugh Rundle
f3fc5f6179
add file_resubmit to DUMMY caches settings 2023-11-11 12:45:04 +11:00
Adeodato Simó
99a9dbe5f4
Create NotificationType as class, not through API 
This way, we need not list every value again to create the enum.

N.B.: enum values are now accessed as `models.NotificationType.FOO`,
instead of `models.Notification.FOO`.
 2023-11-09 22:43:36 -03:00
Adeodato Simó
be9d92b1c2
Remove last references to "seal" in partial_date.py and migration 2023-11-09 14:00:45 -03:00
Adeodato Simó
edfa6b18a1
Rename utils.sealed_date module (and tests) to utils.partial_date 2023-11-09 14:00:44 -03:00
Adeodato Simó
fa80aa54a9
SealedDate renames, pt. 2 
• SealedDate -> PartialDate
• MonthSeal  -> MonthParts
• YearSeal   -> YearParts
 2023-11-09 14:00:44 -03:00
Adeodato Simó
0e4c5ed439
SealedDate renames, pt. 1 
• SealedDateField      -> PartialDateModel
• SealedDateFormField  -> PartialDateFormField
• SealedDateDescriptor -> PartialDateDescriptor
 2023-11-09 14:00:44 -03:00
Adeodato Simó
c120fa8c87
Rename: templatetags/{sealed_dates => date_ext}.py 2023-11-09 14:00:44 -03:00
Adeodato Simó
2bb7652dfe
Update partial date migration to latest main 2023-11-09 14:00:22 -03:00
Adeodato Simó
e928027e16
Merge from main for up-to-date migrations 2023-11-09 14:00:14 -03:00
Adeodato Simó
dccac11527
PartialDateField: allow incoming dates without timezone 2023-11-09 13:04:09 -03:00
Levi Bard
ebcacfc6c5 Fix bw-dev initdb 2023-11-09 12:57:45 +01:00
Mouse Reeve
44b14f4933 Fixes workflow errors 2023-11-08 16:00:10 -08:00
Mouse Reeve
774b1095a3
Merge pull request #3094 from hughrun/activitypub-files 
fix missing types in `BookData` file fields
 2023-11-08 15:27:40 -08:00
Mouse Reeve
0bb4b0d71d Changes to how images are serialized 
I'm just going to see if any tests fail?
 2023-11-08 15:24:47 -08:00
Hugh Rundle
2248206a66
fix missing types in BookData file fields 
activitypub.BookData includes fields for 'files' and 'fileLinks'.
This is a problem because BookData is inherited by Book and Author, neither of which have 'files' as a field in the main model.
Additionally, Author doesn't have a value for 'file_links'.
When serializing to JSON, BookData therefore throws 'TypeError: Object of type _MISSING_TYPE is not JSON serializable'

This fixes the problem by removing links and moving fileLinks to activitypub.Book.
 2023-11-08 18:30:49 +11:00
Hugh Rundle
0a5e1048ce
Add more info to user export page (#3093) 
- match page title to menu
- change description on IMPORT page from 'readthroughs' to 'reading history'
- provide more information on export page about what is and is not included.
 2023-11-07 12:09:06 +11:00
Mouse Reeve
9ddd631549
Merge pull request #3089 from bookwyrm-social/notification-and-download-links 
UI changes for notification and download link in import/export flow
 2023-11-06 16:31:09 -08:00
Mouse Reeve
1b958a9b31
Merge pull request #3091 from hughrun/notification-and-download-links 
show filesize on user downloads page
 2023-11-06 16:27:14 -08:00
Hugh Rundle
282f7dd8d6
show filesize on user downloads page 
- add column to user download page to display filesize
- adds a filter to display file sizes
- don't download the user downloads page from notifications ;)
 2023-11-07 11:04:11 +11:00
Mouse Reeve
e152b625fa
Merge pull request #3090 from bookwyrm-social/user-migration-instructions 
User migration instructions
 2023-11-06 14:34:52 -08:00
Mouse Reeve
ee88c3b914
Merge pull request #3081 from bookwyrm-social/handle-isbn-error 
Fix error produced when an unexpected ISBN format is used
 2023-11-06 11:06:46 -08:00
Mouse Reeve
8663e204c7
Merge pull request #3079 from bookwyrm-social/deleted_user_follow_request 
Don't show notification for user follow request if the user is inactive
 2023-11-06 11:05:50 -08:00
Mouse Reeve
e7a1572450
Merge pull request #3086 from bookwyrm-social/user-deletion 
Erase user data and statuses on account deletion
 2023-11-06 09:49:06 -08:00
Mouse Reeve
3f038b4d67 Moves if to the right place 2023-11-06 09:42:58 -08:00
Mouse Reeve
06d822d9e0 Alternative format for user import guide 2023-11-06 09:35:04 -08:00
Mouse Reeve
85d1760b97 Changes recent exports table 
I thought both dates seemed less necessary (happy to be told otherwise)
and the download link should be more explicit
 2023-11-06 08:41:36 -08:00
Mouse Reeve
716e64de68 Changes notification links for user import/export 
I found it unexpected that the export notification linked me directly to
the file, and wanted the import link to lead me to the import page
 2023-11-06 08:27:30 -08:00