Commit graph

4211 commits

Author SHA1 Message Date
Joachim
489f97030e apply suggested changes 2021-08-18 10:27:17 +02:00
Mouse Reeve
45e82abda4
Merge branch 'main' into images-django-imagekit 2021-08-11 12:47:25 -06: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
adc8f36bb9
Merge pull request #1282 from bookwyrm-social/quote-content-field
Fixes required attr on content fields for composing quotes
2021-08-11 10:27:38 -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
86f2231f38
Merge pull request #1281 from bookwyrm-social/fallbackpage-templates
Fixes template links in reading progress fallback paths
2021-08-10 20:56:21 -06:00
Mouse Reeve
e668f42801
Merge pull request #1277 from reesporte/spanish-translation
spanish translations
2021-08-10 19:29:37 -06:00
Mouse Reeve
6a84309fac Fixes template links in reading progress fallback paths 2021-08-10 18:28:14 -07:00
Mouse Reeve
533c9563eb
Merge pull request #1279 from bookwyrm-social/import-fix
Fixing bug preventing csv imports to match via title/author
2021-08-10 15:43:12 -06:00
Mouse Reeve
1b4db49035 Fixing bug preventing csv imports to match via title/author 2021-08-10 14:30:28 -07:00
reese
1d4a507ea9 spanish translations 2021-08-09 22:19:54 -05: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
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
710f834e53
Merge pull request #1268 from bookwyrm-social/inventaire-works
Fixes loading editions from inventaire
2021-08-08 17:24:34 -06: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
da849e9f1f
Merge pull request #1263 from reesporte/spanish-translations
update spanish translations
2021-08-07 16:18:30 -06: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
7b86537f1a
Merge pull request #1264 from arkhi/i18n
[french] Translate strings about email confirmation.
2021-08-07 14:23:44 -06:00
Fabien Basmaison
06c5ae06a6 [french] Compile French locale. 2021-08-07 21:47:30 +02: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
Fabien Basmaison
a0d2f38970 [french] Translate strings about email confirmation. 2021-08-07 19:35:43 +02:00
reese
468f1f135c update spanish translations 2021-08-07 11:35:07 -05: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