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
a36bbaf809
Merge pull request #1486 from bookwyrm-social/author-display
...
Improves display on author page
2021-10-02 11:55:17 -07: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
5f193f35bf
Merge pull request #1484 from bayocr/add-some-spanish-translations
...
Add some missing Spanish translations
2021-10-02 09:53:39 -07:00
Mouse Reeve
8f56ad9e99
Adds report templates
2021-10-02 09:50:48 -07:00
bayocr
16651728a8
Fix word from %(name) to %(name)s
2021-10-02 11:54:43 -04: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
bayocr
a7c9e60bb2
Fix fuzzy translated in Spanish locale
2021-10-01 22:22:21 -04: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
bayocr
445ed7f7da
Add some missing Spanish translations
2021-10-01 21:13:54 -04: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
