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

733 commits

Author SHA1 Message Date
Hugh Rundle 9ffe4d340e
trigger reading status modals from move button 
- unhide reading status shelves
- trigger modals when moving to a read status shelf
- force page refresh when using move button
 2021-11-20 08:06:13 +11:00
Hugh Rundle ec39346e67
check shelf.editable instead of custom filter 2021-11-16 19:26:49 +11:00
Mouse Reeve 5e5cb26290 Preserve spaces between links 2021-11-15 11:47:39 -08:00
Hugh Rundle 168a2488e2
refactor shelf activity on book page 
- disallow moving from custom shelf to a reading status shelf with shelf_selector
- always use shelve_button for moving books from a reading status shelf
- redesign shelf information as a list of boxes
 2021-11-15 20:59:22 +11:00
Hugh Rundle c5d530c0c4 translate all read statuses 
This fixes #1566 - "Already translated strings sometimes show up untranslated in UI"

- add generatednote status header template
- include the relevant template (to-read/reading/read) based on the status.content
- remove GeneratedNote block from note status header template

This is probably not the most correct way of resolving the problem, but it's simple and it works.
 2021-10-25 15:30:48 +11:00
Mouse Reeve 9a07c11b19 Fixes group quotes and button whitespace 2021-10-24 06:43:31 -07:00
Hugh Rundle 19c7e43f50 remove followers privacy option from group form 2021-10-22 18:40:55 +11:00
Hugh Rundle 6e5c0cc4c3 Merge branch 'main' into bookwyrm-groups 
There are database migrations in main ahead of this branch so they need to be merged in to the branch before we can merge back into main.
 2021-10-17 06:22:04 +11:00
Hugh Rundle 8192d6ad10 code indenting fix 2021-10-16 18:00:55 +11:00
Hugh Rundle 85784f07d2 groups templates improvements 
- require confirmation before removing a member
- require confirmation before removing self
- make button text less verbose
- use more standardised formatting for group editing form
- improve button colours
- add missing trans tags
- reload group page when removing member
 2021-10-16 16:43:09 +11:00
Mouse Reeve 896885bffd Don't show progress field on status update comments 
Also retitle the view
 2021-10-15 14:43:02 -07:00
Mouse Reeve a9daa4670e Retain reading status on comments 2021-10-15 14:41:14 -07:00
Mouse Reeve 117e6a08b2 Merge branch 'main' into markdown 2021-10-15 10:06:34 -07:00
Mouse Reeve 2f40394c0a Updates edited display 2021-10-15 09:41:29 -07:00
Mouse Reeve 50db0bd012 Hide reply panel in no interact mode 2021-10-14 20:29:45 -07:00
Mouse Reeve af567ba05e Edit posts in original markdown syntax 2021-10-14 18:34:26 -07:00
Mouse Reeve 01911d3b23 Update and indicate edit status 2021-10-14 17:33:45 -07:00
Mouse Reeve f5e52d6a11 Save updated statuses 2021-10-14 17:23:54 -07:00
Mouse Reeve 066f14ca84 Save edited statuses 2021-10-14 17:13:54 -07:00
Mouse Reeve df27614937 Don't use localstorage cache for edits 2021-10-14 16:53:46 -07:00
Mouse Reeve e149a14e73 Use href instead of POST form to edit status 2021-10-14 16:53:42 -07:00
Mouse Reeve 7488f8da96 Creates edit status endpoint 2021-10-14 16:30:27 -07:00
Mouse Reeve 1f6f543847 Use url templatetag to load posting urls 2021-10-14 15:56:34 -07:00
Mouse Reeve 803ad3c911 Removes delete and redraft view 2021-10-13 13:12:56 -07:00
Mouse Reeve 73a8f89bee
Merge branch 'main' into bookwyrm-groups 2021-10-06 11:37:38 -07:00
Levi Bard 094931d6d1 Display half-stars in generated statuses for federation. 
Fixes #1505
 2021-10-06 11:37:27 +02:00
Hugh Rundle 3a90311129 update indenting for linter 2021-10-04 22:20:02 +11:00
Hugh Rundle 0d5c20bcde remove_from_group button updates 
- enable blocked users to be removed
- make "remove" button more subtle
 2021-10-03 13:57:21 +11:00
