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

988 commits

Author SHA1 Message Date
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
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
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
085d3270a3 Load related objects in query 
Reduces query load in template
 2021-10-02 10:11:27 -07:00
Mouse Reeve
df8f67895c Adds mention notification template 2021-10-02 08:09:57 -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
29f18ee123 only suggest local users as potential group members 2021-10-02 19:35:57 +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
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
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
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
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
a24fe558fc
Merge pull request #1480 from bookwyrm-social/comment-formatting 
Post-processes statuses composed in modals
 2021-10-01 12:00:56 -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
6902ffc4c3 Adds missing view file 2021-09-30 22:22:32 -07:00
Mouse Reeve
5dd2aac600 Merge branch 'main' into search-refactor 2021-09-30 10:41:30 -07:00
Mouse Reeve
75e69eb269 Post-processes statuses composed in modals 2021-09-30 10:00:05 -07:00
Mouse Reeve
33b3b518e8 Move views into subdirectory 2021-09-29 13:42:27 -07:00
Mouse Reeve
899e6b55a8 Updates references to book templates 2021-09-29 13:27:07 -07:00
Mouse Reeve
52c6a90498 Don't redirect on http request to readthrough 2021-09-29 11:02:04 -07:00
Mouse Reeve
d78c278665 Progress update flow for modal 2021-09-29 10:59:36 -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
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
5ea40e23b7 Moves shelf delete button 2021-09-28 17:17:01 -07:00
Mouse Reeve
6d9bf349d1 Fixes delete shelf logic and adds tests 2021-09-28 17:02:18 -07:00
Mouse Reeve
24553e0e35 Updates edit/create shelf forms 2021-09-28 16:37:24 -07:00
Mouse Reeve
183e76eb2a Adds test for shelf 2021-09-28 16:18:32 -07:00
Mouse Reeve
d9945ac5e3 Updates references to templates 2021-09-28 16:04:08 -07:00
Mouse Reeve
21fee19b42 Use recently active as the default sort order 2021-09-28 15:51:49 -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
a9eb544bac Moves blocks views and tests into preferences dir 2021-09-28 11:44:53 -07:00
Mouse Reeve
85f6b615bd Python formatting 2021-09-28 11:27:16 -07:00
Mouse Reeve
1b0a5232bc Move preferences views into directory 2021-09-28 11:23:47 -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
95cdaae4d4 Python formatting 2021-09-27 19:38:54 -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
e0aa8a7fdf Fixes shelf view boolean logic 2021-09-27 17:58:21 -07:00
Mouse Reeve
f13f3d460c Fixing checking list perms 2021-09-27 17:52:27 -07:00
Mouse Reeve
99c1a670f4 Fixes checking goal perms 2021-09-27 17:52:20 -07:00
Mouse Reeve
c874a762dd Updates inbox view 2021-09-27 17:27:17 -07:00
Mouse Reeve
62ff9d6199 Python formatting 2021-09-27 16:08:52 -07:00
Mouse Reeve
dfa8bafe18 Uses new visible/editable/deleteable functions 2021-09-27 16:04:40 -07:00
Mouse Reeve
e6ae500569 Fixes syntax problem on http raises 2021-09-27 16:00:50 -07:00
Mouse Reeve
84443c7f81 Custom perms function for shelf view 2021-09-27 15:55:55 -07:00
Mouse Reeve
3657f9e0df Check perms in status views 2021-09-27 14:03:17 -07:00
Mouse Reeve
556ae0726b Check perms in list views 2021-09-27 14:03:06 -07:00
Mouse Reeve
ab5521480d
Merge pull request #1462 from bookwyrm-social/fewer-active-shelf-queries 
Fewer active shelf queries
 2021-09-27 13:16:50 -07:00
Mouse Reeve
6d2403bbc7
Merge pull request #1459 from bookwyrm-social/password-reset 
Prevent password reset for inactive users
 2021-09-27 12:55:05 -07:00
Mouse Reeve
36c00c49ab User viewer aware objects for feed suggested books 2021-09-27 11:37:50 -07:00
Mouse Reeve
8e8f46ee51 Only call .all once in shelf view 2021-09-27 11:27:46 -07:00
Mouse Reeve
cb089ed817 One query to get book for book view 2021-09-27 11:23:55 -07:00
Mouse Reeve
995e2c47db User viewer aware objects for book page 
Plus other refactors for that view
 2021-09-27 11:17:42 -07:00
Mouse Reeve
6d06edc2c7 User viewer aware books for all books shelf view 2021-09-27 10:58:34 -07:00
Mouse Reeve
eb34bb2d93
Merge pull request #1461 from bookwyrm-social/views-init 
Adds init file to admin views dir
 2021-09-27 10:37:23 -07:00
