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

1304 commits

Author SHA1 Message Date
Mouse Reeve
0829696add
Merge pull request #1138 from joachimesque/images-django-imagekit 
Generate thumnails for books
 2021-08-18 19:53:12 -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
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
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
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
3026a86b11 Refines preventDefault logic 2021-08-17 09:21:57 -07:00
Mouse Reeve
b991510c03 Fixes want to read status slug 2021-08-16 15:00:35 -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
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
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
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
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
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
21a954c7df Always use underscores in html ids 
Plus some other shifting around
 2021-08-08 19:44:12 -07: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
65fa2813c6 Show link to discover view 2021-08-08 08:07:20 -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
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
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
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
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
Joachim
6a365eafb4
Merge branch 'main' into images-django-imagekit 2021-08-06 19:16:01 +02:00
Mouse Reeve
9d75bc3982 Display books timeline 2021-08-04 17:53:44 -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
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
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
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
Joachim
73fd098068 Better naming of context variable 2021-08-04 11:42:18 +02:00
Joachim
843127efa8 Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-08-04 10:00:20 +02:00
Joachim
14bf7fca2e Update book_cover.html 2021-08-03 18:03:34 +02:00
Joachim
ce4553b367 Add simple tag to provide fallback if original image doesn't exist 2021-08-03 17:45:52 +02:00
Mouse Reeve
fc8db58cdb Merge branch 'main' into suggestions-redis 2021-08-02 16:40:57 -07:00
Mouse Reeve
806638888e Stay on page when logging in from top bar 
Was this bugging other people? It bugged me to no end.
 2021-08-02 16:24:36 -07:00
Mouse Reeve
2370f60436
Update bookwyrm/templates/snippets/book_cover.html 
Co-authored-by: Joachim <joachim.robert@protonmail.com>
 2021-08-02 14:46:56 -06:00
Mouse Reeve
9b97fbc0ae
Fixes error in merge 2021-08-02 12:56:11 -07:00
Mouse Reeve
af34dc6520
Merge branch 'main' into images-django-imagekit 2021-08-02 13:43:59 -06:00
Joachim
1a53f5c18a Update renamed layout.html 2021-08-01 11:38:44 +02:00
Joachim
78aa31afd5 Merge remote-tracking branch 'upstream/main' into storage-s3 2021-08-01 11:38:32 +02:00
Kylie
a6b8d44627 Summary display updates 2021-07-31 20:30:21 -04:00
Kylie
3f01cf8788
Update user_card.html 2021-07-31 19:58:12 -04:00
Kylie
d75f33cfb2 Apply preserve-whitespace to profile summaries 2021-07-31 13:16:47 -04:00
Kylie
7af7a7b575 Recognize profile summary linebreaks + whitespace 2021-07-30 23:50:21 -04:00
Mouse Reeve
7f44693e0c Renames feed layout file to be more consistent with other templates 2021-07-28 13:21:42 -07:00
Mouse Reeve
c9602e28ce Use consistant header size 2021-07-28 13:19:56 -07:00
Mouse Reeve
436afb0ebd Fixes heirarchy and classes in feed layout 2021-07-28 13:17:56 -07:00
Mouse Reeve
b84ffeda08
Merge pull request #1221 from cincodenada/shelved-date 
Add shelved date, populate from Goodreads import
 2021-07-19 17:11:22 -06: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
