Commit Graph

609 Commits

Author SHA1 Message Date
73a8f89bee Merge branch 'main' into bookwyrm-groups 2021-10-06 11:37:38 -07:00
094931d6d1 Display half-stars in generated statuses for federation.
Fixes #1505
2021-10-06 11:37:27 +02:00
3a90311129 update indenting for linter 2021-10-04 22:20:02 +11:00
0d5c20bcde remove_from_group button updates
- enable blocked users to be removed
- make "remove" button more subtle
2021-10-03 13:57:21 +11:00
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
29f18ee123 only suggest local users as potential group members 2021-10-02 19:35:57 +10:00
5237e88aba remove user button for groups 2021-10-02 13:48:53 +10:00
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
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
ca4b262e72 Link to status anchor 2021-10-01 14:50:42 -07:00
8461fe5ec3 Adds anchor id to status 2021-10-01 14:12:49 -07:00
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
6178925053 Unique form identifier for delete status button 2021-09-30 22:01:55 -07:00
5dd2aac600 Merge branch 'main' into search-refactor 2021-09-30 10:41:30 -07:00
9a96df1712 Unique id for privacy fields 2021-09-29 15:58:37 -07:00
305dcc504b Unique names for fallback forms 2021-09-29 15:52:08 -07:00
5cdfd29f9e Unqiue id for progress fields 2021-09-29 15:46:54 -07:00
6d17b83c8c Id uniqueness fixes 2021-09-29 15:35:08 -07:00
69195e6cd0 Fixes form close placement on reading modals 2021-09-29 15:02:50 -07:00
a8ed957e20 Fixes uuid reference in toggle button snippet 2021-09-29 15:01:56 -07:00
e308ca2511 Merge pull request #1476 from bookwyrm-social/progress-modal
Progress modal
2021-09-29 11:23:29 -07:00
d78c278665 Progress update flow for modal 2021-09-29 10:59:36 -07:00
4dbb09be87 Merge branch 'main' into progress-modal 2021-09-29 09:53:02 -07:00
a1eaae1d5e Fixes markup syntax errors 2021-09-29 09:48:17 -07:00
6e05fb6dd0 Use inline form component for goal form on goal page 2021-09-29 09:39:23 -07:00
5f3df11e56 Moves goal card to feed dir 2021-09-29 09:24:51 -07:00
46168a292b Moves info text to goal form snippet 2021-09-29 09:23:52 -07:00
701bf4828b Improves html consistency for goal page 2021-09-28 18:34:12 -07:00
cc1ae270cc Label shelf privacy in edit shelf form 2021-09-28 16:12:34 -07:00
538ae015cd Fixes report template paths 2021-09-28 13:32:23 -07:00
72cbc1cb1b Adds label 2021-09-28 09:23:50 -07:00
273198d634 Merge branch 'main' into progress-modal 2021-09-28 08:00:45 -07:00
fb823189a0 don't allow non-local users to join groups (yet)
Groups are not compatible with ActivityPub because I don't know what I'm doing.

NOTE: this is super hacky, fix ASAP
2021-09-27 21:48:40 +10:00
f3181690a2 change group owner from 'manager' to 'user'
This will allow privacy management to use existing code.
Some template updates also are for rationalising how
groups are created and edited.
2021-09-27 15:36:41 +10:00
ec0720514e don't allow non-manager to add and remove group members 2021-09-25 20:25:30 +10:00
b645d75303 add and remove users from groups 2021-09-25 17:34:44 +10:00
cbe172df3d find users for groups
- search for users to add to a group
- display suggested users on search results screen

TODO: actaully enable users to be added!
TODO: groups/suggested_users probably could be replaced with some logic in snippets/suggested_users.html
2021-09-25 11:11:58 +10:00
f55803b409 Fixes updating readthroughs 2021-09-22 12:47:50 -07:00
6bb0f3bc8f Merge pull request #1453 from bookwyrm-social/status-whitespace
Preserve whitespace in statuses
2021-09-22 12:32:53 -07:00
3eb49f3f74 Preserve whitespace in statuses 2021-09-22 12:18:12 -07:00
fa6e5605d1 Fixes goal url 2021-09-22 12:16:51 -07:00
1ed3d4dde1 Updates search box placeholder for logged out users 2021-09-20 12:28:08 -07:00
7c23d687b1 Use icon for content warning
This creates consistency between the compose box and the status display
2021-09-19 09:30:06 -07:00
e6c2ea1fbf Visually differentiates content warnings from statuses 2021-09-18 17:00:01 -07:00
cdab2cbf2c Fixes content warnings on replies 2021-09-18 16:27:13 -07:00
01ffb8d77b Fixes form submission from compose view 2021-09-18 14:56:20 -07:00
19e36eb181 Fixes content warning fields in modals 2021-09-18 14:05:17 -07:00
0fe5cb1000 Show label for content warning field 2021-09-18 11:56:32 -07:00
98325818b2 Display search results in api mode and regular 2021-09-16 10:44:33 -07:00
1f06d1a1d8 Removes local connector 2021-09-14 15:26:36 -07:00