Mouse Reeve
69b010a8d3 f string updates 2021-09-27 10:21:46 -07:00
Mouse Reeve
28d40e9914 Use url names in redirects 2021-09-27 10:17:16 -07:00
Mouse Reeve
92de48afd4 Adds init file to admin views dir 
Is this why they're not pylinting?
 2021-09-27 10:06:46 -07:00
Mouse Reeve
c399d6edfb Prevent password reset for inactive users 2021-09-27 09:31:51 -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
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
1a02af1450 allow members to see groups and their lists 
- add additional logic to visible_to_user, for groups and their objects
- cleans up some queries in Group view

NOTE: I can't work out how to make group lists only visible
to users who should be able to see them, on user group listings.
They still can't access the actual group, but can see it on
user pages. This is potentialy problematic.
 2021-09-27 20:24:25 +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
e38d7b63f3 make groups actually editable 2021-09-27 16:49:56 +10:00
Hugh Rundle
493ed14f34 better group creation form logic and placement 2021-09-27 16:39:12 +10:00
Hugh Rundle
2874e52309 rationalise group creation and prep for group privacy 2021-09-27 15:34:14 +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
f3a3ba5f01 pass group value to list views and vice-versa 2021-09-26 15:56:02 +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
b645d75303 add and remove users from groups 2021-09-25 17:34:44 +10:00
Hugh Rundle
7c0deabcb2 update urls and group view for searching users to add to group 2021-09-25 11:14:04 +10:00
Hugh Rundle
273ad9a466 add create_group to __init__.py 
you probably want this otherwise nothing previously added for group creation will work :-)
 2021-09-25 10:55:32 +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
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
3e3c90ec03 add views for groups 2021-09-24 07:49:25 +10:00
Mouse Reeve
c465c70c22 Handles statuses with no readthrough updates 2021-09-22 17:06:06 -07:00
Mouse Reeve
d510d72b8d Fixes syntax in reading view 2021-09-22 16:41:43 -07:00
Mouse Reeve
a96d027cf3 Easier to read first-item-or-none list logic 2021-09-22 16:16:53 -07:00
Mouse Reeve
c54609d7fd Refactors how readthroughs get updated 2021-09-22 16:08:25 -07:00
Mouse Reeve
2419942770 Create model function to update user last active date 2021-09-22 08:35:20 -07:00
Mouse Reeve
ea303fb285 Updating string format synatx part 3 2021-09-20 16:45:26 -07:00
Mouse Reeve
cf3157a3b5 Merge branch 'main' into pylint-update 2021-09-20 16:31:27 -07:00
Mouse Reeve
89fad59793 Query efficiency in user view 2021-09-20 15:25:29 -07:00
Mouse Reeve
aa0ffd86c0 Fetch related items when loading list page 2021-09-20 14:49:07 -07:00
Mouse Reeve
22ead6ba46 More efficient followers query 2021-09-20 14:29:01 -07:00
Mouse Reeve
38c66b208c Adds customizable invite request copy 2021-09-18 15:45:04 -07:00
Mouse Reeve
385da1ea43 Handle get request to /register path 2021-09-18 15:08:02 -07:00
Mouse Reeve
acfb1bb376 Updating string format synatx part 2 2021-09-18 11:32:00 -07:00
Mouse Reeve
6022e7b232 Adds IP blocklist views 2021-09-17 13:04:10 -07:00
Mouse Reeve
8c4cafed79 Fixes formatting isbn endpoint results 2021-09-16 12:53:27 -07:00
Mouse Reeve
0d5e05a3c2 Updates other calls to the search endpoint 2021-09-16 10:55:23 -07:00
Mouse Reeve
98325818b2 Display search results in api mode and regular 2021-09-16 10:44:33 -07:00
Mouse Reeve
1f06d1a1d8 Removes local connector 2021-09-14 15:26:36 -07:00
Mouse Reeve
be7fae2053 Show recent servers first 2021-09-12 10:02:15 -07:00
Mouse Reeve
0f3e71978e Federated and blocked tabs 2021-09-11 14:41:52 -07:00
Mouse Reeve
03a5ac9c3f Use elided page range for federated peer list 2021-09-11 14:27:42 -07:00
Mouse Reeve
09e49c70ed Fixes peers endpoint 2021-09-11 13:30:27 -07:00
Mouse Reeve
e801c7d991 Cleaner chart intervals 2021-09-11 09:32:29 -07:00
Mouse Reeve
84b90db4bb Adds filtering to admin panel 2021-09-11 08:47:16 -07:00
Mouse Reeve
1f53ce33a8 Fixes user stats reporting 2021-09-11 07:52:56 -07:00
Mouse Reeve
19cdda372c Tidies up charts 2021-09-11 07:14:14 -07:00
Mouse Reeve
a79fb14686 Basic dashboard page 2021-09-10 21:12:08 -07:00
Mouse Reeve
e515912dbc Move admin views into their own directory 2021-09-10 18:50:31 -07:00
Mouse Reeve
7c3cf095f3 Adds opensearch xml file 2021-09-10 16:47:59 -07:00
Mouse Reeve
9413dacaf2 Updates instance info endpoint 2021-09-10 11:44:51 -07:00
Mouse Reeve
3a7717e22f Fixes status code variable in http response 2021-09-10 08:59:18 -07:00
Mouse Reeve
3c38a64a81 Return http responses for ajax requests 2021-09-10 08:03:22 -07:00
Mouse Reeve
de3c79ce21 Merge branch 'main' into email-blocking 2021-09-08 17:43:08 -07:00
Mouse Reeve
15344b6a8e Let moderators delete users 2021-09-08 17:21:45 -07:00
Mouse Reeve
916be2552d View for moderators deleting users 2021-09-08 16:58:16 -07:00
Mouse Reeve
658e12eb86 Allow admins to suspend pending users 2021-09-08 16:47:12 -07:00
Mouse Reeve
d28db51a14 Adds delete functionality 2021-09-08 16:24:13 -07:00
Mouse Reeve
5441b5b7f3 Prevent users from registering with blocked emails 2021-09-08 15:49:18 -07:00
Mouse Reeve
59096ae9ec Adds email filtering to user admin view 2021-09-08 15:37:52 -07:00
Mouse Reeve
8717d8a675 Create new email domain block entries 2021-09-08 15:31:01 -07:00
Mouse Reeve
c705178c3b Adds create block form 2021-09-08 15:08:22 -07:00
Mouse Reeve
fd0cf49b40 Adds html and view for email blocklist 2021-09-08 14:32:11 -07:00
Mouse Reeve
527c0542af View to hide suggestions 2021-09-08 10:03:23 -07:00
Mouse Reeve
e13e13d3f3 Move import templates into directory 2021-09-08 07:28:42 -07:00
Mouse Reeve
de3f18655c Set priorities on tasks 2021-09-07 16:33:43 -07:00
Mouse Reeve
47ba2478b6 Split out test files 2021-09-07 15:06:44 -07:00
Mouse Reeve
ec501dfee9 Make sure passwords aren't exposed in error reporting 2021-09-07 13:21:40 -07:00
Mouse Reeve
75cc2ee164 Split authentication views into login and register 2021-09-07 13:11:44 -07:00
Mouse Reeve
aa856b0155
Merge pull request #1369 from bookwyrm-social/delete-lists 
Delete lists
 2021-09-06 13:16:56 -07:00