Hugh Rundle 602664b8d7 Merge branch 'main' into groups-merge-test 
Big merge of a couple of weeks' work from the main project back into this branch. :ohno:
 2021-10-03 10:49:38 +11:00
Hugh Rundle 29f18ee123 only suggest local users as potential group members 2021-10-02 19:35:57 +10:00
Hugh Rundle 5237e88aba remove user button for groups 2021-10-02 13:48:53 +10:00
Hugh Rundle 0984972b05 group membership invitations 
- fix display of group information on user and group pages
- send, receive, accept and reject invitations
 2021-10-02 12:30:48 +10:00
Hugh Rundle 0f3be40957 fix group references in templates 
Let's do this the sensible way huh, by using backwards references to memberships etc

Also adds filters for is_member and is_invited so we don't have to do weird things in group Views
 2021-10-02 10:47:42 +10:00
Mouse Reeve ca4b262e72 Link to status anchor 2021-10-01 14:50:42 -07:00
Mouse Reeve 8461fe5ec3 Adds anchor id to status 2021-10-01 14:12:49 -07:00
Mouse Reeve 7d03bfd2f6
Merge pull request #1477 from bookwyrm-social/add-edit-book 
Updates for adding and editing books
 2021-10-01 10:36:09 -07:00
Mouse Reeve 6178925053 Unique form identifier for delete status button 2021-09-30 22:01:55 -07:00
Mouse Reeve 5dd2aac600 Merge branch 'main' into search-refactor 2021-09-30 10:41:30 -07:00
Mouse Reeve 9a96df1712 Unique id for privacy fields 2021-09-29 15:58:37 -07:00
Mouse Reeve 305dcc504b Unique names for fallback forms 2021-09-29 15:52:08 -07:00
Mouse Reeve 5cdfd29f9e Unqiue id for progress fields 2021-09-29 15:46:54 -07:00
Mouse Reeve 6d17b83c8c Id uniqueness fixes 2021-09-29 15:35:08 -07:00
Mouse Reeve 69195e6cd0 Fixes form close placement on reading modals 2021-09-29 15:02:50 -07:00
Mouse Reeve a8ed957e20 Fixes uuid reference in toggle button snippet 2021-09-29 15:01:56 -07:00
Mouse Reeve e308ca2511
Merge pull request #1476 from bookwyrm-social/progress-modal 
Progress modal
 2021-09-29 11:23:29 -07:00
Mouse Reeve d78c278665 Progress update flow for modal 2021-09-29 10:59:36 -07:00
Mouse Reeve 4dbb09be87 Merge branch 'main' into progress-modal 2021-09-29 09:53:02 -07:00
Mouse Reeve a1eaae1d5e Fixes markup syntax errors 2021-09-29 09:48:17 -07:00
Mouse Reeve 6e05fb6dd0 Use inline form component for goal form on goal page 2021-09-29 09:39:23 -07:00
Mouse Reeve 5f3df11e56 Moves goal card to feed dir 2021-09-29 09:24:51 -07:00
Mouse Reeve 46168a292b Moves info text to goal form snippet 2021-09-29 09:23:52 -07:00
Mouse Reeve 701bf4828b Improves html consistency for goal page 2021-09-28 18:34:12 -07:00
Mouse Reeve cc1ae270cc Label shelf privacy in edit shelf form 2021-09-28 16:12:34 -07:00
Mouse Reeve 538ae015cd Fixes report template paths 2021-09-28 13:32:23 -07:00
Mouse Reeve 72cbc1cb1b Adds label 2021-09-28 09:23:50 -07:00
Mouse Reeve 273198d634 Merge branch 'main' into progress-modal 2021-09-28 08:00:45 -07:00
Hugh Rundle fb823189a0 don't allow non-local users to join groups (yet) 
Groups are not compatible with ActivityPub because I don't know what I'm doing.

NOTE: this is super hacky, fix ASAP
 2021-09-27 21:48:40 +10:00
Hugh Rundle f3181690a2 change group owner from 'manager' to 'user' 
This will allow privacy management to use existing code.
Some template updates also are for rationalising how
groups are created and edited.
 2021-09-27 15:36:41 +10:00
Hugh Rundle ec0720514e don't allow non-manager to add and remove group members 2021-09-25 20:25:30 +10:00
Hugh Rundle b645d75303 add and remove users from groups 2021-09-25 17:34:44 +10:00
Hugh Rundle cbe172df3d find users for groups 
- search for users to add to a group
- display suggested users on search results screen

