Commit graph

110 commits

Author SHA1 Message Date
Mouse Reeve 73a8f89bee
Merge branch 'main' into bookwyrm-groups 2021-10-06 11:37:38 -07:00
Mouse Reeve 97cc129478 Updates calls to privacy_filter 2021-10-06 10:37:09 -07:00
Hugh Rundle dafda649f1 run Black on changed code 2021-10-04 21:31:28 +11:00
Hugh Rundle 2b96b3365c Merge branch 'main' into bookwyrm-groups 2021-10-04 21:10:15 +11:00
Mouse Reeve 3c82230eed Load subclasses 2021-10-02 19:24:23 -07: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 52a083a907 revert name change for Group, GroupMember
these were named as BookwyrmGroup and BookwyrmGroupMember due to a misunderstanding about related_name and a dodgy development environment. This naming makes more sense.
2021-10-02 16:52:34 +10:00
Hugh Rundle 80fb37b55c add has_groups tag for use on user page 2021-10-02 12:12:59 +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 d78c278665 Progress update flow for modal 2021-09-29 10:59:36 -07:00
Mouse Reeve 1efe62a70e Check for readthrough annotation 2021-09-27 13:08:11 -07:00
Mouse Reeve d7a54b0b10 Removes stray print 2021-09-27 12:56:40 -07:00
Mouse Reeve dd3850a3ba Updates books test 2021-09-27 12:26:56 -07:00
Mouse Reeve ba4df5b38b Safely return if there are no current shelves 2021-09-27 11:29:53 -07:00
Mouse Reeve 35131262ff CHeck for current shelves attr before querying for it 2021-09-27 11:17:53 -07:00
Hugh Rundle 035fc5209d better logic for identifying group manager 2021-09-25 20:23:59 +10:00
Hugh Rundle 62a5ed7a9e identify group manager 2021-09-25 19:53:06 +10:00
Mouse Reeve 4a3bf1d92d Updates active readthrough templatetag 2021-09-22 12:27:57 -07:00
Mouse Reeve cf3157a3b5 Merge branch 'main' into pylint-update 2021-09-20 16:31:27 -07:00
Mouse Reeve 89fad59793 Query efficiency in user view 2021-09-20 15:25:29 -07:00
Mouse Reeve acfb1bb376 Updating string format synatx part 2 2021-09-18 11:32:00 -07:00
Mouse Reeve 8840e09eac Fixes labels 2021-09-10 14:41:55 -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 ccc41deb36 Retain whitespace in split for detecting urls 2021-09-02 13:36:01 -07:00
Mouse Reeve a236163e67 Small cleanup 2021-09-02 09:12:56 -07:00
Mouse Reeve f267e53b56 let's call it save not bookmark 2021-08-23 15:07:38 -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 3f8eefd694 Fixes want to read status header
jankily, mind you
2021-08-21 11:49:57 -07:00
Joachim bf6ee9f53c
Thumbnails: fix default size definition in template utility 2021-08-20 18:06:09 +02: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 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 45e82abda4
Merge branch 'main' into images-django-imagekit 2021-08-11 12:47:25 -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 c14bcf19cc Use activitystreams to populate discovery view 2021-08-07 18:56:05 -07:00
Mouse Reeve aad5de3b61 Improves cross-edition display for lists 2021-08-06 19:03:15 -07: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 973b23856c
Merge branch 'main' into opengraph-image-generation 2021-06-17 15:17:54 -07:00
Fabien Basmaison 6be97a6102 Be consistent between variable name & logic. Equal is already too short. 2021-06-09 19:03:15 +02:00
Fabien Basmaison c4072cbc04 Be nice to Black and follow styleguides. 2021-06-09 18:54:05 +02:00
Fabien Basmaison 0ecea5710b Use gettext to add subtitle to short titles (use variable for length). 2021-06-09 18:51:20 +02:00
Fabien Basmaison b9562e44e3 Merge branch 'main' into frontend/subtitle 2021-06-09 10:14:34 +02:00
Joachim 7d1e4aebbc Better forms 2021-06-02 18:17:53 +02:00
Joachim 7ea3153026 Fix site_path tag 2021-05-26 16:57:28 +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
Mouse Reeve ca8067769c Don't show deleted ratings in stars 2021-05-23 08:48:00 -07:00