Mouse Reeve
c8f148acb8
Merge pull request #1366 from bookwyrm-social/user-admin 
User admin view improvements
 2021-09-06 10:54:31 -07:00
Mouse Reeve
c630ec3572 Adds delete list view 2021-09-06 10:41:55 -07:00
Mouse Reeve
a68196d9bb Improves user admin filter behavior 2021-09-06 08:54:57 -07:00
Mouse Reeve
0f32471b2a Show quotes without content as large discover cards 2021-09-06 08:47:59 -07:00
Mouse Reeve
a2811b6c1b Fixes redirects in fallback post modal 2021-09-05 15:24:03 -07:00
Mouse Reeve
ccc41deb36 Retain whitespace in split for detecting urls 2021-09-02 13:36:01 -07:00
Mouse Reeve
5bfa09e411 Fixes whitespace when formatting links 2021-09-02 09:13:02 -07:00
reesporte
4f321e5f33 fix link formatting issue, for real this time 2021-08-30 14:23:04 -05:00
reesporte
c6d08050e2 bruh 2021-08-30 11:51:42 -05:00
reesporte
0f481714c0 fix pylint errors 2021-08-30 11:47:19 -05:00
reesporte
6e628fed38 formatting 2021-08-30 11:38:00 -05:00
reesporte
ac6438147d remove unused import 2021-08-30 11:20:56 -05:00
reesporte
5291308677 fix link formatting issues 2021-08-30 11:12:05 -05:00
Mouse Reeve
76ba56f656 Fixes admin permissions 2021-08-29 08:14:53 -07:00
Mouse Reeve
41ed5f3103
Merge pull request #1337 from bookwyrm-social/feed-logic 
Feed logic
 2021-08-28 11:29:37 -07:00
Mouse Reeve
4fb834f10f Simpler feed verification logic 2021-08-28 09:42:03 -07:00
D Anzorge
92b96afc2d Make webfinger match usernames in case insensitive manner 2021-08-27 21:27:54 +02:00
Mouse Reeve
c727d351ba Fixes variable name 2021-08-23 15:33:49 -07:00
Mouse Reeve
f267e53b56 let's call it save not bookmark 2021-08-23 15:07:38 -07:00
Mouse Reeve
a30094c822 View bookmarked lists 2021-08-23 13:40:07 -07:00
Mouse Reeve
42abc145c8 Adds action views 2021-08-23 13:15:35 -07:00
Mouse Reeve
7345705b08 Small efficiency improvement in list view 2021-08-21 20:21:39 -07:00
Mouse Reeve
3a9b9623e9
Merge pull request #1321 from bookwyrm-social/html-validation 
Html validation fixes
 2021-08-21 13:07:34 -06:00
