Commit graph

641 commits

Author SHA1 Message Date
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
Mouse Reeve
d076162aa6 Remove edit server mode
It just doesn't really make sense
2021-04-10 10:09:36 -07:00
Mouse Reeve
13d54871b7 Merge branch 'main' into domain-block 2021-04-10 09:26:01 -07:00
Mouse Reeve
27664e323a Fixes edit book form throwing error on empty dates 2021-04-08 16:08:35 -07:00
Mouse Reeve
fdf5113143 Removes tag code 2021-04-08 16:02:02 -07:00
Mouse Reeve
6617cede37 Loudly throw errors in inbox task 2021-04-08 14:15:58 -07:00
Mouse Reeve
0de1b8d0c3 Case insensitive remote user search 2021-04-08 09:59:21 -07:00
Mouse Reeve
9658123dd7
Merge pull request #893 from void-witch/fix-date
fix the book edit confirmation template dropping initial data for dates
2021-04-07 18:36:15 -07:00
Mouse Reeve
ddba61f138 Block all/unblock all users on server block 2021-04-07 16:50:12 -07:00
Mouse Reeve
8556474537 Add and edit servers 2021-04-07 13:17:51 -07:00
Mouse Reeve
ddab9af564 Functional add server form 2021-04-07 13:06:29 -07:00
Mouse Reeve
74549956c2 Adds edit server form 2021-04-07 11:52:13 -07:00
Mouse Reeve
4e0225749d Merge branch 'main' into domain-block 2021-04-07 11:23:15 -07:00
n2no1
ac86c194d4 move from strptime to dateutil for parsing date inputs 2021-04-07 14:11:13 -04:00
Mouse Reeve
e3d01c6736 Gracefully handle errors in webfinger during search 2021-04-07 09:17:04 -07:00
n2no1
31146b00e4 import MultiValueDictKeyError to catch with formcopy 2021-04-06 21:40:15 -04:00
n2no1
51e16fba97 run black, add a try/catch around the formcopy fix 2021-04-06 21:01:57 -04:00
n2no1
0941c50c69 ensure that the book edit confirmation receives initial date data as a datetime 2021-04-06 20:46:18 -04:00
Mouse Reeve
03e5da12dd Call suggestions redis in feed 2021-04-06 08:31:18 -07:00
Mouse Reeve
a4b892dfad Fixes domain block tests 2021-04-05 16:47:48 -07:00
Mouse Reeve
34b790a086 Adds tests for blocked server checks 2021-04-05 15:54:33 -07:00
Mouse Reeve
ad543f46c1 Adds block and unblock functionality 2021-04-05 15:38:32 -07:00
Mouse Reeve
1901f7e6cb Check if incoming domains are blocked 2021-04-05 15:16:41 -07:00
Mouse Reeve
bd8858830a Created generic redis class for activitstreams 2021-04-05 11:05:37 -07:00
Mouse Reeve
ea837a3879
Merge pull request #864 from mouse-reeve/delete-and-redraft
Delete and redraft
2021-04-04 11:00:09 -07:00
Mouse Reeve
03ba01a790 Expands filtering and sorting on invite requests page 2021-04-04 10:36:28 -07:00
Mouse Reeve
ff3631cbe3 Python formatting 2021-04-04 09:24:17 -07:00
Mouse Reeve
be8c3b7904 Handles delete and redraft replies 2021-04-04 09:18:52 -07:00
Mouse Reeve
936d68f0ed Don't allow delete and redraft of ratings 2021-04-04 09:08:44 -07:00
Mouse Reeve
ffb7f8f7ce Populate redraft form 2021-04-03 15:47:47 -07:00
Mouse Reeve
2a4fc8fb9a Adds model-to-form helper for statuses 2021-04-03 14:55:13 -07:00
Mouse Reeve
4cf9bca5aa Adds compose view 2021-04-03 14:32:34 -07:00
Mouse Reeve
fb900d58cd Names status urls 2021-04-03 12:38:12 -07:00
Mouse Reeve
8711a2eba5 Adds url path 2021-04-03 12:31:28 -07:00
Mouse Reeve
c5b2489330 Adds start of redraft view 2021-04-03 12:30:18 -07:00
Mouse Reeve
6211e66a5e
Merge pull request #849 from mouse-reeve/ui-small-fixes
UI small fixes
2021-04-02 07:37:31 -07:00
Mouse Reeve
e84a07430c Fixes books get started view error 2021-04-02 07:11:35 -07:00
Mouse Reeve
de16dd75c6 Python formatting 2021-04-01 20:30:50 -07:00
Mouse Reeve
7121b74a6e Helper for suggested users panel 2021-04-01 19:56:53 -07:00
Mouse Reeve
732c7a190b Don't show pending folloq requests in suggestions 2021-04-01 19:51:29 -07:00
Mouse Reeve
634509a7f3 Associate users with their invites 2021-04-01 17:20:02 -07:00
Mouse Reeve
fc31b3e0b0 Fixes invite requests page with no filters 2021-04-01 14:22:01 -07:00
Mouse Reeve
b62989b5a8 Adds invite request filters 2021-04-01 14:14:17 -07:00
Mouse Reeve
8039917b89 Preserve get params on invite send 2021-04-01 13:56:24 -07:00
Mouse Reeve
b5e98e0bdf Make invite requests sort-able 2021-04-01 13:41:08 -07:00
Mouse Reeve
bd0c0ff2a2 Changes the header copy 2021-04-01 12:46:38 -07:00
Mouse Reeve
3b725fab63
Merge pull request #839 from mouse-reeve/onboarding
Get started flow for new users
2021-04-01 10:23:04 -07:00
Mouse Reeve
1e75674f7b Fixes user view 2021-04-01 09:57:50 -07:00