Commit graph

3637 commits

Author SHA1 Message Date
Mouse Reeve cd57161489 Privacy filter for thread 2021-10-02 16:55:05 -07:00
Hugh Rundle 602664b8d7 Merge branch 'main' into groups-merge-test
Big merge of a couple of weeks' work from the main project back into this branch. :ohno:
2021-10-03 10:49:38 +11:00
Hugh Rundle f39887cf7f groups should appear before lists on user pages 2021-10-03 10:07:47 +11:00
Mouse Reeve 7caaddbb22 Get thread children with depth first recusive search 2021-10-02 15:50:09 -07:00
Hugh Rundle 1c5789f283 remove group-curated lists when user leaves group 2021-10-03 09:16:19 +11:00
Hugh Rundle a179de33bc fix incorrect wording on group selection
select a group, not a list!
2021-10-03 09:07:42 +11:00
Hugh Rundle 4ea99d1763 don't assign a group when creating non-group curated lists
same as updating a list but for if a user changes their mind about curation when initially creating a list.
2021-10-03 09:06:06 +11:00
Mouse Reeve 55a556863c Improves display on author page
Fixes #1482
2021-10-02 11:44:25 -07:00
Mouse Reeve eaa77906b2
Merge pull request #1485 from bookwyrm-social/notifications
Refactors notifications templates
2021-10-02 11:41:18 -07:00
Mouse Reeve 446d286b12
Merge pull request #1483 from bookwyrm-social/threads
Threads
2021-10-02 11:41:10 -07:00
Mouse Reeve db74538345 Update for js linter 2021-10-02 11:28:16 -07:00
Mouse Reeve b9632039f9 Link notification block to its main path 2021-10-02 11:26:22 -07:00
Mouse Reeve 2a9f8f8122 Updates curated list notification link generation 2021-10-02 10:52:35 -07:00
Mouse Reeve 5adbf2d087 Move notification items into dir 2021-10-02 10:46:09 -07:00
Mouse Reeve 0320898f4e Expands notifications views test 2021-10-02 10:42:38 -07:00
Mouse Reeve 1d79bb58e1 Better mobile display for notifications 2021-10-02 10:28:49 -07:00
Mouse Reeve 085d3270a3 Load related objects in query
Reduces query load in template
2021-10-02 10:11:27 -07:00
Mouse Reeve 8f56ad9e99 Adds report templates 2021-10-02 09:50:48 -07:00
Mouse Reeve df8f67895c Adds mention notification template 2021-10-02 08:09:57 -07:00
Mouse Reeve 29157d03fc Create snippet for notification items 2021-10-02 07:34:59 -07:00
Mouse Reeve 9d765751e8 Creates notification template directory 2021-10-02 07:32:00 -07:00
Hugh Rundle 680e547c8b add button for non-owner members to leave group 2021-10-02 21:24:26 +10:00
Hugh Rundle eed9d44cfd fix visible_to_user for groups user is a member of 2021-10-02 20:52:19 +10:00
Hugh Rundle 72e00f75c9 send notification when other group members add books to group lists 2021-10-02 20:14:53 +10:00
Hugh Rundle 3a954ca6ae improve responsive layout for groups 2021-10-02 20:05:19 +10:00
Hugh Rundle 29f18ee123 only suggest local users as potential group members 2021-10-02 19:35:57 +10:00
Hugh Rundle 2c399fe1aa fix suggested members all appearing in a column 2021-10-02 19:35:08 +10:00
Hugh Rundle 8708d71f4b group members can see lists
- fix visible_to_user for group objects (like lists)
- temporarily disable privacy_filter on group lists
2021-10-02 18:31:56 +10:00
Hugh Rundle 8496f24032 fix filters for group members to see and edit group lists 2021-10-02 18:09:15 +10:00
Hugh Rundle 832a9b9890 fix group local_path
as per Lists, we need to override get_remote_id to remove the user from the URL
2021-10-02 16:54:44 +10:00
Hugh Rundle 52a083a907 revert name change for Group, GroupMember
these were named as BookwyrmGroup and BookwyrmGroupMember due to a misunderstanding about related_name and a dodgy development environment. This naming makes more sense.
2021-10-02 16:52:34 +10:00
Hugh Rundle 21e6ed7388 complete group notifications
- notify group members when a new member accepts an invitation
- notify all group members when a member leaves or is removed
- notify ex-member when they are removed
2021-10-02 15:48:55 +10:00
Hugh Rundle f82af6382f make message about group members more generic 2021-10-02 15:48:34 +10:00
Hugh Rundle 70e0128052 non-owners can't add users to groups
- hide add-user pages from non-owners
- hide user searchbox from non-owners
- fix find-user searchbox being in wrong place where no results
2021-10-02 14:41:23 +10:00
Hugh Rundle 5237e88aba remove user button for groups 2021-10-02 13:48:53 +10:00
Hugh Rundle 0984972b05 group membership invitations
- fix display of group information on user and group pages
- send, receive, accept and reject invitations
2021-10-02 12:30:48 +10:00
Hugh Rundle 89dea44614 accepting membership fixes
- don't delete the invitation twice
- send membership information properly to notification
2021-10-02 12:29:01 +10:00
Hugh Rundle 9290655116 fix urls for group invitations 2021-10-02 12:13:34 +10:00
Hugh Rundle 80fb37b55c add has_groups tag for use on user page 2021-10-02 12:12:59 +10:00
Mouse Reeve bd463ea6fe Lint fixes 2021-10-01 18:09:11 -07:00
Mouse Reeve 29ee99c03e Styles for the thread page 2021-10-01 18:05:48 -07:00
Hugh Rundle 0f3be40957 fix group references in templates
Let's do this the sensible way huh, by using backwards references to memberships etc

