Commit graph

3320 commits

Author SHA1 Message Date
Mouse Reeve 59ec45496c Merge branch 'main' into draft-caching 2021-09-08 18:55:47 -07:00
Mouse Reeve c007f44030 Linter's have demands 2021-09-08 17:54:50 -07:00
Mouse Reeve 7ef179a4f3 Merge migration 2021-09-08 17:44:17 -07:00
Mouse Reeve de3c79ce21 Merge branch 'main' into email-blocking 2021-09-08 17:43:08 -07:00
Mouse Reeve bcb78653e9 Fixes remove email domain test 2021-09-08 17:39:22 -07:00
Mouse Reeve fadcbbcec7 Adds deletion form 2021-09-08 17:34:01 -07:00
Mouse Reeve f5de1c903e Adds deletion test 2021-09-08 17:33:43 -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 31e6e59047 Updates test 2021-09-08 16:48:23 -07:00
Mouse Reeve 658e12eb86 Allow admins to suspend pending users 2021-09-08 16:47:12 -07:00
Mouse Reeve 21527803de Fixes delete test 2021-09-08 16:35:36 -07:00
Mouse Reeve b891f32707 Adds deletion test 2021-09-08 16:31:15 -07:00
Mouse Reeve d28db51a14 Adds delete functionality 2021-09-08 16:24:13 -07:00
Mouse Reeve 7638f99c1b Adds tests 2021-09-08 16:14:13 -07:00
Mouse Reeve 97f0d82b05 Missing close td tag 2021-09-08 15:49:52 -07:00
Mouse Reeve 5441b5b7f3 Prevent users from registering with blocked emails 2021-09-08 15:49:18 -07:00
Mouse Reeve cc61d44cef Removes stray tag 2021-09-08 15:38:34 -07:00
Mouse Reeve 59096ae9ec Adds email filtering to user admin view 2021-09-08 15:37:52 -07:00
Mouse Reeve 605af3bf88 Not going to implement that today 2021-09-08 15:33:53 -07:00
Mouse Reeve c4a43d5029 Updates migration 2021-09-08 15:31:07 -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 21de8e66be Formats url 2021-09-08 14:39:43 -07:00
Mouse Reeve 7a684a2f96 Adds model 2021-09-08 14:39:38 -07:00
Mouse Reeve fd0cf49b40 Adds html and view for email blocklist 2021-09-08 14:32:11 -07:00
Mouse Reeve 84fcc358fa Renames layout file 2021-09-08 14:06:43 -07:00
Mouse Reeve 03b608565d Save status drafts in localstorage 2021-09-08 13:58:10 -07:00
Mouse Reeve d9090e723d
Merge pull request #1384 from bookwyrm-social/generate-image-transaction
Generate image task failing when transaction hasn't completed
2021-09-08 12:17:58 -07:00
Mouse Reeve 4db5677509 Fixes filters 2021-09-08 12:06:23 -07:00
Mouse Reeve 88a65b0b88 Only re-rank on bookwyrm instances 2021-09-08 11:47:36 -07:00
Mouse Reeve d3b3dd6d99 Update suggestions on domain block 2021-09-08 11:38:22 -07:00
Mouse Reeve 2e2ee72333 Fixes inactive or mastodon users showing up in suggestions
They shouldn't be there, but just to be safe
2021-09-08 11:26:41 -07:00
Mouse Reeve e06e507c8d Cleans up suggested users logic 2021-09-08 11:14:41 -07:00
Mouse Reeve b826d29b0d Generate image task failing when transaction hasn't completed 2021-09-08 10:20:44 -07:00
Mouse Reeve 90800c190f Show suggested users toggle in user prefs page 2021-09-08 10:06:26 -07:00
Mouse Reeve 527c0542af View to hide suggestions 2021-09-08 10:03:23 -07:00
Mouse Reeve bb29f33ca8 Fixes goal prompt not appearing in feed 2021-09-08 09:38:36 -07:00
Mouse Reeve a5ef8aa6e9 Adds flag on user model to hide suggested users 2021-09-08 09:30:13 -07:00
Mouse Reeve c9f9c0de58 Fixes boosts task 2021-09-08 09:21:15 -07:00
Mouse Reeve 4570d042a9 Tooltip icon 2021-09-08 08:56:13 -07:00
Mouse Reeve 1bf09459b5 Changes tooltip paradigm 2021-09-08 08:19:54 -07:00
Mouse Reeve 95bdf7b787 Adds goodreads data tooltip 2021-09-08 07:35:49 -07:00
Mouse Reeve e13e13d3f3 Move import templates into directory 2021-09-08 07:28:42 -07:00
Mouse Reeve d63e7243f5 Adds tooltip component 2021-09-08 07:26:51 -07:00
Mouse Reeve 2a93a8ea66 Adds class to status page 2021-09-07 18:16:26 -07:00
Mouse Reeve e0f5f13a5a Fixes guessing read dates from goodreads csv 2021-09-07 18:09:43 -07:00
Mouse Reeve aa91361fe4 Fixes celery kwarg for queue 2021-09-07 17:09:44 -07:00
Mouse Reeve 26adf2d974 Fixes queue for import task 2021-09-07 17:04:10 -07:00
Mouse Reeve de3f18655c Set priorities on tasks 2021-09-07 16:33:43 -07:00
Mouse Reeve b41293e2ce
Merge pull request #1375 from bookwyrm-social/celery-settings
Simplify celery settings
2021-09-07 15:23:05 -07:00
Mouse Reeve 47ba2478b6 Split out test files 2021-09-07 15:06:44 -07:00
Mouse Reeve 37dcae4558 Simply celery settings 2021-09-07 14:02:03 -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 da3bc1e591 Python formatting 2021-09-07 12:05:34 -07:00
Mouse Reeve 6bc4bf4503 Fixes mock 2021-09-07 12:02:29 -07:00
Mouse Reeve b717c2fcd8 Fixes mock arg on test 2021-09-07 11:57:18 -07:00
Mouse Reeve 82ad1abe9a more activitystreams tests 2021-09-07 11:53:41 -07:00
Mouse Reeve d147c6ac2f Separate tests into more files 2021-09-07 11:13:18 -07:00
Mouse Reeve a4041911c6 Adds tests more activitystreams tasks 2021-09-07 11:01:27 -07:00
Mouse Reeve f4b43af600 Creates test files for activitystreams 2021-09-07 10:24:09 -07:00
Mouse Reeve 5a224b5aa4 Use atomic when creating new users 2021-09-07 10:09:28 -07:00
Mouse Reeve f25835feeb Fixes error breaking registration 2021-09-07 09:39:42 -07:00
Mouse Reeve 93d9e7b1a1
Merge pull request #1254 from bookwyrm-social/activitystreams-celery
Move activitystreams updates to tasks
2021-09-06 21:33:01 -07:00
Mouse Reeve 0a9d515d45 two more mocks 2021-09-06 20:37:09 -07:00
Mouse Reeve 9988a3e82b More test fixes 2021-09-06 18:58:45 -07:00
Mouse Reeve c56a9021b6 A few more failing tests 2021-09-06 18:55:48 -07:00
Mouse Reeve 2653458e56 another round of mocks 2021-09-06 18:40:12 -07:00
Mouse Reeve 59400511c9 mocks mocks more mocks 2021-09-06 17:55:44 -07:00
Mouse Reeve db34918347 Updates user view test 2021-09-06 16:33:21 -07:00
Mouse Reeve 4ea9637a2d Updates activitystreams tests 2021-09-06 16:16:45 -07:00
Mouse Reeve e35c805960 Fixes typo in function call 2021-09-06 15:48:02 -07:00
Mouse Reeve 4db2557581 Fixes handling boosts 2021-09-06 15:39:32 -07:00
Mouse Reeve 38dc640dd5 Mock for goodreads import test` 2021-09-06 15:10:52 -07:00
Mouse Reeve 227b72eaf9 Fixes mocks syntax 2021-09-06 15:09:04 -07:00
Mouse Reeve 72d5238590 More mocks 2021-09-06 14:50:33 -07:00
Mouse Reeve bb94995389 Where you need one mock, you probably need the other 2021-09-06 14:48:45 -07:00
Mouse Reeve a6b0ba1826 Updates activistreams add_status mock 2021-09-06 13:53:49 -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 a8973336d9 Adds mock to list items creation 2021-09-06 12:58:18 -07:00
Mouse Reeve 8382d1a684 Updates tests 2021-09-06 12:31:13 -07:00
Mouse Reeve cb21099e0b Fixes serialization of delete activity 2021-09-06 12:00:10 -07:00
Mouse Reeve ae81d6cf71 More tests 2021-09-06 11:55:04 -07:00
Mouse Reeve d212cbfd3c Adds new template 2021-09-06 11:54:53 -07:00
Mouse Reeve 5640ae4f7e Handle deletions of ordered collections 2021-09-06 11:24:08 -07:00
Mouse Reeve c4f2d67048 Adds view tests 2021-09-06 11:17:36 -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 1e037d20a4 Adds delete button to list 2021-09-06 10:03:00 -07:00
Mouse Reeve eb67c4730f Renames list layout file 2021-09-06 09:48:57 -07:00
Mouse Reeve 2886c15e1d Adds more info to user admin page 2021-09-06 09:35:25 -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 1681b2563d Merge branch 'main' into quote-page 2021-09-05 16:08:54 -07:00
Mouse Reeve b80de929fd Create and view quotation page numbers 2021-09-05 16:00:40 -07:00
Mouse Reeve fb0989e902
Merge pull request #1362 from bookwyrm-social/fallback-modal
Fallback modal
2021-09-05 15:53:35 -07:00
Mouse Reeve 99904618ac Fixes close buttons on modals 2021-09-05 15:24:09 -07:00
Mouse Reeve a2811b6c1b Fixes redirects in fallback post modal 2021-09-05 15:24:03 -07:00
Mouse Reeve 11b23e9bc7
Merge pull request #1361 from bookwyrm-social/shelf-counts
Shelf counts
2021-09-05 15:17:50 -07:00
Mouse Reeve d046deaf11 Adds totals and page counts to shelf headers 2021-09-05 14:42:11 -07:00
Mouse Reeve 7ac9616c29
Merge pull request #1358 from bookwyrm-social/review-content-field
Remove required attribute on content field in create review form
2021-09-05 14:21:01 -07:00
Mouse Reeve 94f4a01665 Remove requried attribute on content field in create review form 2021-09-05 13:25:57 -07:00
Mouse Reeve 4009e80bab Fixes logo path on about page 2021-09-05 10:33:40 -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
Mouse Reeve a236163e67 Small cleanup 2021-09-02 09:12:56 -07:00
Mouse Reeve 3d394f96bf Fixes testing if authors are present 2021-09-02 08:49:50 -07:00
Mouse Reeve d7557926f7 Create task for shelve updates 2021-08-30 14:08:53 -07:00
Mouse Reeve 32f044445f Fix merge weirdness around shelve/unshelve 2021-08-30 14:00:38 -07:00
Mouse Reeve 54f1b0aee2 Merge branch 'main' into activitystreams-celery 2021-08-30 13:48:34 -07:00
Mouse Reeve c3ff7fcf9b Resolves merge weirdness 2021-08-30 13:44:19 -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 aa946e3ab7 add more test cases for link formatting 2021-08-30 11:12:27 -05:00
reesporte 5291308677 fix link formatting issues 2021-08-30 11:12:05 -05:00
Mouse Reeve e98ee64e2b Merge migration 2021-08-29 11:20:30 -07:00
Mouse Reeve 57ef1522b5 Merge branch 'main' into readthrough-dates 2021-08-29 11:18:35 -07:00
Mouse Reeve 66f8e9b4fc Fixes model name 2021-08-29 11:12:57 -07:00
Mouse Reeve fc40c45591
Merge pull request #1339 from bookwyrm-social/privacy
Fixes parsing privacy fields from federated posts
2021-08-29 10:52:36 -07:00
Mouse Reeve 082c2708a7 Fixes attribution field logic 2021-08-29 08:50:46 -07:00
Mouse Reeve 8c8b1168d4 Support attribution field on boosts 2021-08-29 08:22:14 -07:00
Mouse Reeve 76ba56f656 Fixes admin permissions 2021-08-29 08:14:53 -07:00
Mouse Reeve 0569bce610 Cleaner string formatting in user model 2021-08-29 07:37:21 -07:00
Mouse Reeve 9eea60b35c Fixes call to followers url in serialization 2021-08-29 07:36:59 -07:00
Mouse Reeve 05e5db177d
Merge pull request #1338 from bookwyrm-social/default-ap-value
Use None instead of empty string for activitypub null value
2021-08-28 13:53:04 -07:00
Mouse Reeve 8629c4450c Adds test for user followers field from AP 2021-08-28 12:20:43 -07:00
Mouse Reeve a5dcc0e5e4 Support multiple possible fields that indicate user ownership 2021-08-28 12:11:15 -07:00
Mouse Reeve 9c4fd1e602 Set user default values 2021-08-28 12:06:03 -07:00
Mouse Reeve 1e675384bc Updates user model test 2021-08-28 11:58:41 -07:00
Mouse Reeve e4b5890992 Updates field tests 2021-08-28 11:41:33 -07:00
Mouse Reeve 2c26b04119 Uses correct object to determine author 2021-08-28 11:30:54 -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 4f94d99c88 Use None instead of empty string for activitypub null value 2021-08-28 11:16:39 -07:00
Mouse Reeve dc72df7339 Generate likely followers url for existing users 2021-08-28 11:15:17 -07:00
Mouse Reeve 53d9ff87d9 Look up followers url to determine post privacy 2021-08-28 10:40:52 -07:00
Mouse Reeve e9d951e4cd Add user model field for followers url 2021-08-28 10:33:57 -07:00
Mouse Reeve f308b7793d Adds test for followers only privacy level 2021-08-28 10:08:41 -07:00
Mouse Reeve e1af13d038 Adds test 2021-08-28 09:55:06 -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 497b54c014 Updates test 2021-08-27 11:38:34 -07:00
Mouse Reeve e129b9c1f1 Adds more readthrough model tests 2021-08-27 11:16:51 -07:00
Mouse Reeve 2c78eddbeb Normalize readthrough dates in advance of migration 2021-08-27 10:47:56 -07:00
Mouse Reeve 3f2f8f0e50 Updates migrations 2021-08-27 10:32:51 -07:00
Mouse Reeve 01d82cfa3a Merge branch 'main' into readthrough-dates 2021-08-27 10:25:41 -07:00
Mouse Reeve 2ec01803e0 Fixes error for logged out user viewing lists 2021-08-24 14:16:22 -07:00
Mouse Reeve fe75049177
Merge pull request #1329 from bookwyrm-social/list-flag
Indicate if a list is saved on the lists tile view
2021-08-23 17:26:17 -06:00
Mouse Reeve 6115ead363
Merge pull request #1330 from bookwyrm-social/resolve-book-errors
Safely handle work with no editions error
2021-08-23 17:26:08 -06:00
Mouse Reeve ac3a989e37
Merge pull request #1328 from bookwyrm-social/unread-count
Increment unread count less wildly
2021-08-23 17:22:59 -06:00
Mouse Reeve 332a712d84 Safely handle work with no editions error 2021-08-23 15:59:58 -07:00
Mouse Reeve 016930fd0c
Merge pull request #1327 from bookwyrm-social/lists
Bookmark lists
2021-08-23 16:54:36 -06:00
Mouse Reeve d59ac297bb Indicate if a list is saved on the lists tile view 2021-08-23 15:54:20 -07:00
Mouse Reeve 26e932aa7b Increment unread count less wildly
Works on #1293
2021-08-23 15:47:14 -07:00
Mouse Reeve 473ad5ffba Fixes tests 2021-08-23 15:35:51 -07: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 b7fb55e6ad Fixes test for login redirected view 2021-08-23 14:53:48 -07:00
Mouse Reeve 47dbcc3af0 Adds views test 2021-08-23 14:15:19 -07:00
Mouse Reeve d3cfceafca Mocks creation of boost 2021-08-23 13:58:19 -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 135fcbd269 Adds button to template 2021-08-23 13:02:27 -07:00
Mouse Reeve 457415f874 Adds bookmark icon 2021-08-23 11:36:22 -07:00
Mouse Reeve eca0ff371c Adds saved lists many to many field 2021-08-23 11:19:15 -07:00
Mouse Reeve 16235d1d90 Actually use provided stoers list 2021-08-23 10:48:23 -07:00
Mouse Reeve 9c21f4d8e6 Adds tests for boosts in activitystreams 2021-08-23 10:44:38 -07:00
Mouse Reeve f284eebece Fixes boosts removing statuses from feeds 2021-08-23 07:04:59 -07:00
Mouse Reeve 7345705b08 Small efficiency improvement in list view 2021-08-21 20:21:39 -07:00
Mouse Reeve e76163ffae
Merge pull request #1322 from bookwyrm-social/want-to-read-header
Fixes want to read status header
2021-08-21 13:09:34 -06: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 3f8eefd694 Fixes want to read status header
jankily, mind you
2021-08-21 11:49:57 -07:00
Mouse Reeve 6f8ca302e5 Clearer form logic in edit book page 2021-08-21 11:38:57 -07:00
Mouse Reeve e31783ef6e Cleans up html on import status page 2021-08-21 11:15:56 -07:00
Mouse Reeve 270571668d adds space between attributes on book page 2021-08-21 11:05:38 -07:00
Mouse Reeve a235811524 Fixes quote style on author page 2021-08-21 11:04:26 -07:00
Mouse Reeve 821d0f49e2 Wraps entire div block in spaceless tag 2021-08-21 10:51:07 -07:00
Mouse Reeve f48cea3ed9 Fixes endquote outside of if statement 2021-08-21 10:50:49 -07:00
Mouse Reeve e7ee4a45fa adds missing button close tag in shelve button options 2021-08-21 10:50:27 -07:00
Mouse Reeve 24d1513320 Removes stray close tag in announcements 2021-08-21 10:49:50 -07:00
Mouse Reeve ec10ebbe68 Fixes quote type 2021-08-21 10:49:35 -07:00
Mouse Reeve 85a4c331eb Use search results template for isbn view 2021-08-21 10:48:26 -07:00
Mouse Reeve 053579c2a4 Clarifies logic in file upload widget 2021-08-21 10:33:50 -07:00
Mouse Reeve d1e9a164ff Correct close tag in user null state view 2021-08-21 10:33:19 -07:00
Mouse Reeve af2abcbe3d Missing close link tag in manage invites view 2021-08-21 10:32:55 -07:00
Mouse Reeve 5bd92a8e34 Fixes "view directory" link html and adds it to l10n 2021-08-21 10:32:32 -07:00
Mouse Reeve 1aab9e7da9 Fixes endif placement on null state for feed 2021-08-21 10:30:44 -07:00
Mouse Reeve be94c0a76b Remove stray </dl> tag 2021-08-21 10:30:15 -07:00
Mouse Reeve 596b6ca084 Resolves warning in books view 2021-08-21 07:25:18 -07:00
Joachim bf6ee9f53c
Thumbnails: fix default size definition in template utility 2021-08-20 18:06:09 +02:00
Mouse Reeve 7a390af07e
Merge pull request #1314 from bookwyrm-social/modal-overflow
Adds max height to modals so they don't disappear on small screens
2021-08-19 18:11:11 -06:00
Mouse Reeve 451cb38c6c Linter fix 2021-08-19 15:33:23 -07:00
Mouse Reeve 9a7429b268 Larger cover sizes for discover and landing views 2021-08-19 15:30:58 -07:00
Mouse Reeve 8ba695c21d Adds max height to modals so they don't disappear on small screens 2021-08-19 15:19:10 -07:00
Mouse Reeve 0829696add
Merge pull request #1138 from joachimesque/images-django-imagekit
Generate thumnails for books
2021-08-18 19:53:12 -06:00
Joachim 489f97030e apply suggested changes 2021-08-18 10:27:17 +02:00
Mouse Reeve 075715ca22 Use gettext_lazy not gettext 2021-08-17 14:35:28 -07:00