Mouse Reeve
85a4c331eb Use search results template for isbn view 2021-08-21 10:48:26 -07:00
Mouse Reeve
596b6ca084 Resolves warning in books view 2021-08-21 07:25:18 -07:00
Mouse Reeve
075715ca22 Use gettext_lazy not gettext 2021-08-17 14:35:28 -07:00
Mouse Reeve
fc9613b975
Merge pull request #1305 from bookwyrm-social/search-editions 
Search editions
 2021-08-17 13:26:20 -06:00
Mouse Reeve
32d4ae1f4e Python formatting 2021-08-17 12:04:14 -07:00
Mouse Reeve
b178ba6326 Removes unneeded list comprehension 2021-08-17 11:57:19 -07:00
Mouse Reeve
cb4c6100aa Adds tests 2021-08-17 11:49:29 -07:00
Mouse Reeve
6db3391f8b Search editions in view 2021-08-17 10:45:30 -07:00
Mouse Reeve
4b788f5df1 Move editions into their own view file 2021-08-17 10:26:56 -07:00
Mouse Reeve
b991510c03 Fixes want to read status slug 2021-08-16 15:00:35 -07:00
Mouse Reeve
6280671d92 Create comments when commentary is provided 2021-08-16 13:08:45 -07:00
Mouse Reeve
c1afd3f852
Merge pull request #1272 from bookwyrm-social/rss 
Updates rss feed view
 2021-08-16 11:59:24 -06:00
Mouse Reeve
71404fae06 Adds local only filter to user admin view 2021-08-16 08:51:23 -07:00
Mouse Reeve
fd56379518 Updates rss feed view 2021-08-09 07:38:43 -07:00
Mouse Reeve
c14bcf19cc Use activitystreams to populate discovery view 2021-08-07 18:56:05 -07:00
Mouse Reeve
c28d077cb4 Simplifies query for landing page books 2021-08-07 17:12:38 -07:00
Mouse Reeve
4d8bd3ad93 Cleans up landing page, since we're here 2021-08-07 16:37:51 -07:00
Mouse Reeve
760bd5a63f Fixes reference to landing page books 2021-08-07 15:10:53 -07:00
Mouse Reeve
e3cbf30684 Local discovery view 2021-08-07 14:43:05 -07:00
Mouse Reeve
b5153f3df1 WIP 2021-08-07 12:33:45 -07:00
Mouse Reeve
040758c833 Renames "discover" 2021-08-07 11:25:09 -07:00
Mouse Reeve
1dea2b307b
Merge pull request #1260 from bookwyrm-social/email-confirmation 
Email confirmation
 2021-08-07 09:32:25 -06:00
Mouse Reeve
aad5de3b61 Improves cross-edition display for lists 2021-08-06 19:03:15 -07:00
Mouse Reeve
5373663acf Merge branch 'main' into email-confirmation 2021-08-06 18:09:01 -07:00
Mouse Reeve
4d4a7bc20b
Merge pull request #1259 from bookwyrm-social/test-coverage 
Test coverage
 2021-08-06 19:07:48 -06:00
Mouse Reeve
9077516fa1 Resend links 2021-08-06 17:39:22 -07:00
Mouse Reeve
1ad057d89d Confirmation templates 2021-08-06 17:23:44 -07:00
Mouse Reeve
5926224d7e Confirm email views 2021-08-06 16:26:46 -07:00
Mouse Reeve
247a7f7489 Email confirmation email 2021-08-06 15:38:37 -07:00
Mouse Reeve
0d2622e4ff Tests login view 2021-08-06 11:23:38 -07:00
Mouse Reeve
134db20c57 Fixes directory view 2021-08-06 09:40:01 -07:00
Mouse Reeve
d0114d2e83 Adds test for book add description view 2021-08-05 18:07:36 -07:00
Mouse Reeve
9d19092205 Updates tests 2021-08-04 18:22:06 -07:00
Mouse Reeve
9d75bc3982 Display books timeline 2021-08-04 17:53:44 -07:00
Mouse Reeve
12fb969821 Python formatting 2021-08-04 12:40:15 -07:00
Mouse Reeve
535ff5e6d8 Handle goal pages for unset years 2021-08-04 12:05:24 -07:00
Mouse Reeve
1f2fea4a8e Use update_fields for password_change 2021-08-03 12:37:28 -07:00
Mouse Reeve
cfbe1b29cd Pass update fields when ticking last active date 2021-08-03 09:12:22 -07:00
Mouse Reeve
62befa9295 Merge branch 'main' into suggestions-redis 2021-08-02 20:40:06 -07:00
Mouse Reeve
af8851fc2e
Merge pull request #1241 from bookwyrm-social/ambiguous-ordering 
Resolves ambiguous ordering in views
 2021-08-02 19:02:46 -06:00
