Commit graph

1727 commits

Author SHA1 Message Date
Mouse Reeve
7b985f3a41 Sorts admin templates into even more directories 2021-09-28 12:22:41 -07:00
Mouse Reeve
057f870997 Avatar display on mobile 2021-09-28 12:09:13 -07:00
Mouse Reeve
4511bb2ccd Italics for null state text 2021-09-28 11:29:42 -07:00
Mouse Reeve
e971638f14 Render test for change password view 2021-09-28 11:09:24 -07:00
Mouse Reeve
f281d9014a Creates sections in edit profile view 2021-09-28 11:00:16 -07:00
Mouse Reeve
585c71e72a Adds html linting to test 2021-09-28 10:59:51 -07:00
Mouse Reeve
9a06b7d493 Fixes incorrect label in edit user panel 2021-09-28 09:24:09 -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
66494e7788 fix reverse reference to user bookwyrm_groups 2021-09-28 18:53:11 +10:00
Mouse Reeve
0a37556941
Merge pull request #1401 from bookwyrm-social/opensearch
Adds opensearch xml file
2021-09-27 19:48:53 -07:00
Mouse Reeve
c32f975a67 Working in firefox 2021-09-27 19:28:50 -07:00
Mouse Reeve
99ef81be9b Linter fixes 2021-09-27 19:05:13 -07:00
Mouse Reeve
15fc31bf77 Merge branch 'main' into opensearch 2021-09-27 18:58:28 -07:00
Mouse Reeve
0f57a43bfb Separate access controls for delete and re-order 2021-09-27 13:31:35 -07:00
Mouse Reeve
10098a402d Don't show list item controls to contributing viewers 2021-09-27 13:25:53 -07:00
Mouse Reeve
bc87856c2e Merge branch 'main' into book-format-choices 2021-09-27 10:29:12 -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
e15eef16c5 improve new group member adding
The add-members page now looks almost identical to the group
page and is clearer.
2021-09-27 21:21:00 +10:00
Levi Bard
0e6895633c Allow adding a cover by url when adding a new book (#1443) 2021-09-27 13:00:16 +02:00
Hugh Rundle
df5a5f94a1 fix local_path for groups 2021-09-27 19:27:39 +10:00
Hugh Rundle
c87712c995 allow group members to add items to group lists directly
NOTE: this will be the case regardless of privacy settings of the list
2021-09-27 18:41:29 +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
277c033fda show star if this user is the creator/manager of the group 2021-09-27 17:50:38 +10:00
Hugh Rundle
e5ca377cd3 clean up stray code mess 2021-09-27 16:50:51 +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
762202c4b0 fix UI for group curated list editing
When creating or editing a list, the group selection dropdown will only appear if the user selects "group" as the curation option (or it is already selected).

- fix typo in bookwyrm.js comments
- add data-hides trigger for hiding elements after they have been unhidden, where simple toggles are not the right approach
2021-09-27 11:03:41 +10:00
Hugh Rundle
0e2095bc5e refer to group in group lists created_text 2021-09-26 20:52:44 +10:00
Hugh Rundle
5fccb991a7 remove list from group when changing curation
Allows 'group' to be blank when saving a list.
Removes the 'group' field when saving a list with curation other than 'group' - this stops the list "sticking" to a group after it is changed from group curation to something else.
2021-09-26 18:28:16 +10:00
Hugh Rundle
8bfc71db6e create group curated lists 2021-09-26 15:56:52 +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
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
Hugh Rundle
b645d75303 add and remove users from groups 2021-09-25 17:34:44 +10:00
Hugh Rundle
e800106be4 smaller cards for group members
- this will also enable members to be removed easily by managers in a future commit.
2021-09-25 11:37:08 +10:00
Hugh Rundle
8d17f888ea improve naming of templates and urls for groups 2021-09-25 11:36:35 +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
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
d4fcf88cf5 add list cards to groups page
- add list cards to groups page based on lists page
- add sort to members on group page
2021-09-24 21:57:01 +10:00
Hugh Rundle
86a60d58e5 add user cards to group pages 2021-09-24 21:24:06 +10:00
Hugh Rundle
264d9b2f3c add group page template 2021-09-24 20:35:51 +10:00
Hugh Rundle
9b6d2a9d88 add group page 2021-09-24 20:34:11 +10:00
Hugh Rundle
f32a2cc4d0 group creation form can now be submitted!
Whoops
2021-09-24 15:04:52 +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
99b533510a add group templates 2021-09-24 07:51:51 +10:00
Hugh Rundle
71b1c6117c update templates for groups 2021-09-24 07:50:57 +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
70f66f4cd4
Merge pull request #1439 from bookwyrm-social/search-placeholder
Updates search box placeholder for logged out users
2021-09-20 17:42:05 -07:00
Mouse Reeve
a304333acf Don't show delete button in create list form 2021-09-20 14:25:11 -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
f772210d05 Clips tiles on discover view 2021-09-19 09:21:13 -07:00
Mouse Reeve
bc693216c6
Merge pull request #1428 from bookwyrm-social/cw-style
Visually differentiates content warnings from statuses
2021-09-19 08:55:12 -07:00
Mouse Reeve
a119c69592 Use dash instead of vertical line to separate page name and site name 2021-09-18 17:09:18 -07:00
Mouse Reeve
e6c2ea1fbf Visually differentiates content warnings from statuses 2021-09-18 17:00:01 -07:00
Mouse Reeve
b1984aeaf7
Merge pull request #1427 from bookwyrm-social/reply-cws
Reply cws
2021-09-18 16:40:38 -07:00
Mouse Reeve
c8aa0e9330 Send dms through http post 2021-09-18 16:28:38 -07:00
Mouse Reeve
cdab2cbf2c Fixes content warnings on replies 2021-09-18 16:27:13 -07:00
Mouse Reeve
c664c0e9b5
Merge pull request #1426 from bookwyrm-social/register-view
Improvements to register view
2021-09-18 16:13:53 -07:00
Mouse Reeve
40040b39da Fixes incorrect close tag 2021-09-18 16:04:11 -07:00
Mouse Reeve
d80feb7470 Renames landing layout template 2021-09-18 15:56:29 -07:00
Mouse Reeve
38c66b208c Adds customizable invite request copy 2021-09-18 15:45:04 -07:00
Mouse Reeve
1be4f31a9e Cleans up display of login page 2021-09-18 15:15:48 -07:00
Mouse Reeve
246ab992ae Consistent layout for invite registration page 2021-09-18 15:10:25 -07:00
Mouse Reeve
7901da3b74
Merge pull request #1425 from bookwyrm-social/delete-and-redraft
Fixes form submission from compose view
2021-09-18 15:07:09 -07:00
Mouse Reeve
7a6a4cd7c1
Merge pull request #1424 from bookwyrm-social/checkall
Fixes select all checkbox
2021-09-18 15:02:55 -07:00
Mouse Reeve
01ffb8d77b Fixes form submission from compose view 2021-09-18 14:56:20 -07:00
Mouse Reeve
dda36f22c2 Fixes select all checkbox 2021-09-18 14:48:03 -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
6022e7b232 Adds IP blocklist views 2021-09-17 13:04:10 -07:00
Mouse Reeve
beb482f1db Linter fixes
Temporarily disables C0209 because it's out of scope to fix here
2021-09-16 11:47:44 -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
e24f2ea8c1 Null state text for announcements view 2021-09-12 10:14:56 -07:00
Mouse Reeve
0f31586ab6 Email domain isn't a sortable column 2021-09-12 10:10:21 -07:00
Mouse Reeve
be7fae2053 Show recent servers first 2021-09-12 10:02:15 -07:00
Mouse Reeve
22f01508d2 Show user count in federated server table 2021-09-12 09:59:35 -07:00
Mouse Reeve
0f3e71978e Federated and blocked tabs 2021-09-11 14:41:52 -07:00
Mouse Reeve
6f531beb1c Don't just write "none" when the info is absent 2021-09-11 14:32:10 -07:00
Mouse Reeve
992e478e95 Use readable/translatable strings for db choices 2021-09-11 14:23:47 -07:00
Mouse Reeve
84b90db4bb Adds filtering to admin panel 2021-09-11 08:47:16 -07:00
Mouse Reeve
fc69729f93 Link to dashboard from menu 2021-09-11 07:17:14 -07:00
Mouse Reeve
19cdda372c Tidies up charts 2021-09-11 07:14:14 -07:00
Mouse Reeve
a79fb14686 Basic dashboard page 2021-09-10 21:12:08 -07:00
Mouse Reeve
7c3cf095f3 Adds opensearch xml file 2021-09-10 16:47:59 -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
fd353ecb87 Fixes label 2021-09-10 12:15:51 -07:00
Mouse Reeve
def4d89bf8 Adds short description to edit site form 2021-09-10 12:13:24 -07:00
Mouse Reeve
9de6407e5f
Merge pull request #1395 from bookwyrm-social/delete-user-clarification
Adds copy to clarify how to delete a user as a moderator
2021-09-10 11:22:35 -07:00
Mouse Reeve
110273d277 Adds copy to clarify how to delete a user as a moderator 2021-09-10 11:03:45 -07:00
Mouse Reeve
a4e6f610cd Adds javascript cache value to templates 2021-09-10 10:57:16 -07:00
Mouse Reeve
08d2bff7ca General function for displaying messages 2021-09-10 10:12:37 -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
053e2cea0d Clear localstorage items 2021-09-09 07:39:38 -07:00
Mouse Reeve
71b2f91a73 Ties draft functionality to more status fields 2021-09-08 19:30:24 -07:00
Mouse Reeve
59ec45496c Merge branch 'main' into draft-caching 2021-09-08 18:55:47 -07:00
Mouse Reeve
de3c79ce21 Merge branch 'main' into email-blocking 2021-09-08 17:43:08 -07:00
Mouse Reeve
fadcbbcec7 Adds deletion form 2021-09-08 17:34:01 -07:00
Mouse Reeve
15344b6a8e Let moderators delete users 2021-09-08 17:21:45 -07:00
Mouse Reeve
658e12eb86 Allow admins to suspend pending users 2021-09-08 16:47:12 -07:00
Mouse Reeve
d28db51a14 Adds delete functionality 2021-09-08 16:24:13 -07:00
Mouse Reeve
97f0d82b05 Missing close td tag 2021-09-08 15:49:52 -07:00
Mouse Reeve
cc61d44cef Removes stray tag 2021-09-08 15:38:34 -07:00
Mouse Reeve
605af3bf88 Not going to implement that today 2021-09-08 15:33:53 -07:00
Mouse Reeve
8717d8a675 Create new email domain block entries 2021-09-08 15:31:01 -07:00
Mouse Reeve
c705178c3b Adds create block form 2021-09-08 15:08:22 -07:00
Mouse Reeve
fd0cf49b40 Adds html and view for email blocklist 2021-09-08 14:32:11 -07:00
Mouse Reeve
84fcc358fa Renames layout file 2021-09-08 14:06:43 -07:00
Mouse Reeve
03b608565d Save status drafts in localstorage 2021-09-08 13:58:10 -07:00
Mouse Reeve
90800c190f Show suggested users toggle in user prefs page 2021-09-08 10:06:26 -07:00
Mouse Reeve
527c0542af View to hide suggestions 2021-09-08 10:03:23 -07:00
Mouse Reeve
bb29f33ca8 Fixes goal prompt not appearing in feed 2021-09-08 09:38:36 -07:00
Mouse Reeve
4570d042a9 Tooltip icon 2021-09-08 08:56:13 -07:00
Mouse Reeve
1bf09459b5 Changes tooltip paradigm 2021-09-08 08:19:54 -07:00
Mouse Reeve
95bdf7b787 Adds goodreads data tooltip 2021-09-08 07:35:49 -07:00
Mouse Reeve
e13e13d3f3 Move import templates into directory 2021-09-08 07:28:42 -07:00
Mouse Reeve
d63e7243f5 Adds tooltip component 2021-09-08 07:26:51 -07:00
Mouse Reeve
2a93a8ea66 Adds class to status page 2021-09-07 18:16:26 -07:00
Mouse Reeve
8a748fa675 Adds format fields to edit book view 2021-09-07 12:49:28 -07:00
Mouse Reeve
aa856b0155
Merge pull request #1369 from bookwyrm-social/delete-lists
Delete lists
2021-09-06 13:16:56 -07:00
Mouse Reeve
d212cbfd3c Adds new template 2021-09-06 11:54:53 -07:00
Mouse Reeve
1e037d20a4 Adds delete button to list 2021-09-06 10:03:00 -07:00
Mouse Reeve
eb67c4730f Renames list layout file 2021-09-06 09:48:57 -07:00
Mouse Reeve
2886c15e1d Adds more info to user admin page 2021-09-06 09:35:25 -07:00
Mouse Reeve
a68196d9bb Improves user admin filter behavior 2021-09-06 08:54:57 -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
fb0989e902
Merge pull request #1362 from bookwyrm-social/fallback-modal
Fallback modal
2021-09-05 15:53:35 -07:00
Mouse Reeve
99904618ac Fixes close buttons on modals 2021-09-05 15:24:09 -07:00
Mouse Reeve
11b23e9bc7
Merge pull request #1361 from bookwyrm-social/shelf-counts
Shelf counts
2021-09-05 15:17:50 -07:00
Mouse Reeve
d046deaf11 Adds totals and page counts to shelf headers 2021-09-05 14:42:11 -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
a236163e67 Small cleanup 2021-09-02 09:12:56 -07:00
Mouse Reeve
3d394f96bf Fixes testing if authors are present 2021-09-02 08:49:50 -07:00
Mouse Reeve
76ba56f656 Fixes admin permissions 2021-08-29 08:14:53 -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
2ec01803e0 Fixes error for logged out user viewing lists 2021-08-24 14:16:22 -07:00
Mouse Reeve
d59ac297bb Indicate if a list is saved on the lists tile view 2021-08-23 15:54:20 -07:00
Mouse Reeve
f267e53b56 let's call it save not bookmark 2021-08-23 15:07:38 -07:00
Mouse Reeve
a30094c822 View bookmarked lists 2021-08-23 13:40:07 -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
6f8ca302e5 Clearer form logic in edit book page 2021-08-21 11:38:57 -07:00
Mouse Reeve
e31783ef6e Cleans up html on import status page 2021-08-21 11:15:56 -07:00
Mouse Reeve
270571668d adds space between attributes on book page 2021-08-21 11:05:38 -07:00
Mouse Reeve
a235811524 Fixes quote style on author page 2021-08-21 11:04:26 -07:00
Mouse Reeve
821d0f49e2 Wraps entire div block in spaceless tag 2021-08-21 10:51:07 -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
24d1513320 Removes stray close tag in announcements 2021-08-21 10:49:50 -07:00
Mouse Reeve
ec10ebbe68 Fixes quote type 2021-08-21 10:49:35 -07:00
Mouse Reeve
85a4c331eb Use search results template for isbn view 2021-08-21 10:48:26 -07:00
Mouse Reeve
053579c2a4 Clarifies logic in file upload widget 2021-08-21 10:33:50 -07:00
Mouse Reeve
d1e9a164ff Correct close tag in user null state view 2021-08-21 10:33:19 -07:00
Mouse Reeve
af2abcbe3d Missing close link tag in manage invites view 2021-08-21 10:32:55 -07:00
Mouse Reeve
5bd92a8e34 Fixes "view directory" link html and adds it to l10n 2021-08-21 10:32:32 -07:00
Mouse Reeve
1aab9e7da9 Fixes endif placement on null state for feed 2021-08-21 10:30:44 -07:00
Mouse Reeve
be94c0a76b Remove stray </dl> tag 2021-08-21 10:30:15 -07:00
Mouse Reeve
9a7429b268 Larger cover sizes for discover and landing views 2021-08-19 15:30:58 -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
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
Joachim
25858ed3aa Added LibraryThing and Goodreads links 2021-05-24 12:51:41 +02:00
Joachim
594f7b3708 Style fixes 2021-05-24 12:51:18 +02:00
Joachim
58c07d1677 Apply review suggestions 2021-05-24 12:36:48 +02:00
Joachim
55a3a28d49 Add microformats to author page 2021-05-23 21:17:14 +02:00
Joachim
6e9c9e839c Fix date of death display 2021-05-23 20:25:42 +02:00
Mouse Reeve
4e9c7a7748
Merge pull request #1070 from bookwyrm-social/top-bar
Top bar
2021-05-23 08:42:14 -07:00
Joachim
354b511089 Fix flex styles 2021-05-23 17:18:16 +02:00
Joachim
1aa319d6ee Move description text below header 2021-05-23 17:17:46 +02:00
Joachim
cf7cbfdf8f Fix title styles 2021-05-23 17:17:30 +02:00
Joachim
9eb719106f Fix display bug 2021-05-23 17:17:02 +02:00
Joachim
251c8bbd08 Merge remote-tracking branch 'upstream/main' into list-style-fixes 2021-05-23 15:14:50 +02:00
Jason Kelly
6e655cb0e0 Added new widget to alert if a file is set at larger than 10 MB.
- Updated default widget to use template that adds a notification box.
- Added JS to add onchange & load events to look at the value in the input and trigger the notification & disable the form submits.
2021-05-23 14:12:00 +08:00
Mouse Reeve
bdf267dea5 Refactors block button for query efficiency 2021-05-22 20:36:30 -07:00
Mouse Reeve
9285f483c2 Query tweaks for book page 2021-05-22 20:14:57 -07:00
Mouse Reeve
7a4c4248df Improves status template performance
Reduces queries about about 65
2021-05-22 19:01:40 -07:00
Mouse Reeve
3d3ab6433e Improves query efficiency for shelve buttons
About 50 fewer queries (yikes)
2021-05-22 17:58:08 -07:00
Mouse Reeve
368d2cd716 Reduces feed page queries for goals
9 fewer queries
2021-05-22 17:34:16 -07:00
Mouse Reeve
644e5926db Remove suggested users on block 2021-05-22 14:05:59 -07:00
Mouse Reeve
0044dc6587 Show suggested users when the feed is empty 2021-05-22 11:29:41 -07:00
Mouse Reeve
d33b55e025 Hide delete button text on mobile 2021-05-21 09:52:40 -07:00
Mouse Reeve
00eba98e9f Fixes display of announcement show/hide button on mobile 2021-05-21 09:50:23 -07:00
Mouse Reeve
a70c713c29 Fixes default values in edit announcement form 2021-05-20 20:21:04 -07:00
Mouse Reeve
d39374f13c Fixes editions page 2021-05-20 18:41:36 -07:00
Mouse Reeve
c52b26f404 Moves rss templates to base level directory 2021-05-20 16:12:24 -07:00
Mouse Reeve
9c13bf34a8 Only show banner to authenticated users 2021-05-20 15:11:47 -07:00
Mouse Reeve
cefc5994a6 Makes extra content optional 2021-05-20 12:40:03 -07:00
Mouse Reeve
2e193aa3c6 Delete announcements 2021-05-20 12:08:12 -07:00
Mouse Reeve
a415991e96 Fixes clashing filter names in templates 2021-05-20 11:56:26 -07:00
Mouse Reeve
b8e9b9f57e Cleans up show/hide behavior 2021-05-20 11:46:24 -07:00
Mouse Reeve
49916a7498 Sorting for announcement headers and pagination 2021-05-20 09:43:29 -07:00
Mouse Reeve
3d70a36d86 Editable announcement 2021-05-20 09:28:39 -07:00
Mouse Reeve
d64e0c4aa8 Adds admin view for individual announcement 2021-05-20 08:09:35 -07:00
Mouse Reeve
c73c063949 Show announcements on all pages 2021-05-19 15:35:14 -07:00
Mouse Reeve
346d718265 Don't need both name and preview 2021-05-19 15:18:43 -07:00
Mouse Reeve
515d5bb237 Create announcements admin view 2021-05-19 14:57:28 -07:00
Mouse Reeve
8fc0da8dc2 Adds inventaire ID field to edit book form 2021-05-18 16:10:43 -07:00
Mouse Reeve
6fff45d36c Adds language field to edit book form 2021-05-18 15:56:11 -07:00
Mouse Reeve
0bddad259b
Merge pull request #1095 from bookwyrm-social/display-fixes
Display fixes
2021-05-18 11:46:28 -07:00
Mouse Reeve
9f789cd5d4
Merge branch 'main' into top-bar 2021-05-18 11:39:36 -07:00
Mouse Reeve
04c165113f Cleans up login page 2021-05-18 11:22:45 -07:00
Mouse Reeve
58a059c85f Fixes display of user ratings 2021-05-18 11:17:59 -07:00
Mouse Reeve
07d59c8c09 Don't show ratings below user statuses 2021-05-18 11:09:19 -07:00
Mouse Reeve
ab69abb8f0 Gap between book search results 2021-05-18 10:57:54 -07:00
Mouse Reeve
8b14f8585e Small fixes for list display 2021-05-18 10:55:05 -07:00
Mouse Reeve
5cd5a6107f Show text with buttons in most places 2021-05-18 10:45:51 -07:00
Mouse Reeve
7dccce6b1f Adds keyboard focus to add readthrough form 2021-05-18 09:59:40 -07:00
Mouse Reeve
2b4ac71d7a Updates footer language around github link 2021-05-14 15:21:26 -07:00
Mouse Reeve
3b9fed1b31 Filter for concise status timestamps 2021-05-11 18:59:31 -07:00
Mouse Reeve
865faf6714 Fixes tests 2021-05-11 15:52:41 -07:00
Mouse Reeve
65f78b45da Merge branch 'main' into templatetags 2021-05-11 15:41:07 -07:00
Mouse Reeve
87bf863ac6
Revert "Preserve width when cover images fail to load" 2021-05-11 15:29:18 -07:00
Mouse Reeve
ac2b63d0cd More templatetag files 2021-05-11 15:14:42 -07:00
Mouse Reeve
58da17d694 Use smaller templatetag modules 2021-05-11 14:41:28 -07:00
Mouse Reeve
f5eb5f982a Removes filter for checking for follow requests 2021-05-11 14:05:46 -07:00
Mouse Reeve
63172ecf00 Fixes ratings on shelf pages 2021-05-11 13:54:38 -07:00
Mouse Reeve
1fbd6537b7 Remove unnecessary tags from import page 2021-05-11 13:28:52 -07:00
Mouse Reeve
680f300e7c Preserve width when cover images fail to load 2021-05-11 08:15:02 -07:00
Mouse Reeve
4c99fd7f12 Adds metadata to author view 2021-05-10 17:24:10 -07:00
Mouse Reeve
443109bac3 Adds aliases and inventaire id to edit author form
Plus consolidates some wording
2021-05-10 17:06:22 -07:00
Mouse Reeve
9bfe4f4e91 Uses a different snippet for previewing books on author page 2021-05-10 16:43:40 -07:00
Mouse Reeve
867a33de57 Creates author template dir 2021-05-10 16:34:37 -07:00
Mouse Reeve
27fe09a32b
Merge pull request #1062 from alisww/storygraph-import
add storygraph import
2021-05-10 16:23:00 -07:00
Mouse Reeve
202c43f610 Adds import option to books page 2021-05-10 16:13:17 -07:00
Mouse Reeve
6abe9274c0 Switches out links in the top bar and dropdown 2021-05-10 15:55:42 -07:00
Mouse Reeve
3f4807a345 Revert "Adds datepicker script dependencies to templates"
This reverts commit 33ca7b4b76.
2021-05-10 14:56:43 -07:00
Mouse Reeve
485f4b7eba Revert "Replaces date elements with datepicker"
This reverts commit 869cfa6d34.
2021-05-10 14:56:33 -07:00
allie
314a27841b Merge branch 'bookwyrm-social:main' into storygraph-import 2021-05-10 18:52:54 -03:00
Mouse Reeve
b0055f398d Makes the show/hide buttons easier to find in book search 2021-05-10 13:24:00 -07:00
allie
df99060898 Merge branch 'bookwyrm-social:main' into storygraph-import 2021-05-10 15:58:04 -03:00
Allie Signet
36439506b6 add storygraph import 2021-05-10 14:00:51 -03:00
Mouse Reeve
852f8da62e Adds tabs to notifications 2021-05-07 14:00:55 -07:00
Fabien Basmaison
a137bd21ff
Display author biography with style. 😎 2021-05-06 17:24:05 +02:00
Joachim
1f747e4f68
Merge branch 'main' into list-style-fixes 2021-05-05 16:06:48 +02:00
Mouse Reeve
dcde3ded95
Merge pull request #1049 from bookwyrm-social/datepicker
Datepicker
2021-05-05 07:00:07 -07:00
Mouse Reeve
906201fa2a Fixes notification import link 2021-05-04 09:45:13 -07:00
Mouse Reeve
748810cd41 Use reverse lookups for urls 2021-05-04 09:34:16 -07:00
Mouse Reeve
869cfa6d34 Replaces date elements with datepicker 2021-05-04 09:04:21 -07:00