Commit graph

1538 commits

Author SHA1 Message Date
Mouse Reeve 4ba3234f6c
Merge branch 'main' into bookwyrm-groups 2021-10-07 17:27:11 -07:00
Mouse Reeve b23f6afa6c Adds context to curation type "open" 2021-10-06 16:24:23 -07:00
Mouse Reeve c0af69045c Adds language customization to preferences 2021-10-06 12:20:05 -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 ec7d0db843 linting fixes 2021-10-05 21:48:59 +11:00
Hugh Rundle 6fde19e9b1 lint fixes 2021-10-05 21:29:33 +11:00
Mouse Reeve 636eca97cb Better mobile display 2021-10-04 11:22:14 -07:00
Mouse Reeve 551b49b903 Adds works chart and updates colors 2021-10-04 11:14:50 -07:00
Mouse Reeve 37cd7e684c Updates chart markup 2021-10-04 10:53:22 -07:00
Mouse Reeve fa241b08e7 Rename charts snippets and add register chart file 2021-10-04 10:42:02 -07:00
Hugh Rundle 3a90311129 update indenting for linter 2021-10-04 22:20:02 +11:00
Hugh Rundle 05969c5311 improve group creation hint
- use help class
- hopefully make the linter happy
2021-10-04 22:18:51 +11:00
Hugh Rundle 2b96b3365c Merge branch 'main' into bookwyrm-groups 2021-10-04 21:10:15 +11:00
Hugh Rundle c59194f808 Merge branch 'main' into new-shelf-fix 2021-10-03 19:47:15 +11:00
Hugh Rundle 9509c5e288 new shelves can be given names always
Previously new shelves created when a default shelf was selected did not provide the option to create a new unique name. Now they do.
fixes #1491
2021-10-03 19:41:38 +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
Mouse Reeve 3c82230eed Load subclasses 2021-10-02 19:24:23 -07:00
Mouse Reeve c821aaa18e Load status ancestors 2021-10-02 19:22:11 -07:00
Hugh Rundle 603a9dc25c fix group members not being able to delete items on group lists 2021-10-03 12:22:03 +11:00
Hugh Rundle 7db2af89dd use group.local_path instead of harcoded url 2021-10-03 12:03:37 +11:00
Hugh Rundle f13223b8ca add notifications for groups
Moved into new structure after merge.
2021-10-03 11:46:51 +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 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 a179de33bc fix incorrect wording on group selection
select a group, not a list!
2021-10-03 09:07:42 +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 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 1d79bb58e1 Better mobile display for notifications 2021-10-02 10:28:49 -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 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 8496f24032 fix filters for group members to see and edit group lists 2021-10-02 18:09:15 +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
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
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 565c9dfa72 Removes block div from thread markup 2021-10-01 14:12:34 -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 58fa3d9ad6 Fixes dl syntax 2021-10-01 09:24:26 -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 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 47706b5353 Use detail field on book paeg and meta 2021-09-29 11:59:09 -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 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
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 002a9c4267
Merge pull request #1456 from Tak/add-cover-from-url-while-adding-book
Add cover from url while adding book
2021-09-29 08:56:05 -07:00
Mouse Reeve 701bf4828b Improves html consistency for goal page 2021-09-28 18:34:12 -07:00
Mouse Reeve 6dbd402345
Merge pull request #1469 from bookwyrm-social/user-shelf
Reorganize user/shelf/goal views code
2021-09-28 17:51:58 -07:00
Mouse Reeve 4dc504c058 Fixes id clashes in shelf forms 2021-09-28 17:36:50 -07:00
Mouse Reeve b5d49d3499 Updates follows null state text 2021-09-28 17:30:58 -07:00
Mouse Reeve 242ffe5456 Show shelf description 2021-09-28 17:20:15 -07:00
Mouse Reeve 5ea40e23b7 Moves shelf delete button 2021-09-28 17:17:01 -07:00
Mouse Reeve 24553e0e35 Updates edit/create shelf forms 2021-09-28 16:37:24 -07:00
Mouse Reeve cc1ae270cc Label shelf privacy in edit shelf form 2021-09-28 16:12:34 -07:00
Mouse Reeve d9945ac5e3 Updates references to templates 2021-09-28 16:04:08 -07:00
Mouse Reeve 9a4b71d585 Shuffles around user profile, shelf, and goal templates 2021-09-28 16:00:45 -07:00
Mouse Reeve 21fee19b42 Use recently active as the default sort order 2021-09-28 15:51:49 -07:00
Mouse Reeve 5b3ff8469d Html validation fix for user admin view 2021-09-28 15:20:10 -07:00
Mouse Reeve ada3e1d4d6 Adds options to html validator and fixes dl/dts 2021-09-28 15:02:24 -07:00
Mouse Reeve 2befef7deb Brings federation page html in line with html validator 2021-09-28 14:39:23 -07:00
Mouse Reeve 65d7f50811 Updates federation tests 2021-09-28 14:15:06 -07:00
Mouse Reeve 29ef6df714 Fixes dashboard page for html validator complaints 2021-09-28 13:54:41 -07:00
Mouse Reeve 4a5efab2f8 Consistent syntax for back to list 2021-09-28 13:34:14 -07:00
Mouse Reeve 538ae015cd Fixes report template paths 2021-09-28 13:32:23 -07:00
Mouse Reeve 27e6cff0f3 Change field display order on edit instance page 2021-09-28 13:27:03 -07:00
Mouse Reeve 8e3f6657fc Fixes edit instance template name 2021-09-28 13:24:25 -07:00