Mouse Reeve
4dddd67d0c Resolves ambiguous ordering in views 2021-08-02 17:48:29 -07:00
Mouse Reeve
fc8db58cdb Merge branch 'main' into suggestions-redis 2021-08-02 16:40:57 -07:00
Mouse Reeve
c56c6aa8e4 Uses elided page range for directory view 2021-08-02 16:15:14 -07:00
Mouse Reeve
0ed0f45b32 Fixes logged out state for user search 2021-07-28 16:43:49 -07:00
Mouse Reeve
d5c36dbc28 Updates search remote value 2021-07-28 13:52:16 -07:00
Mouse Reeve
bf99a07153 Automatically search remote endpoints if a local search is empty 2021-07-28 13:29:24 -07:00
Joel Bradshaw
eadf5cf410 Use shelved date for display 
I'm not sure if there's a better way to access this field, accessing via
book.shelfbook__shelved_date in the template didn't seem to work
 2021-07-13 21:26:38 -07:00
Mouse Reeve
1d90ccdcaa
Merge pull request #1215 from bookwyrm-social/user-status-counts 
Hide deleted status counts from book page
 2021-07-07 11:55:18 -06:00
Mouse Reeve
23631c3c4f Fixes failing links 2021-07-07 09:49:22 -07:00
Mouse Reeve
fede777e9b Hide deleted status counts from book page 2021-07-07 09:37:21 -07:00
Mouse Reeve
9461784a18 Python formtting 2021-06-28 13:54:38 -07:00
Mouse Reeve
e13ddb10d0 Avoids template errors in dev when imports can't connect to redis 2021-06-28 13:50:04 -07:00
Mouse Reeve
adb0253abf Remove default minimum search confidence 2021-06-23 17:41:29 -07:00
Mouse Reeve
beb42b17f1 Removes unused import 2021-06-18 16:56:33 -07:00
Mouse Reeve
5b6048e4c6 Merge branch 'main' into suggestions-redis 2021-06-18 16:48:04 -07:00
Mouse Reeve
9e5c7053e9 More pylint fixes 2021-06-18 14:29:24 -07:00
Mouse Reeve
4479864008 Updates code for linter 2021-06-18 14:12:56 -07:00
Mouse Reeve
f307edf732 Use elided page range for invites 2021-06-14 15:39:54 -07:00
Mouse Reeve
d4e2a06092
Merge pull request #1171 from bookwyrm-social/import-text 
Clarifies wording on pending imports
 2021-06-14 12:31:38 -07:00
Mouse Reeve
9a67c61487 Clarifies wording on pending imports 
Fixes #1118
 2021-06-14 11:59:44 -07:00
Mouse Reeve
e98138e84f Show users as deleted in admin view 2021-06-14 11:38:54 -07:00
Mouse Reeve
557aa2005b Adds test for delete view 2021-06-14 11:15:00 -07:00
Mouse Reeve
8cd6712db3 Let users delete their accounts 2021-06-14 10:44:25 -07:00
Mouse Reeve
7ae64c2a68 Splits user view out and adds template 2021-06-14 10:01:21 -07:00
Mouse Reeve
4107f7ddf1 Updates readthrough tests 2021-06-09 11:07:15 -07:00
Mouse Reeve
113ced2900 Merge reading status views into one view 2021-06-09 10:53:52 -07:00
Mouse Reeve
3356c652ee Adds standalone modal views for reading steps 2021-06-08 11:55:18 -07:00
Mouse Reeve
b5d0a9e0b4 Removes deplicate progress code form reading views 2021-06-08 11:43:30 -07:00
Mouse Reeve
1231d40e80 Want to read view 2021-06-08 11:23:53 -07:00
Mouse Reeve
45146b4999 Convert start and finish reading into view classes 2021-06-08 11:10:39 -07:00
Mouse Reeve
ca8067769c Don't show deleted ratings in stars 2021-05-23 08:48:00 -07:00
Mouse Reeve
f987a352c6 Fixes username helper 2021-05-22 21:33:56 -07:00
Mouse Reeve
bdf267dea5 Refactors block button for query efficiency 2021-05-22 20:36:30 -07:00
Mouse Reeve
9285f483c2 Query tweaks for book page 2021-05-22 20:14:57 -07:00
Mouse Reeve
2d4cec4422 Improves shelf page query efficiency a little 2021-05-22 19:54:50 -07:00
Mouse Reeve
368d2cd716 Reduces feed page queries for goals 
9 fewer queries
 2021-05-22 17:34:16 -07:00
