rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity
5453 commits 16 branches 11 tags 32 MiB
Commit graph

1577 commits

Author SHA1 Message Date
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
Mouse Reeve 67a4b2713a Use in-table style for null states 2021-09-28 13:18:27 -07:00
Mouse Reeve c5746bbce0 Adds federation null state 2021-09-28 13:11:22 -07:00
Mouse Reeve 5b97135155 Fixes reference to filters template 2021-09-28 13:07:57 -07:00
Mouse Reeve de5daf8057 Adds email blocklist null state 2021-09-28 13:05:45 -07:00
Mouse Reeve 57044d1c20 Adds null state for ip blocklist 2021-09-28 13:04:36 -07:00
Mouse Reeve b3fdd1ad51 Puts sections into boxes on site page 2021-09-28 13:02:09 -07:00
Mouse Reeve 6c73c94fce Move site settings sub-tabs to the site.html template 2021-09-28 12:53:17 -07:00
Mouse Reeve 9b091eaf75 Moves user admin templates into settings directory 2021-09-28 12:46:38 -07:00
Mouse Reeve a1a1fd90a1 Moves reports into settings directory 2021-09-28 12:43:21 -07:00
Mouse Reeve 9c9adfc6f0 Updates references to templates 2021-09-28 12:39:52 -07:00
Mouse Reeve 1c262a1a64 Updates internal references 2021-09-28 12:26:55 -07:00
Mouse Reeve 7b985f3a41 Sorts admin templates into even more directories 2021-09-28 12:22:41 -07:00
Mouse Reeve 057f870997 Avatar display on mobile 2021-09-28 12:09:13 -07:00
Mouse Reeve 4511bb2ccd Italics for null state text 2021-09-28 11:29:42 -07:00
Mouse Reeve e971638f14 Render test for change password view 2021-09-28 11:09:24 -07:00
Mouse Reeve f281d9014a Creates sections in edit profile view 2021-09-28 11:00:16 -07:00
Mouse Reeve 585c71e72a Adds html linting to test 2021-09-28 10:59:51 -07:00
Mouse Reeve 9a06b7d493 Fixes incorrect label in edit user panel 2021-09-28 09:24:09 -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 66494e7788 fix reverse reference to user bookwyrm_groups 2021-09-28 18:53:11 +10:00
Mouse Reeve 0a37556941
Merge pull request #1401 from bookwyrm-social/opensearch 
Adds opensearch xml file
 2021-09-27 19:48:53 -07:00
Mouse Reeve c32f975a67 Working in firefox 2021-09-27 19:28:50 -07:00
Mouse Reeve 99ef81be9b Linter fixes 2021-09-27 19:05:13 -07:00
Mouse Reeve 15fc31bf77 Merge branch 'main' into opensearch 2021-09-27 18:58:28 -07:00
Mouse Reeve 0f57a43bfb Separate access controls for delete and re-order 2021-09-27 13:31:35 -07:00
Mouse Reeve 10098a402d Don't show list item controls to contributing viewers 2021-09-27 13:25:53 -07:00
Mouse Reeve bc87856c2e Merge branch 'main' into book-format-choices 2021-09-27 10:29:12 -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
Hugh Rundle e15eef16c5 improve new group member adding 
The add-members page now looks almost identical to the group
page and is clearer.
 2021-09-27 21:21:00 +10:00
Levi Bard 0e6895633c Allow adding a cover by url when adding a new book (#1443) 2021-09-27 13:00:16 +02:00
Hugh Rundle df5a5f94a1 fix local_path for groups 2021-09-27 19:27:39 +10:00
Hugh Rundle c87712c995 allow group members to add items to group lists directly 
NOTE: this will be the case regardless of privacy settings of the list
 2021-09-27 18:41:29 +10:00
Hugh Rundle 81e5ff5b76 show groups on member pages if allowed 
- display groups on user pages when not the logged in user
- restrict visibility of groups on user pages and group pages themselves according to privacy settings
 2021-09-27 17:51:18 +10:00
Hugh Rundle 277c033fda show star if this user is the creator/manager of the group 2021-09-27 17:50:38 +10:00
Hugh Rundle e5ca377cd3 clean up stray code mess 2021-09-27 16:50:51 +10:00
Hugh Rundle 493ed14f34 better group creation form logic and placement 2021-09-27 16:39:12 +10:00
Hugh Rundle 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
Hugh Rundle 762202c4b0 fix UI for group curated list editing 
When creating or editing a list, the group selection dropdown will only appear if the user selects "group" as the curation option (or it is already selected).

- fix typo in bookwyrm.js comments
- add data-hides trigger for hiding elements after they have been unhidden, where simple toggles are not the right approach
 2021-09-27 11:03:41 +10:00
Hugh Rundle 0e2095bc5e refer to group in group lists created_text 2021-09-26 20:52:44 +10:00
Hugh Rundle 5fccb991a7 remove list from group when changing curation 
Allows 'group' to be blank when saving a list.
Removes the 'group' field when saving a list with curation other than 'group' - this stops the list "sticking" to a group after it is changed from group curation to something else.
 2021-09-26 18:28:16 +10:00
Hugh Rundle 8bfc71db6e create group curated lists 2021-09-26 15:56:52 +10:00
Hugh Rundle ec0720514e don't allow non-manager to add and remove group members 2021-09-25 20:25:30 +10:00
Hugh Rundle 035fc5209d better logic for identifying group manager 2021-09-25 20:23:59 +10:00
Hugh Rundle 62a5ed7a9e identify group manager 2021-09-25 19:53:06 +10:00
Hugh Rundle b645d75303 add and remove users from groups 2021-09-25 17:34:44 +10:00
Hugh Rundle e800106be4 smaller cards for group members 
- this will also enable members to be removed easily by managers in a future commit.
 2021-09-25 11:37:08 +10:00
Hugh Rundle 8d17f888ea improve naming of templates and urls for groups 2021-09-25 11:36:35 +10:00
Hugh Rundle 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
Hugh Rundle 8c326ec52f user groups listing template 
- creates groups/user_groups template for listing a user's groups on their user page
 2021-09-25 11:10:06 +10:00
Hugh Rundle d4fcf88cf5 add list cards to groups page 
- add list cards to groups page based on lists page
- add sort to members on group page
 2021-09-24 21:57:01 +10:00
Hugh Rundle 86a60d58e5 add user cards to group pages 2021-09-24 21:24:06 +10:00
Hugh Rundle 264d9b2f3c add group page template 2021-09-24 20:35:51 +10:00
Hugh Rundle 9b6d2a9d88 add group page 2021-09-24 20:34:11 +10:00
Hugh Rundle f32a2cc4d0 group creation form can now be submitted! 
Whoops
 2021-09-24 15:04:52 +10:00
Hugh Rundle 4e93b09067 create group form 
adds a group creation form to user dashboard
 2021-09-24 14:12:36 +10:00
Hugh Rundle 99b533510a add group templates 2021-09-24 07:51:51 +10:00
Hugh Rundle 71b1c6117c update templates for groups 2021-09-24 07:50:57 +10:00
Mouse Reeve f55803b409 Fixes updating readthroughs 2021-09-22 12:47:50 -07:00
Mouse Reeve 6bb0f3bc8f
Merge pull request #1453 from bookwyrm-social/status-whitespace 
Preserve whitespace in statuses
 2021-09-22 12:32:53 -07:00
Mouse Reeve 3eb49f3f74 Preserve whitespace in statuses 2021-09-22 12:18:12 -07:00