TODO: actaully enable users to be added!
TODO: groups/suggested_users probably could be replaced with some logic in snippets/suggested_users.html
 2021-09-25 11:11:58 +10:00
Mouse Reeve f55803b409 Fixes updating readthroughs 2021-09-22 12:47:50 -07:00
Mouse Reeve 6bb0f3bc8f
Merge pull request #1453 from bookwyrm-social/status-whitespace 
Preserve whitespace in statuses
 2021-09-22 12:32:53 -07:00
Mouse Reeve 3eb49f3f74 Preserve whitespace in statuses 2021-09-22 12:18:12 -07:00
Mouse Reeve fa6e5605d1 Fixes goal url 2021-09-22 12:16:51 -07:00
Mouse Reeve 1ed3d4dde1 Updates search box placeholder for logged out users 2021-09-20 12:28:08 -07:00
Mouse Reeve 7c23d687b1 Use icon for content warning 
This creates consistency between the compose box and the status display
 2021-09-19 09:30:06 -07:00
Mouse Reeve e6c2ea1fbf Visually differentiates content warnings from statuses 2021-09-18 17:00:01 -07:00
Mouse Reeve cdab2cbf2c Fixes content warnings on replies 2021-09-18 16:27:13 -07:00
Mouse Reeve 01ffb8d77b Fixes form submission from compose view 2021-09-18 14:56:20 -07:00
Mouse Reeve 19e36eb181 Fixes content warning fields in modals 2021-09-18 14:05:17 -07:00
Mouse Reeve 0fe5cb1000 Show label for content warning field 2021-09-18 11:56:32 -07:00
Mouse Reeve 98325818b2 Display search results in api mode and regular 2021-09-16 10:44:33 -07:00
Mouse Reeve 1f06d1a1d8 Removes local connector 2021-09-14 15:26:36 -07:00
Mouse Reeve 8840e09eac Fixes labels 2021-09-10 14:41:55 -07:00
Mouse Reeve 0be53f9133 Adds half star markup 2021-09-10 14:20:55 -07:00
Mouse Reeve 718744a92d Adds css animation for pending create status 
Co-authored-by: Fabien Basmaison <contact@arkhi.org>
 2021-09-10 08:30:28 -07:00
Mouse Reeve 9ba066ad6d Cleanup after submitting modal 2021-09-09 17:04:16 -07:00
Mouse Reeve 79602f69d7 Separate out shelve button options lists 2021-09-09 16:32:21 -07:00
Mouse Reeve 9ee1a110a9 Update visible shelve buttons on read action 2021-09-09 15:36:58 -07:00
Mouse Reeve 055cced75b Close reply panel 2021-09-09 08:20:55 -07:00
Mouse Reeve 49f1226f3a Close modals after submit 2021-09-09 08:06:36 -07:00
Mouse Reeve 71b2f91a73 Ties draft functionality to more status fields 2021-09-08 19:30:24 -07:00
Mouse Reeve 03b608565d Save status drafts in localstorage 2021-09-08 13:58:10 -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 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 3d394f96bf Fixes testing if authors are present 2021-09-02 08:49:50 -07:00
Mouse Reeve 3a8eeb35a7 Uses modal template for progress modal 2021-08-28 09:41:36 -07:00
Mouse Reeve ae840002de Only show update option when there's an active readthrough 2021-08-27 12:21:16 -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 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 ec10ebbe68 Fixes quote type 2021-08-21 10:49:35 -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
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 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 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 9af435bbeb Space getting removes in reply header 2021-08-12 19:18:37 -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 c6e328706b Fixes required attr on content fields for composing quotes 2021-08-11 09:03:38 -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 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 68e4462486 Make email a required html field in register form 2021-08-07 07:43:30 -07:00
Joachim 6a365eafb4
Merge branch 'main' into images-django-imagekit 2021-08-06 19:16:01 +02: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 a679a46bca Limit authors displayed in status 2021-08-04 12:36:54 -07:00
Mouse Reeve bd7bf4ee96 Resolve conflict between inherited privacy and default privacy 2021-08-04 10:55:03 -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 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 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 3ea1bcb256
Merge branch 'main' into storage-s3 2021-07-05 13:06:19 +02: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 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
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
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 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