Mouse Reeve
644e5926db Remove suggested users on block 2021-05-22 14:05:59 -07:00
Mouse Reeve
29130d5f44 Detect new users and users with updated discoverability 2021-05-22 11:58:33 -07:00
Mouse Reeve
2ff79c9953 Fixes python formatting 2021-05-22 09:55:38 -07:00
Mouse Reeve
ea56d42906
Merge pull request #1116 from bookwyrm-social/import-async-error 
Don't error when task for import no longer exists
 2021-05-20 21:14:15 -07:00
Mouse Reeve
8772f26b91 Don't error when task for import no longer exists 2021-05-20 20:35:12 -07:00
Mouse Reeve
07fc4a2efc
Merge branch 'main' into suggestions-redis 2021-05-20 20:25:15 -07:00
Mouse Reeve
a70c713c29 Fixes default values in edit announcement form 2021-05-20 20:21:04 -07:00
Mouse Reeve
9933b888f9
Merge pull request #1112 from bookwyrm-social/search-null-state 
Fixes search null state view
 2021-05-20 16:49:46 -07:00
Mouse Reeve
e74bb4e33c
Merge pull request #1111 from bookwyrm-social/rss-templates 
Moves rss templates to base level directory
 2021-05-20 16:40:41 -07:00
Mouse Reeve
a8a8398cf8 Fixes search null state view 2021-05-20 16:34:32 -07:00
Mouse Reeve
2a451e83c6
Merge pull request #1109 from bookwyrm-social/invalid-image-url 
Handle all kinds of invalid image urls
 2021-05-20 16:18:44 -07:00
Mouse Reeve
c52b26f404 Moves rss templates to base level directory 2021-05-20 16:12:24 -07:00
Mouse Reeve
5401d73909 404 instead of error for invalid post link 2021-05-20 16:06:23 -07:00
Mouse Reeve
f1d4f092f2 Handle all kinds of invalid image urls 2021-05-20 16:03:14 -07:00
Mouse Reeve
4af6667d6a
Merge pull request #1105 from bookwyrm-social/suggested-users-error 
Fixes logic error in get started user view
 2021-05-20 15:26:39 -07:00
Mouse Reeve
0ba7ee41fe
Merge pull request #1102 from bookwyrm-social/pagination-get 
Uses safe method for pagination on follows pages
 2021-05-20 15:17:54 -07:00
Mouse Reeve
82f74a4049 Fixes logic error in get started user view 2021-05-20 15:17:05 -07:00
Mouse Reeve
3f1d670911 Uses safe method for pagination on follows pages 2021-05-20 14:47:23 -07:00
Mouse Reeve
62dc8270b6 Catch unexpectedly missing columns in csv imports 
I kept the 500 error here so that things don't silently fail in
unexepcted ways
 2021-05-20 14:39:33 -07:00
Mouse Reeve
cefc5994a6 Makes extra content optional 2021-05-20 12:40:03 -07:00
Mouse Reeve
2e193aa3c6 Delete announcements 2021-05-20 12:08:12 -07:00
Mouse Reeve
49916a7498 Sorting for announcement headers and pagination 2021-05-20 09:43:29 -07:00
Mouse Reeve
3d70a36d86 Editable announcement 2021-05-20 09:28:39 -07:00
Mouse Reeve
d64e0c4aa8 Adds admin view for individual announcement 2021-05-20 08:09:35 -07:00
Mouse Reeve
515d5bb237 Create announcements admin view 2021-05-19 14:57:28 -07:00
Mouse Reeve
58a059c85f Fixes display of user ratings 2021-05-18 11:17:59 -07:00
Mouse Reeve
07d59c8c09 Don't show ratings below user statuses 2021-05-18 11:09:19 -07:00
Mouse Reeve
63172ecf00 Fixes ratings on shelf pages 2021-05-11 13:54:38 -07:00
Mouse Reeve
db5796764b
Merge pull request #1071 from bookwyrm-social/author-page 
Updates author page
 2021-05-10 19:26:10 -07:00
Mouse Reeve
92e2c70baf Fixes list sorting by rating 2021-05-10 18:28:31 -07:00
Mouse Reeve
867a33de57 Creates author template dir 2021-05-10 16:34:37 -07:00
allie
df99060898 Merge branch 'bookwyrm-social:main' into storygraph-import 2021-05-10 15:58:04 -03:00
Allie Signet
623bb181e4 fix formatting 2021-05-10 15:56:35 -03:00
Allie Signet
36439506b6 add storygraph import 2021-05-10 14:00:51 -03:00
Mouse Reeve
1cc63c6d45 Adds filtered view for notifications 2021-05-07 14:00:51 -07:00
Mouse Reeve
bc80c017aa Python formatting 2021-05-03 14:52:24 -07:00
Mouse Reeve
7dfc991468 Adds elided page range to shelf pagination 2021-05-03 14:47:27 -07:00
Mouse Reeve
7db8e249cc
Merge pull request #1037 from bookwyrm-social/search-bug 
Fixes error on empty search results
 2021-05-03 10:57:53 -07:00
