Commit graph

1491 commits

Author SHA1 Message Date
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