Commit graph

3066 commits

Author SHA1 Message Date
Mouse Reeve 0c6948dc44
Merge pull request #1307 from bookwyrm-social/missing-migration
Adds missing migration
2021-08-17 13:35:18 -06: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 0b4a267745 Adds missing migration 2021-08-17 12:17:35 -07: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 a49ec8b94e
Merge pull request #1306 from bookwyrm-social/shelf-layout
Remove unneeded layout file
2021-08-17 12:31:17 -06:00
Mouse Reeve c2763f0c18
Merge pull request #1304 from bookwyrm-social/prevent-import-overwrite
Prevent overwriting data on import form outside data source
2021-08-17 12:13:12 -06:00
Mouse Reeve e5a3d98769 Remove unneeded layout file 2021-08-17 10:57:32 -07:00
Mouse Reeve ea749e1a3d
Merge pull request #1195 from shilpeePrasad/bookfixbranch
Fixed issue #1099 (Remove bio from Your Books)
2021-08-17 11:52:23 -06:00
Mouse Reeve bbe5ad7ce1 Suppresses pylint warning 2021-08-17 10:49:11 -07:00
Mouse Reeve 6db3391f8b Search editions in view 2021-08-17 10:45:30 -07:00
Mouse Reeve 3b54852536 Adds search filter to UI 2021-08-17 10:44:18 -07:00
Mouse Reeve 19464a8715
Merge pull request #1301 from bookwyrm-social/refactor-modals
Prompt user to add commentary on reading status updates
2021-08-17 11:27:52 -06:00
Mouse Reeve 4b788f5df1 Move editions into their own view file 2021-08-17 10:26:56 -07:00
Mouse Reeve ad0fff7030 Prevent overwriting data on import form outside data source 2021-08-17 10:08:07 -07:00
Mouse Reeve 0f0dde6c6d
Merge pull request #1298 from bookwyrm-social/comment-header-link
Fixes link in status header for comments
2021-08-17 10:43:08 -06:00
Mouse Reeve ddaf949c94
Merge branch 'main' into activitystreams-celery 2021-08-17 10:42:09 -06:00
Mouse Reeve 8b5ac6b012 Javascript linter 2021-08-17 09:28:39 -07:00
Mouse Reeve 3026a86b11 Refines preventDefault logic 2021-08-17 09:21:57 -07:00
Mouse Reeve 2f93017eaa Fixes event propogation 2021-08-17 08:45:10 -07:00
Mouse Reeve b991510c03 Fixes want to read status slug 2021-08-16 15:00:35 -07:00
Mouse Reeve d7a168e0a9 Python formatting 2021-08-16 14:00:11 -07:00
Mouse Reeve bb49d0dc9b Adds test 2021-08-16 13:59:15 -07:00
Mouse Reeve f93587c0e1 Fixes author page 2021-08-16 13:44:54 -07:00
Mouse Reeve 5fcea99029 Indicate reading status changes with comments 2021-08-16 13:39:56 -07:00
Mouse Reeve 48c6a3923a Save reading status update 2021-08-16 13:32:20 -07:00
Mouse Reeve 2d20fa4146 Adds reading status field to book statuses 2021-08-16 13:32:12 -07:00
Mouse Reeve 1e1bf83201 Create abstract parent class for book statuses 2021-08-16 13:14:29 -07:00
Mouse Reeve 6280671d92 Create comments when commentary is provided 2021-08-16 13:08:45 -07:00
Mouse Reeve f12c5df288 Show "optional" helper on comment field 2021-08-16 12:58:22 -07:00
Mouse Reeve 0549dbaa6d Make comment optional 2021-08-16 12:48:52 -07:00
Mouse Reeve 011175a6e3 Appeases js linter 2021-08-16 12:44:36 -07:00
Mouse Reeve e6b785d731 No-update mode for "want to read" 2021-08-16 12:28:04 -07:00
Mouse Reeve 257c9854c2 Move reading modal templates to their own dir 2021-08-16 11:30:11 -07:00
Mouse Reeve 7e1b606e1f Fixes link in status header for comments 2021-08-16 11:08:13 -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 5de3c75de3 Remove render from tests 2021-08-16 10:30:11 -07:00
Mouse Reeve b8082ad233 Merge branch 'main' into rss 2021-08-16 10:25:33 -07:00
Mouse Reeve 7345b85ebd Granular RSS tests 2021-08-16 10:25:21 -07:00
Mouse Reeve 71404fae06 Adds local only filter to user admin view 2021-08-16 08:51:23 -07:00
Mouse Reeve 9af435bbeb Space getting removes in reply header 2021-08-12 19:18:37 -07:00
Mouse Reeve 26b7f2ec70 Fixes main nav menu 2021-08-12 14:43:42 -07:00
Mouse Reeve 6880657deb Fixes quote display 2021-08-12 06:42:21 -07:00
Mouse Reeve 45e82abda4
Merge branch 'main' into images-django-imagekit 2021-08-11 12:47:25 -06:00
Mouse Reeve 1be125fc1d Adds database constraint for readthrough dates 2021-08-11 11:19:06 -07:00
Mouse Reeve 19ddcedf14
Merge pull request #1283 from bookwyrm-social/fixes-poll
Fixes polling variable name
2021-08-11 11:42:37 -06:00
Mouse Reeve 26ff55ebee Fixes polling variable name 2021-08-11 09:19:25 -07:00
Mouse Reeve c6e328706b Fixes required attr on content fields for composing quotes 2021-08-11 09:03:38 -07:00
Mouse Reeve 6a84309fac Fixes template links in reading progress fallback paths 2021-08-10 18:28:14 -07:00
Mouse Reeve 1b4db49035 Fixing bug preventing csv imports to match via title/author 2021-08-10 14:30:28 -07:00
Mouse Reeve eabe886347
Merge pull request #1271 from bookwyrm-social/template-refactor
Always use underscores in html ids
2021-08-09 09:04:47 -06:00
Mouse Reeve fd56379518 Updates rss feed view 2021-08-09 07:38:43 -07:00
Mouse Reeve 820eeeb69a Lowercase "rate" 2021-08-09 07:29:08 -07:00
Mouse Reeve 21a954c7df Always use underscores in html ids
Plus some other shifting around
2021-08-08 19:44:12 -07:00
Mouse Reeve 187e2e0d08
Merge pull request #1270 from bookwyrm-social/request-exception
Uses more general requests exception
2021-08-08 19:42:32 -06:00
Mouse Reeve 02fac7a46b
Merge pull request #1269 from justinabrahms/close-span
Close the span tag for an author.
2021-08-08 19:26:02 -06:00
Mouse Reeve 65e982e35b Uses more general requests exception 2021-08-08 18:13:02 -07:00
Mouse Reeve 55d84d50ee Fixes loading editions from inventaire 2021-08-08 15:55:49 -07:00
Mouse Reeve 0462a3b0fc
Merge pull request #1266 from bookwyrm-social/discover-local
Adds local discover view
2021-08-08 16:09:15 -06:00
Mouse Reeve c8e7e95c17 fixes logged out view test 2021-08-08 14:43:17 -07:00
Mouse Reeve b7b780e45c Discover not directory wth??? 2021-08-08 14:17:02 -07:00
Mouse Reeve e2f3c4602d test the correct view 2021-08-08 08:37:07 -07:00
Mouse Reeve 65fa2813c6 Show link to discover view 2021-08-08 08:07:20 -07:00
Mouse Reeve 2222c28305 Adds discover view tests 2021-08-08 08:03:04 -07:00
Mouse Reeve 3ce59d13d3 Mocks populate streams task 2021-08-08 07:32:23 -07:00
Mouse Reeve c14bcf19cc Use activitystreams to populate discovery view 2021-08-07 18:56:05 -07:00
Mouse Reeve 590338138c Populate streams tasks 2021-08-07 17:44:40 -07:00
Mouse Reeve 48a8b014ba Populate local stream for discover view 2021-08-07 17:18:20 -07:00
Mouse Reeve c28d077cb4 Simplifies query for landing page books 2021-08-07 17:12:38 -07:00
Mouse Reeve b116df723f prevent large text from janking up view 2021-08-07 16:48:53 -07:00
Mouse Reeve 4d8bd3ad93 Cleans up landing page, since we're here 2021-08-07 16:37:51 -07:00
Mouse Reeve 33c8849552 Trim sooner 2021-08-07 16:18:15 -07:00
Mouse Reeve 650a6037a2 Trims status text 2021-08-07 15:51:53 -07:00
Justin Abrahms 1006096cd0 Close the span tag for an author. 2021-08-07 15:40:50 -07:00
Mouse Reeve c685fb0296
Merge pull request #1265 from bookwyrm-social/generated-notes-activitystream
Fixes generated notes not appearing in books stream
2021-08-07 16:11:28 -06:00
Mouse Reeve 760bd5a63f Fixes reference to landing page books 2021-08-07 15:10:53 -07:00
Mouse Reeve 2eb37663b6 Adds mock to inbox test 2021-08-07 14:46:33 -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 cce7d9a648 Don't skip updates statuses when adding to streams
Generated note books are added post-initial save
2021-08-07 10:59:55 -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 026c6ac025 Mocks emailer in registration test 2021-08-07 08:01:14 -07:00
Mouse Reeve 38f614a526 Include generated notes in books stream 2021-08-07 07:56:30 -07:00
Mouse Reeve 68e4462486 Make email a required html field in register form 2021-08-07 07:43:30 -07:00
Mouse Reeve 226c325099 Adds plaintext code to emails 2021-08-07 07:37:18 -07:00
Mouse Reeve 0fa9fd7331 Registration with confirm email tests 2021-08-07 07:28:24 -07:00
Mouse Reeve aad5de3b61 Improves cross-edition display for lists 2021-08-06 19:03:15 -07:00
Mouse Reeve e198e663d1 Fixes names of site settings field in tests 2021-08-06 18:48:16 -07:00
Mouse Reeve 98a98f8e69 Updates test env 2021-08-06 18:13:51 -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 cec6943069 Adds missing mock 2021-08-06 17:43:50 -07: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 3e2f1806e9 Adds email confirmation code field 2021-08-06 14:42:18 -07:00
Mouse Reeve 3082c4ce5c Tests invite create view 2021-08-06 11:55:20 -07:00
Mouse Reeve 568e30230a Adds start import view test 2021-08-06 11:43:55 -07:00
Mouse Reeve 0d2622e4ff Tests login view 2021-08-06 11:23:38 -07:00
Mouse Reeve 3abceb8563 Templatetag test 2021-08-06 10:33:14 -07:00
Mouse Reeve 9804d4cf51 Adds more book view tests 2021-08-06 10:19:38 -07:00
Joachim 6a365eafb4
Merge branch 'main' into images-django-imagekit 2021-08-06 19:16:01 +02:00
Mouse Reeve 134db20c57 Fixes directory view 2021-08-06 09:40:01 -07:00
Mouse Reeve 9030f0d08b Bookwyrm user was already set 2021-08-06 09:14:07 -07:00
Mouse Reeve d126d7ba91 Disable comically inefficient book count comparisons
Oops! Hopefully I can restore these in a way that doesn't break at even
a moderate scale
2021-08-06 08:43:05 -07:00
Mouse Reeve 5f10e7535b
Merge pull request #1257 from bookwyrm-social/user-active-date
Fixes over-reporting user last active date
2021-08-05 22:26:14 -06:00
Mouse Reeve 6fa430efec
Merge pull request #1256 from bookwyrm-social/test-coverage
Adds misc tests to improve coverage
2021-08-05 20:52:35 -06:00
Mouse Reeve 2e7dd9d4ef Fixes over-reporting user last active date 2021-08-05 19:52:15 -07:00
Mouse Reeve b3fa8de65a fixes book mock in user view tests 2021-08-05 19:28:23 -07:00
Mouse Reeve 6b7e3f2061 Adds books stream mock 2021-08-05 19:28:23 -07:00
Mouse Reeve 061deaefda Removes invalid argument 2021-08-05 19:28:23 -07:00
Mouse Reeve 120938bee9 Update books feed on shelve 2021-08-05 19:28:05 -07:00
Mouse Reeve 48175023bc Mocks broadcast 2021-08-05 18:58:32 -07:00
Mouse Reeve 41742d6698 Adds inventaire get connector test 2021-08-05 18:16:23 -07:00
Mouse Reeve d0114d2e83 Adds test for book add description view 2021-08-05 18:07:36 -07:00
Mouse Reeve d390b395e6 fixes book mock in user view tests 2021-08-05 17:47:49 -07:00
Mouse Reeve 70a535adb7 Adds books stream mock 2021-08-05 17:19:39 -07:00
Mouse Reeve 70f4ecf870 Removes invalid argument 2021-08-05 17:13:47 -07:00
Mouse Reeve 30288c6ebb Update books feed on shelve 2021-08-05 16:43:22 -07:00
Mouse Reeve d7307463d5
Merge branch 'main' into activitystreams-celery 2021-08-05 16:11:15 -06:00
Mouse Reeve f3a757951c Tests for books stream 2021-08-05 14:28:17 -07:00
Mouse Reeve 142d0da3b7 Removes outdated tests 2021-08-04 20:01:44 -07:00
Mouse Reeve 6841a66e76 Python formatting 2021-08-04 19:57:39 -07:00
Mouse Reeve 1fbca70820 Move activitystreams updates to tasks 2021-08-04 19:54:47 -07:00
Mouse Reeve c8250ac94c Python formatting 2021-08-04 19:25:44 -07:00
Mouse Reeve 1c0472efc2 Fixes references to public streams 2021-08-04 19:19:24 -07:00
Mouse Reeve 75f586c109 Removes unused stream code 2021-08-04 19:09:00 -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 5a9dbc50da Adds books stream 2021-08-04 17:25:31 -07:00
Mouse Reeve a8d6dbd8a6 Adds books stream audience 2021-08-04 16:56:08 -07:00
Mouse Reeve 699d9307e3
Merge pull request #1251 from bookwyrm-social/prospective-follow-display
Prospective follow display
2021-08-04 14:58:52 -06:00
Mouse Reeve f5c129dce7 Also in suggestion area 2021-08-04 13:38:06 -07:00
Mouse Reeve 708a813905
Merge pull request #1249 from bookwyrm-social/goal-page
Handle goal pages for unset years
2021-08-04 14:16:45 -06:00
Mouse Reeve 54f6da2382 Use current year in goal tests 2021-08-04 12:59:06 -07:00
Mouse Reeve 12fb969821 Python formatting 2021-08-04 12:40:15 -07:00
Mouse Reeve a679a46bca Limit authors displayed in status 2021-08-04 12:36:54 -07:00
Mouse Reeve 535ff5e6d8 Handle goal pages for unset years 2021-08-04 12:05:24 -07:00
Mouse Reeve 392eb83bb3 Fixes edit user view tests 2021-08-04 11:30:23 -07:00
Mouse Reeve 9bbdde1597 Python formatting 2021-08-04 10:58:23 -07:00
Mouse Reeve bd7bf4ee96 Resolve conflict between inherited privacy and default privacy 2021-08-04 10:55:03 -07:00
Mouse Reeve e486bcf2c8 Cleans up edit user post privacy select 2021-08-04 10:49:14 -07:00
Mouse Reeve 2b1d647c85 Adds merge migration 2021-08-04 10:46:56 -07:00
Mouse Reeve 63c8301eb9 Merge branch '253-user-post-privacy-v2' of https://github.com/ibrand/bookwyrm into ibrand-253-user-post-privacy-v2 2021-08-04 10:44:30 -07:00
Mouse Reeve 97b643ac72
Merge pull request #1243 from bookwyrm-social/fixes-set-remote-server
Fixes remote server not getting set
2021-08-04 11:35:49 -06:00
Mouse Reeve 6db6aa6cb1 Fixes removing user from recs on follow 2021-08-04 09:49:05 -07:00
Mouse Reeve 89acfa4f3e Patches stray redis calls 2021-08-04 08:50:50 -07:00