Mouse Reeve
93959fc600
Merge pull request #1036 from SavinaRoja/pagination-list 
pagination list navigation using a range of pages such as provided by get_elided_page_range
 2021-05-03 10:57:38 -07:00
Mouse Reeve
db6246e359 Fixes error on empty search results 2021-05-01 22:20:23 -07:00
Mouse Reeve
97aeaa9cd7 Uses empty queryset for forced no results mode 2021-05-01 19:05:46 -07:00
Pablo Barton
e71a0dd7e8 pagination list navigation using a range of pages such as provided by get_elided_page_range 2021-05-01 19:30:43 -04:00
Mouse Reeve
bb50bd8121 Python formatting 2021-05-01 10:49:34 -07:00
Mouse Reeve
c42be7a589 Adds pagination 2021-05-01 10:47:01 -07:00
Mouse Reeve
9caad56ffc Don't allow remote search results for logged out users 2021-04-30 20:08:05 -07:00
Mouse Reeve
499c4e3267 Don't search remote sources by default 2021-04-30 19:56:29 -07:00
Mouse Reeve
cb6c0035d7 List and user previews 2021-04-30 19:19:10 -07:00
Mouse Reeve
21a5147c3c Controls search type 2021-04-30 18:59:02 -07:00
Mouse Reeve
5ca9d2a7b0 Adds search templates 2021-04-30 18:35:09 -07:00
Mouse Reeve
4b73c37126 Separate out search types 2021-04-30 18:17:09 -07:00
Mouse Reeve
735ef369b9
Merge pull request #1020 from bookwyrm-social/notification-color 
Only make notification count red for mentions
 2021-04-30 13:49:57 -07:00
Mouse Reeve
4dacf4df3a Refactor get_user_from_username to raise 404 directly 2021-04-30 09:33:36 -07:00
Mouse Reeve
d810d1bb8c Remove duplicate check for user blocks 2021-04-30 09:26:02 -07:00
Mouse Reeve
418e656aea Uses layout for followers/following page 2021-04-30 09:17:46 -07:00
Mouse Reeve
862ef83536 Move user templates into more subdirectories 2021-04-30 08:47:04 -07:00
Mouse Reeve
454dd25681 Only make notification count red for mentions 2021-04-30 07:49:34 -07:00
Mouse Reeve
6983018d5e Merge branch 'main' into suggested_user_logic 2021-04-29 13:42:05 -07:00
Mouse Reeve
9d89aaf9fc Don't let logged out viwers search for users 2021-04-29 12:18:55 -07:00
Mouse Reeve
f4800307b4 Adds isbn search 2021-04-29 09:54:42 -07:00
Mouse Reeve
6551c59c45 Don't store default edition in the dataase 2021-04-28 16:05:17 -07:00
Mouse Reeve
d4dbfbe3c0
Merge pull request #1003 from bookwyrm-social/list-fixes 
Improve list suggestion experience
 2021-04-26 13:48:26 -07:00
Mouse Reeve
5bb341ba52 Use copy of requests GET params in list redirect 2021-04-26 11:43:13 -07:00
Mouse Reeve
5b5da46ede Merge branch 'main' into suggestions-redis 2021-04-26 10:43:25 -07:00
Mouse Reeve
8b154b69fb Fixes follower/following logic in suggested user annotations 2021-04-26 10:35:37 -07:00
Mouse Reeve
786cf4fb97 Paginate followers/following pages 2021-04-26 10:26:49 -07:00
Mouse Reeve
99efe6b290 Limit how many notifications are loaded 2021-04-26 10:11:13 -07:00
Mouse Reeve
7fcf48e84d Adds success notification for adding books to lists 2021-04-26 09:57:01 -07:00
Mouse Reeve
1edd00a0d1 Merge branch 'main' into list-fixes 2021-04-26 09:44:55 -07:00
Mouse Reeve
3ade2d3bb1 New version of black, new whitespace 2021-04-26 09:15:42 -07:00
Mouse Reeve
0f6b5cc6be Filter list search results to hide already added books 2021-04-26 08:02:30 -07:00
Mouse Reeve
0cb80aeb55 Preserve search results after adding a book 2021-04-26 07:24:03 -07:00
Mouse Reeve
4fb85ced5f Updates logic for new and newly discoverable users 2021-04-24 11:16:35 -07:00
Mouse Reeve
9880bdc75b Move anntotated users quuery into suggested users module 2021-04-23 18:26:48 -07:00
Mouse Reeve
dda21195de Correct calls to annotated user set 2021-04-23 16:34:04 -07:00
Mouse Reeve
126594ec49 Cleans up queryset declarations 2021-04-23 13:47:13 -07:00
Mouse Reeve
d2b2065db8 Show user's book content 2021-04-23 13:32:58 -07:00
Mouse Reeve
74ccaf27fa Tag removal migration 2021-04-22 18:23:23 -07:00
Mouse Reeve
563623616c Merge branch 'main' into remove-tags 2021-04-22 18:18:24 -07:00
Mouse Reeve
92bd5ab291
Merge pull request #970 from bookwyrm-social/display-fixes 
Display fixes
 2021-04-20 13:59:32 -07:00