3f15e4410e Fixes link to edit book 2021-07-12 16:17:20 -07:00
Mouse Reeve
fede777e9b Hide deleted status counts from book page 2021-07-07 09:37:21 -07:00
Joachim
3ea1bcb256
Merge branch 'main' into storage-s3 2021-07-05 13:06:19 +02:00
root
ad3dc16005 Removrd Bio from Your books 2021-06-22 13:18:23 +00:00
Joachim
7818a4347f Specify width (250px) on Instance Description image 2021-06-20 15:57:08 +02:00
Joachim
e251b687dc Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-06-19 19:32:56 +02:00
Joachim
dee63d8825 Rename MEDIA_PATH to MEDIA_FULL_URL and handle protocol 2021-06-19 17:09:53 +02:00
Joachim
c9c7a673d7 Fix template dependency 2021-06-19 12:02:48 +02:00
Joachim
6607c8b185 Better handling of absolute URLs with domain + scheme 2021-06-19 11:54:19 +02:00
Joachim
d862be0564 Merge remote-tracking branch 'upstream/main' into storage-s3 2021-06-19 11:53:05 +02:00
Mouse Reeve
98ae586889 Newline in following template 2021-06-18 16:52:12 -07:00
Mouse Reeve
5b6048e4c6 Merge branch 'main' into suggestions-redis 2021-06-18 16:48:04 -07:00
Mouse Reeve
ea556bd83b
Merge pull request #1142 from joachimesque/opengraph-image-generation 
Generate OpenGraph images for books, users, and site.
 2021-06-18 14:47:54 -07:00
Mouse Reeve
7775d943d4 Fixes list link to user profile 2021-06-18 12:11:07 -07:00
Joachim
7e26a38403 Fix summary image format 2021-06-18 19:15:36 +02:00
Joachim
5d41781e6a Fix scheme 2021-06-18 19:15:24 +02:00
Mouse Reeve
22636041ba Use null instead of zero for unrated review 2021-06-17 17:47:46 -07:00
Mouse Reeve
973b23856c
Merge branch 'main' into opengraph-image-generation 2021-06-17 15:17:54 -07:00
Fabien Basmaison
cc03460e00 Avoid space within parenthesises for series when no number is provided. 2021-06-17 17:18:55 +02:00
Fabien Basmaison
7f01dcf3b9 Merge branch 'main' into frontend/subtitle 2021-06-17 17:12:23 +02:00
Mouse Reeve
27a3d0ae96
Merge branch 'main' into 253-user-post-privacy-v2 2021-06-14 16:47:57 -07:00
Mouse Reeve
c4f7f34ad4 Fixes edit readthrough toggle display 2021-06-14 16:04:58 -07:00
Mouse Reeve
3600f6ca3c Handle overflow text in notifications 2021-06-14 16:00:17 -07:00
Mouse Reeve
a82bf99bd6 Icon-only link display on mobile for text links 2021-06-14 15:55:26 -07:00
Mouse Reeve
fe2309f0bc Fixes orientation of edition want to read menu 2021-06-14 15:45:39 -07:00
Mouse Reeve
5a236e333f Fixes directory profile link 2021-06-14 15:33:03 -07:00
Mouse Reeve
2a606eec3e scroll horizontally on user page shelf preview 2021-06-14 15:27:37 -07:00
Mouse Reeve
f4a6e18759
Merge pull request #1173 from bookwyrm-social/series-space 
Fixes trailing space in series text
 2021-06-14 12:49:41 -07:00
Mouse Reeve
6e6354bcce Fixes trailing space in series text 
Fixes #1145
 2021-06-14 12:34:11 -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
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
Fabien Basmaison
17635b47db Fix case where there is no subtitle. 
Consequentially change back author to being a subtitle.
 2021-06-11 09:41:55 +02:00
Fabien Basmaison
cf751a8efa Merge branch 'main' into frontend/subtitle 2021-06-11 08:49:46 +02:00
Mouse Reeve
ce4a57e5c9 Reading status view name 2021-06-09 11:16:52 -07:00
Mouse Reeve
3c7c8a1797 Fixes urls in fallback mode 2021-06-09 11:05:05 -07:00
Mouse Reeve
113ced2900 Merge reading status views into one view 2021-06-09 10:53:52 -07:00
Fabien Basmaison
f58c1d1138 Tweak styles for subtitle: 
- Make it bold as the title while preserving consistency with other subtitles.
- Pull the author closer to the subtitle to preserve a descending visual and typographic scales.
 2021-06-09 12:20:34 +02:00