Also adds filters for is_member and is_invited so we don't have to do weird things in group Views
2021-10-02 10:47:42 +10:00
Hugh Rundle 2f42161dda disambiguate groups and prep for group invitations
- rename Group to BookwyrmGroup
- create group memberships and invitations
- adjust all model name references accordingly
2021-10-02 10:10:37 +10:00
Mouse Reeve f901806574 Test to ensure incoming statuses have thread ids 2021-10-01 14:56:38 -07:00
Mouse Reeve ca4b262e72 Link to status anchor 2021-10-01 14:50:42 -07:00
Mouse Reeve 0cd55147ee Set thread id on parent status 2021-10-01 14:41:30 -07:00
Mouse Reeve 7ff040470f Use more f strings in status models test file 2021-10-01 14:26:01 -07:00
Mouse Reeve 8461fe5ec3 Adds anchor id to status 2021-10-01 14:12:49 -07:00
Mouse Reeve 565c9dfa72 Removes block div from thread markup 2021-10-01 14:12:34 -07:00
Mouse Reeve b8fd909fe3 Adds thread id to status model 2021-10-01 14:12:03 -07:00
Mouse Reeve a24fe558fc
Merge pull request #1480 from bookwyrm-social/comment-formatting
Post-processes statuses composed in modals
2021-10-01 12:00:56 -07:00
Mouse Reeve 70bf7c522f Adds tests 2021-10-01 11:23:35 -07:00
Mouse Reeve d2f80c2446 Adds test for reading status with comment 2021-10-01 10:57:56 -07:00
Mouse Reeve 7d03bfd2f6
Merge pull request #1477 from bookwyrm-social/add-edit-book
Updates for adding and editing books
2021-10-01 10:36:09 -07:00
Mouse Reeve 74d2cf646a Moves meta tags out of p tags
I guess that's not kosher
2021-10-01 10:25:23 -07:00
Mouse Reeve 428d87a351 Don't render empty html about books 2021-10-01 10:08:56 -07:00
Mouse Reeve 0928fd03a6 Update mocks in editions tests 2021-10-01 10:08:31 -07:00
Mouse Reeve 58fa3d9ad6 Fixes dl syntax 2021-10-01 09:24:26 -07:00
Mouse Reeve a7614d8c35 Moves editions page tests into separate file 2021-10-01 09:24:10 -07:00
Mouse Reeve 34948d494c Python formatting 2021-09-30 22:23:29 -07:00
Mouse Reeve 6902ffc4c3 Adds missing view file 2021-09-30 22:22:32 -07:00
Mouse Reeve bdb1d1998a Helper function for html validation 2021-09-30 22:22:20 -07:00
Mouse Reeve 9c78a9d95c test fixes 2021-09-30 22:02:07 -07:00
Mouse Reeve 6178925053 Unique form identifier for delete status button 2021-09-30 22:01:55 -07:00
Mouse Reeve ccc52287c5 More error filtering 2021-09-30 20:01:57 -07:00
Mouse Reeve 3f44389c6b Adds new test file for search 2021-09-30 13:03:36 -07:00
Mouse Reeve 92f9319fe1 Updates tests that reference self_connector 2021-09-30 11:46:17 -07:00
Mouse Reeve 1033d3d045 Updates connector tests 2021-09-30 11:33:04 -07:00
Mouse Reeve 232e4bed79 Updates migrations 2021-09-30 11:06:12 -07:00
Mouse Reeve 38f82fe660 Remove/re-add connector in migration 2021-09-30 10:55:18 -07:00
Mouse Reeve e6e44decf9 Updates migration 2021-09-30 10:47:53 -07:00
Mouse Reeve 5dd2aac600 Merge branch 'main' into search-refactor 2021-09-30 10:41:30 -07:00
Mouse Reeve 75e69eb269 Post-processes statuses composed in modals 2021-09-30 10:00:05 -07:00
Mouse Reeve 9a96df1712 Unique id for privacy fields 2021-09-29 15:58:37 -07:00
Mouse Reeve 305dcc504b Unique names for fallback forms 2021-09-29 15:52:08 -07:00
Mouse Reeve 0dc6a18201 Skip unescaped chars warning in html validator
jankily
2021-09-29 15:47:30 -07:00
Mouse Reeve 5cdfd29f9e Unqiue id for progress fields 2021-09-29 15:46:54 -07:00
Mouse Reeve 6d17b83c8c Id uniqueness fixes 2021-09-29 15:35:08 -07:00
Mouse Reeve 69195e6cd0 Fixes form close placement on reading modals 2021-09-29 15:02:50 -07:00
Mouse Reeve a8ed957e20 Fixes uuid reference in toggle button snippet 2021-09-29 15:01:56 -07:00
Mouse Reeve 47b08e7591 Moves tests into dirs and updates render checks 2021-09-29 14:21:57 -07:00
Mouse Reeve 33b3b518e8 Move views into subdirectory 2021-09-29 13:42:27 -07:00
Mouse Reeve 899e6b55a8 Updates references to book templates 2021-09-29 13:27:07 -07:00
Mouse Reeve 1e5a8dc3db Create subdirectories for book view templates 2021-09-29 13:21:11 -07:00
Mouse Reeve f0e31f730a Moves form into snippet and adds boxes around sections 2021-09-29 13:18:27 -07:00
Mouse Reeve 2d13fd0a1c Merge branch 'main' into add-edit-book 2021-09-29 12:53:46 -07:00
Mouse Reeve d36ef2bcf1 Pylint change 2021-09-29 12:42:28 -07:00
Mouse Reeve 32391dd64d Python formatting 2021-09-29 12:38:31 -07:00
Mouse Reeve 0aef011258 Don't use the format detail if it maps directly 2021-09-29 12:29:17 -07:00
Mouse Reeve 123b23728f Infer format in openlibrary import 2021-09-29 12:21:19 -07:00
Mouse Reeve 47706b5353 Use detail field on book paeg and meta 2021-09-29 11:59:09 -07:00
Mouse Reeve 54a8815f49 Updates migrations 2021-09-29 11:49:57 -07:00
Mouse Reeve 4747bb2156 Hide cover preview column if cover is unset 2021-09-29 11:36:35 -07:00
Mouse Reeve 2f93e6d723 Merge branch 'main' into book-format-choices 2021-09-29 11:33:06 -07:00
Mouse Reeve e308ca2511
Merge pull request #1476 from bookwyrm-social/progress-modal
Progress modal
2021-09-29 11:23:29 -07:00
Mouse Reeve cd54770aad Tick javascript cache buster 2021-09-29 11:12:26 -07:00
Mouse Reeve 52c6a90498 Don't redirect on http request to readthrough 2021-09-29 11:02:04 -07:00
Mouse Reeve d78c278665 Progress update flow for modal 2021-09-29 10:59:36 -07:00
Mouse Reeve cd2dcbc758
Merge pull request #1471 from bookwyrm-social/goal-cleanup
Improves html consistency for goal page
2021-09-29 10:25:34 -07:00
Mouse Reeve 4dbb09be87 Merge branch 'main' into progress-modal 2021-09-29 09:53:02 -07:00