Commit graph

626 commits

Author SHA1 Message Date
Hugh Rundle 6e5c0cc4c3 Merge branch 'main' into bookwyrm-groups
There are database migrations in main ahead of this branch so they need to be merged in to the branch before we can merge back into main.
2021-10-17 06:22:04 +11:00
Hugh Rundle 8192d6ad10 code indenting fix 2021-10-16 18:00:55 +11:00
Hugh Rundle 85784f07d2 groups templates improvements
- require confirmation before removing a member
- require confirmation before removing self
- make button text less verbose
- use more standardised formatting for group editing form
- improve button colours
- add missing trans tags
- reload group page when removing member
2021-10-16 16:43:09 +11:00
Mouse Reeve 896885bffd Don't show progress field on status update comments
Also retitle the view
2021-10-15 14:43:02 -07:00
Mouse Reeve a9daa4670e Retain reading status on comments 2021-10-15 14:41:14 -07:00
Mouse Reeve 117e6a08b2 Merge branch 'main' into markdown 2021-10-15 10:06:34 -07:00
Mouse Reeve 2f40394c0a Updates edited display 2021-10-15 09:41:29 -07:00
Mouse Reeve 50db0bd012 Hide reply panel in no interact mode 2021-10-14 20:29:45 -07:00
Mouse Reeve af567ba05e Edit posts in original markdown syntax 2021-10-14 18:34:26 -07:00
Mouse Reeve 01911d3b23 Update and indicate edit status 2021-10-14 17:33:45 -07:00
Mouse Reeve f5e52d6a11 Save updated statuses 2021-10-14 17:23:54 -07:00
Mouse Reeve 066f14ca84 Save edited statuses 2021-10-14 17:13:54 -07:00
Mouse Reeve df27614937 Don't use localstorage cache for edits 2021-10-14 16:53:46 -07:00
Mouse Reeve e149a14e73 Use href instead of POST form to edit status 2021-10-14 16:53:42 -07:00
Mouse Reeve 7488f8da96 Creates edit status endpoint 2021-10-14 16:30:27 -07:00
Mouse Reeve 1f6f543847 Use url templatetag to load posting urls 2021-10-14 15:56:34 -07:00
Mouse Reeve 803ad3c911 Removes delete and redraft view 2021-10-13 13:12:56 -07:00
Mouse Reeve 73a8f89bee
Merge branch 'main' into bookwyrm-groups 2021-10-06 11:37:38 -07:00
Levi Bard 094931d6d1 Display half-stars in generated statuses for federation.
Fixes #1505
2021-10-06 11:37:27 +02:00
Hugh Rundle 3a90311129 update indenting for linter 2021-10-04 22:20:02 +11:00
Hugh Rundle 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
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 29f18ee123 only suggest local users as potential group members 2021-10-02 19:35:57 +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 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
Mouse Reeve ca4b262e72 Link to status anchor 2021-10-01 14:50:42 -07:00
Mouse Reeve 8461fe5ec3 Adds anchor id to status 2021-10-01 14:12:49 -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 6178925053 Unique form identifier for delete status button 2021-09-30 22:01:55 -07:00
Mouse Reeve 5dd2aac600 Merge branch 'main' into search-refactor 2021-09-30 10:41:30 -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 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 e308ca2511
Merge pull request #1476 from bookwyrm-social/progress-modal
Progress modal
2021-09-29 11:23:29 -07:00
Mouse Reeve d78c278665 Progress update flow for modal 2021-09-29 10:59:36 -07:00
Mouse Reeve 4dbb09be87 Merge branch 'main' into progress-modal 2021-09-29 09:53:02 -07:00
Mouse Reeve a1eaae1d5e Fixes markup syntax errors 2021-09-29 09:48:17 -07:00
Mouse Reeve 6e05fb6dd0 Use inline form component for goal form on goal page 2021-09-29 09:39:23 -07:00
Mouse Reeve 5f3df11e56 Moves goal card to feed dir 2021-09-29 09:24:51 -07:00
Mouse Reeve 46168a292b Moves info text to goal form snippet 2021-09-29 09:23:52 -07:00
Mouse Reeve 701bf4828b Improves html consistency for goal page 2021-09-28 18:34:12 -07:00
Mouse Reeve cc1ae270cc Label shelf privacy in edit shelf form 2021-09-28 16:12:34 -07:00
Mouse Reeve 538ae015cd Fixes report template paths 2021-09-28 13:32:23 -07:00
Mouse Reeve 72cbc1cb1b Adds label 2021-09-28 09:23:50 -07:00
Mouse Reeve 273198d634 Merge branch 'main' into progress-modal 2021-09-28 08:00:45 -07:00
Hugh Rundle 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