Mouse Reeve
2e12d54687
Merge pull request #966 from bookwyrm-social/user-admin 
User admin
 2021-04-20 13:43:51 -07:00
Mouse Reeve
b22d1863c9 More robust user page test and bug fix 2021-04-20 12:31:45 -07:00
Mouse Reeve
0a37b4665c Adds control for moderator to set user group 2021-04-19 17:29:29 -07:00
Mouse Reeve
da19089d34 Changes language from "deactivate" to "suspend" 2021-04-19 15:55:28 -07:00
Mouse Reeve
1542866b6c Adds user admin view 2021-04-19 15:40:51 -07:00
Mouse Reeve
788e282dce Moves user admin pages into their own directory 2021-04-19 15:12:36 -07:00
Mouse Reeve
91aa6fa95f Remove unneeded page checking logic 2021-04-19 15:01:20 -07:00
Mouse Reeve
77775d9bf8 Remove superfluous calls to all() 2021-04-19 14:47:59 -07:00
Mouse Reeve
d69ce8cbbd
Merge pull request #923 from SavinaRoja/584-sorting-lists 
584 sorting of lists
 2021-04-19 14:37:50 -07:00
Pablo Barton
fa75438070 per review, removing custom pagination for booklist and handling all pending books at the end of the list 2021-04-18 14:46:28 -04:00
Pablo Barton
afd1cdc2a8 adjust test 2021-04-18 11:52:22 -04:00
Pablo Barton
3d0de5bea8 approving list items puts them at the end of the list 2021-04-18 11:15:42 -04:00
Pablo Barton
602c8c83ba black 2021-04-17 22:09:00 -04:00
Pablo Barton
9031184176 addressing some review 2021-04-17 21:31:38 -04:00
Mouse Reeve
2914eea281 Catch user not found errors in feed 2021-04-17 18:23:33 -07:00
Mouse Reeve
02e6602a0b Reject statuses from deactivated remote users 2021-04-17 17:55:22 -07:00
Mouse Reeve
45cf1cd7a7
Merge pull request #953 from bookwyrm-social/admin-filters 
Filter reports and users by server name and username
 2021-04-17 11:26:12 -07:00
Mouse Reeve
6433aa23b2 Python formatting 2021-04-17 11:09:48 -07:00
Mouse Reeve
10cf189312 Filter reports and users by server name and username 2021-04-17 10:56:26 -07:00
Mouse Reeve
e0c16b21e9 Fixes form for reporting users 2021-04-17 10:28:03 -07:00
Pablo Barton
f6824268ed 584 sorting of lists 2021-04-16 22:17:15 -04:00
Pablo Barton
88d37736ee 902 using get_page for Paginator instead of page 2021-04-15 08:54:23 -04:00
Mouse Reeve
00c6b7e6e0 Fixes regex group 2021-04-13 18:26:54 -07:00
Mouse Reeve
e8d1c04712 Fixes logic error in checking sender 2021-04-13 18:04:54 -07:00
Mouse Reeve
822e2e1a93 Python formatting 2021-04-12 15:09:50 -07:00
Mouse Reeve
a907dfdce7 Adds tests for block lists 2021-04-12 15:08:10 -07:00
Mouse Reeve
901e7f69d4 Allow admins to upload domain blocklists 
Fixes #804
 2021-04-12 14:23:51 -07:00
Mouse Reeve
659986771f Edit notes on federated servers 2021-04-11 10:36:40 -07:00
Mouse Reeve
77caf1a8fa Merge branch 'main' into domain-block 2021-04-11 10:02:11 -07:00
Mouse Reeve
b552634a87 Make sure goal exists before checking perms 2021-04-11 09:58:03 -07:00
Mouse Reeve
b6a7871b04 Makes visibility evaluator a model function 2021-04-11 09:31:18 -07:00
Mouse Reeve
98ff66cd16 Don't broadcast curation rejects 2021-04-10 18:15:13 -07:00
Mouse Reeve
675b34f5ad Merge branch 'main' into collection-item-refacotr 2021-04-10 16:02:54 -07:00
Mouse Reeve
1903812b1d Class method for checking if urls are blocked 2021-04-10 11:44:29 -07:00
Mouse Reeve
d5fbdacc02 Adds unblock view 2021-04-10 11:06:28 -07:00
Mouse Reeve
2741aa55be Makes blocking it's own view 2021-04-10 10:37:28 -07:00