Fabien Basmaison
5047b8bf94 Do not break document structure with ratings. 2021-06-09 11:12:38 +02:00
Fabien Basmaison
b9562e44e3 Merge branch 'main' into frontend/subtitle 2021-06-09 10:14:34 +02:00
Mouse Reeve
eb12506985 No script fallback mode 2021-06-08 12:40:01 -07:00
Mouse Reeve
3356c652ee Adds standalone modal views for reading steps 2021-06-08 11:55:18 -07:00
Mouse Reeve
1231d40e80 Want to read view 2021-06-08 11:23:53 -07:00
Joachim
d105ae9c78 Merge remote-tracking branch 'upstream/main' into images-django-imagekit 2021-06-07 19:53:11 +02:00
Joachim
2731ea9aa9 Add env var to enable/disable thumbnail generation 2021-06-07 19:52:25 +02:00
Joachim
b448d40514 Use the right snippets on Templates 2021-06-07 18:13:24 +02:00
Mouse Reeve
5b40069d99
Merge pull request #1153 from bookwyrm-social/instance-language 
Use "instance" consistently
 2021-06-06 14:07:49 -07:00
Joachim
1f2c296cfd This should now work 2021-06-06 21:12:21 +02:00
Mouse Reeve
c8d2df1203
Merge pull request #1155 from joachimesque/front-modal-title-fit 
Front: Modal title fit
 2021-06-05 12:43:35 -07:00
Mouse Reeve
d1e33e14e2
Merge pull request #1154 from joachimesque/front-better-forms 
Front-end: Better forms
 2021-06-05 12:38:20 -07:00
Mouse Reeve
bbbae9fc9d
Merge branch 'main' into images-django-imagekit 2021-06-05 11:46:57 -07:00
Mouse Reeve
61e55628fa
Merge pull request #1131 from joachimesque/author-page-microformats 
Author page microformats
 2021-06-05 11:27:16 -07:00
Joachim
6f105fcdcc Front: Modal title fit 2021-06-02 18:56:24 +02:00
Joachim
49c057625a Smol fixes 2021-06-02 18:30:36 +02:00
Joachim
7d1e4aebbc Better forms 2021-06-02 18:17:53 +02:00
Mouse Reeve
2816d7cc88 Use "instance" consistently 2021-06-01 14:50:14 -07:00
Mouse Reeve
ff45238667
Merge pull request #1123 from eatsleepdeploy/add-max-upload-size-config 
Add max upload size config
 2021-06-01 14:09:50 -07:00
Joachim
f206f61e9a Use global switch to enable/disable preview images 2021-05-28 17:00:07 +02:00
Joachim
f848dcd756 Fix issue with protocol 2021-05-26 18:20:22 +02:00
Joachim
e362c82495 Expose static & media paths 2021-05-26 17:54:59 +02:00
Joachim
7ea3153026 Fix site_path tag 2021-05-26 16:57:28 +02:00
Joachim
22c13f639c Update layout.html 2021-05-26 15:18:35 +02:00
Joachim
e5e549d125 Add opengraph image depending on context 2021-05-26 14:44:15 +02:00
Fabien Basmaison
c894f5ef35 Update subtitle behaviour: 
- on Book
	- Remove problematic punctuation (locale and multiple punctuation if the title ends with `?`, `!` or similar).
	- Update view.
	- Use proper semantic to split combined title into `name`, `alternativeHeadline` and series-related microdata.
	- The author is not a subtitle, just data.
- Use parenthesis in the `get_title` filter instead of punctuation.
 2021-05-26 13:21:06 +02:00
Joachim
b72580daf6 Update author.html 2021-05-24 17:17:12 +02:00
Mouse Reeve
ea0f7ff925
Merge pull request #1137 from bookwyrm-social/title-header 
Uses correct filter for book title
 2021-05-24 07:21:12 -07:00
Joachim
36f447210a Specify sizes on all templates 2021-05-24 16:18:05 +02:00
Joachim
dc49432322 Change img_path to external_path 2021-05-24 16:17:39 +02:00
Joachim
c1456ce853 Update .cover-caption name and styles 2021-05-24 16:16:33 +02:00
Joachim
4c55f07f2a Update book_cover.html 2021-05-24 16:16:09 +02:00
Mouse Reeve
f058aa8f1d Uses correct filter for book title 2021-05-24 06:54:43 -07:00