Commit graph

139 commits

Author SHA1 Message Date
Mouse Reeve ec21d20b90 Merge branch 'main' into stopped-shelf 2022-03-26 13:06:06 -07:00
Mouse Reeve 0166cca0b7 Show created date and follower counts in admin view
Adds "admin_mode" to user_preview
2022-03-24 11:17:35 -07:00
Mouse Reeve 34a4c18397
Merge branch 'main' into partially-read-shelf 2022-03-05 19:23:35 -08:00
Mouse Reeve 3dbbe0089c Show if user follows you 2022-02-28 12:07:06 -08:00
Mouse Reeve 5837c37a32 Hide followers info slug 2022-02-28 11:55:54 -08:00
Thomas Versteeg e9dfa42e11
Merge branch 'main' into partially-read-shelf 2022-02-25 21:00:29 +00:00
Mouse Reeve c77e5a1a90
Split css (#1959)
Divides the css into sub-files and normalizes how colors are defined.

Co-authored-by: Joachim <joachim.robert@protonmail.com>
2022-02-19 16:34:17 -08:00
Thomas Versteeg c88b34814f Rename 'Partially Read' to 'Stopped Reading' 2022-02-12 19:49:54 +01:00
Thomas Versteeg 2b27889457 Add 'Partially Read' shelf 2022-02-11 14:33:46 +01:00
Mouse Reeve 95c262c495 Renames group tags 2022-01-18 12:32:12 -08:00
Mouse Reeve 33c6e5aabe Moves remaining tags into new files 2022-01-18 12:28:59 -08:00
Mouse Reeve 5fd0115216 Use translation snippet 2022-01-11 12:10:30 -08:00
Mouse Reeve 4caa68200f Adds more info to the about page 2022-01-06 09:04:59 -08:00
Mouse Reeve 857bc6adae
Merge pull request #1635 from hughrun/remote-follow
Remote follow
2021-12-06 14:36:21 -08:00
Hugh Rundle 2ec6e56698
blocktrans for reading goal 2021-12-02 07:28:35 +11:00
Hugh Rundle 2602ae42b0
add translation strings
- add logic when default shelves used
- add trans strings in a few spots they were missing
2021-12-01 20:07:52 +11:00
Hugh Rundle 6e7d23c1ae
add remote follow button 2021-11-28 20:09:29 +11:00
Hugh Rundle dfe92a27c0
use shelf name if not default shelf
(instead of shelf.identifier)
2021-11-06 11:10:58 +11:00
Hugh Rundle d8098357e6
match page title to active shelf
resolves #1586
2021-11-06 10:53:41 +11:00
Hugh Rundle 864d8cea2b clean up templates 2021-10-16 08:18:55 +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 f39887cf7f groups should appear before lists on user pages 2021-10-03 10:07:47 +11: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 6e05fb6dd0 Use inline form component for goal form on goal page 2021-09-29 09:39:23 -07:00
Mouse Reeve b5d49d3499 Updates follows null state text 2021-09-28 17:30:58 -07:00
Mouse Reeve 9a4b71d585 Shuffles around user profile, shelf, and goal templates 2021-09-28 16:00:45 -07:00
Hugh Rundle 66494e7788 fix reverse reference to user bookwyrm_groups 2021-09-28 18:53:11 +10:00
Hugh Rundle 81e5ff5b76 show groups on member pages if allowed
- display groups on user pages when not the logged in user
- restrict visibility of groups on user pages and group pages themselves according to privacy settings
2021-09-27 17:51:18 +10:00
Hugh Rundle 493ed14f34 better group creation form logic and placement 2021-09-27 16:39:12 +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 8bfc71db6e create group curated lists 2021-09-26 15:56:52 +10:00
Hugh Rundle 8c326ec52f user groups listing template
- creates groups/user_groups template for listing a user's groups on their user page
2021-09-25 11:10:06 +10:00
Hugh Rundle 9b6d2a9d88 add group page 2021-09-24 20:34:11 +10:00
Hugh Rundle 4e93b09067 create group form
adds a group creation form to user dashboard
2021-09-24 14:12:36 +10:00
Hugh Rundle 71b1c6117c update templates for groups 2021-09-24 07:50:57 +10:00
Mouse Reeve d046deaf11 Adds totals and page counts to shelf headers 2021-09-05 14:42:11 -07:00
Mouse Reeve 821d0f49e2 Wraps entire div block in spaceless tag 2021-08-21 10:51:07 -07:00
Mouse Reeve d1e9a164ff Correct close tag in user null state view 2021-08-21 10:33:19 -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 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 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
Joachim 6a365eafb4
Merge branch 'main' into images-django-imagekit 2021-08-06 19:16:01 +02:00
Mouse Reeve f5c129dce7 Also in suggestion area 2021-08-04 13:38:06 -07:00
Mouse Reeve fc8db58cdb Merge branch 'main' into suggestions-redis 2021-08-02 16:40:57 -07:00
Mouse Reeve af34dc6520
Merge branch 'main' into images-django-imagekit 2021-08-02 13:43:59 -06:00
Kylie a6b8d44627 Summary display updates 2021-07-31 20:30:21 -04:00
Kylie d75f33cfb2 Apply preserve-whitespace to profile summaries 2021-07-31 13:16:47 -04:00