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

740 commits

Author SHA1 Message Date
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
Mouse Reeve
eb12506985 No script fallback mode 2021-06-08 12:40:01 -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
Joachim
1f2c296cfd This should now work 2021-06-06 21:12:21 +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
Joachim
f206f61e9a Use global switch to enable/disable preview images 2021-05-28 17:00:07 +02: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
bdf267dea5 Refactors block button for query efficiency 2021-05-22 20:36:30 -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
0044dc6587 Show suggested users when the feed is empty 2021-05-22 11:29:41 -07:00
Mouse Reeve
00eba98e9f Fixes display of announcement show/hide button on mobile 2021-05-21 09:50:23 -07:00
Mouse Reeve
c52b26f404 Moves rss templates to base level directory 2021-05-20 16:12:24 -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
b8e9b9f57e Cleans up show/hide behavior 2021-05-20 11:46:24 -07:00
Mouse Reeve
d64e0c4aa8 Adds admin view for individual announcement 2021-05-20 08:09:35 -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
3b9fed1b31 Filter for concise status timestamps 2021-05-11 18:59:31 -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
680f300e7c Preserve width when cover images fail to load 2021-05-11 08:15:02 -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
485f4b7eba Revert "Replaces date elements with datepicker" 
This reverts commit 869cfa6d34.
 2021-05-10 14:56:33 -07:00
Mouse Reeve
dcde3ded95
Merge pull request #1049 from bookwyrm-social/datepicker 
Datepicker
 2021-05-05 07:00:07 -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
Mouse Reeve
93959fc600
Merge pull request #1036 from SavinaRoja/pagination-list 
pagination list navigation using a range of pages such as provided by get_elided_page_range
 2021-05-03 10:57:38 -07:00
Mouse Reeve
c47f672238 Removes aria-hidden from covers 2021-05-02 06:59:47 -07:00
Pablo Barton
e71a0dd7e8 pagination list navigation using a range of pages such as provided by get_elided_page_range 2021-05-01 19:30:43 -04:00
Mouse Reeve
ad8666ebec Removes extra "content" field in status editor that broke dms 2021-05-01 07:20:54 -07:00
Mouse Reeve
b4ef800505 Hide start list item in readthrough if absent 2021-04-30 12:07:59 -07:00
Mouse Reeve
57454afa42 Creates visual separation between reading activity and reviews 2021-04-30 12:02:19 -07:00
Fabien Basmaison
bcafc1bc6a Merge branch 'main' into frontend-book-cover 2021-04-30 09:54:42 +02:00
Mouse Reeve
095b60bff1 Show search result context for inventaire results 2021-04-29 11:22:09 -07:00
Fabien Basmaison
91c42b497e cover: Tweak width and height of cover on feeds. 2021-04-28 20:54:35 +02:00
Fabien Basmaison
a5359d1f80 cover: Update author. 2021-04-27 20:30:10 +02:00
Fabien Basmaison
8ddc292ee6 cover: Change the logic again: 
- Work on feeds.
- Add `.is-cover` to modify the behaviours of columns.
- Only apply logic for dimensions on the cover container; too many contextual side effects otherwise.
- Add classes to dimension and align, including auto margins for flex.
- Rename classes in templates accordingly.
 2021-04-27 16:24:20 +02:00
Fabien Basmaison
56d821970a Merge branch 'main' into frontend-book-cover 2021-04-27 09:16:10 +02:00
Mouse Reeve
64c2313a5d Merge branch 'main' into inventaire 2021-04-26 14:22:05 -07:00
Mouse Reeve
df31ac9742 Show rating in statuses 2021-04-26 11:33:17 -07:00
Fabien Basmaison
30bed6c963 Merge branch 'main' into frontend-book-cover 2021-04-26 11:35:10 +02:00
Mouse Reeve
aa557e4758
Merge pull request #971 from joachimesque/smaller-statuses-dense-cards 
Move some status footer elements to the header
 2021-04-25 10:39:23 -07:00
Fabien Basmaison
953dff90bb cover: tweak styles: 
- `optimizeQuality` > `smooth` (CSS language evolution)
- Use `auto` instead of a fixed width.
- Add exceptions for heights and apply them to some previously modified templates.
- Remove `is-large` exception.
- Widen the content column on list curation.
 2021-04-25 15:37:46 +02:00
Fabien Basmaison
23985e4357 Merge branch 'main' into frontend-book-cover 2021-04-25 11:24:21 +02:00
Mouse Reeve
bb44ede2e7 Show book preview in full statuses on mobile 2021-04-24 12:56:53 -07:00
Fabien Basmaison
eea8b4e750 cover: Handle covers with specific heights: 
- Have an explicit contextual class on `cover-container`.
- Use more flexible, consistent and searchable variable name for passing classes to covers.
- Consistently use `'…'` with django variables.
- Give the option to not hide covers to screen readers.
- consitently give a title to the cover container if `alt_text` exists.
- [lists] Remove `.content` which is applying too extensive default styles.
 2021-04-24 21:27:05 +02:00
Joachim
04e1806482 Update status_header.html 2021-04-24 20:47:39 +02:00
Joachim
59ed49f082 Update status_header.html 2021-04-24 20:39:54 +02:00
Joachim
e06154c457
Merge branch 'main' into smaller-statuses-dense-cards 2021-04-24 20:07:13 +02:00
Fabien Basmaison
783cc6edf0 cover: List curation: 
- Reduce Padding around covers.
- Remove `content` which is applying too extensive default styles.
- Style headings.
- Replace table with definition list.
- Clip cover container to avoid caption overflowing.
 2021-04-24 15:49:30 +02:00
Fabien Basmaison
9ea91d8e7c cover: Search layout: Reduce padding around covers. 2021-04-24 12:56:38 +02:00
Fabien Basmaison
7f0b3184a1 cover: Use book-cover as component: 
- Avoid specifying context-dependent values in CSS for components. Those values can be defined by the context calling the component.
- Use `<figure>` with optional caption.
- Reduce redundant markup.
- Allow more variables to be passed to the book-cover (image path and class for the container).
- Hide the book cover to screen readers.
 2021-04-24 12:48:55 +02:00
Mouse Reeve
9ba0aec6d9 Show subtitles when titles are very short 2021-04-23 14:58:48 -07:00
Mouse Reeve
607e98b331 Fixes character encoding error 2021-04-23 11:53:45 -07:00
Joachim
de19c7d7a6 Update status_header.html 2021-04-23 18:38:33 +02:00
Mouse Reeve
74ccaf27fa Tag removal migration 2021-04-22 18:23:23 -07:00
Mouse Reeve
1472f7d919 Restores markdown rendering in book description previews 2021-04-22 06:58:21 -07:00
Joachim
7a5ea31ee7 Fix progress display in title 2021-04-21 22:32:26 +02:00
Joachim
0b0a283e64 Fix buttons styles 2021-04-21 22:32:14 +02:00
Joachim
b1fea98458 Use one card-footer-item per footer button 2021-04-21 22:31:27 +02:00
Joachim
415a12cf78 Move H3 tag 2021-04-21 22:30:52 +02:00
Mouse Reeve
85b1c920cd
Merge pull request #973 from joachimesque/dropdown-style 
Dropdown component design fixes
 2021-04-21 13:08:41 -07:00
Joachim
53b47aa264 Revert "Move card footer container inside the card-footer component" 
This reverts commit 58aeb72afa.
 2021-04-21 21:48:31 +02:00
Joachim
17436b6657 Header fixes 2021-04-21 21:48:19 +02:00
Joachim
720109564d Fix condition 2021-04-21 21:35:42 +02:00
Joachim
265c38e877 Update direct message button style 2021-04-21 21:31:58 +02:00
Joachim
2987029a7d Remove useless style on non-dropdown element 2021-04-21 19:37:12 +02:00
Joachim
df72061c57 Improve menu action styles 2021-04-21 19:36:11 +02:00
Joachim
544dbda4ad Move menu item styles to menu item 2021-04-21 19:35:50 +02:00
Joachim
f01b7fbd15 Design and a11y fixes on Create Status forms 
- Use `field` CSS class to better respect Bulma styles
- Fix buggy `id` on content field, causing a11y problems
- Fix progress control & select styles
- Various small style fixes
 2021-04-21 18:34:04 +02:00
Joachim
2cacf5146b
Merge branch 'main' into smaller-statuses-dense-cards 2021-04-21 17:40:20 +02:00
Joachim
f7adaee0ed Verbosify buttons 2021-04-21 17:35:55 +02:00
Joachim
13957c2f44 Move footer some items to header 
- Header elements are now enclosed in a media layout
- Footer elements are not in a card-footer anymore
 2021-04-21 17:32:35 +02:00
Joachim
58aeb72afa Move card footer container inside the card-footer component 2021-04-21 17:23:48 +02:00
Mouse Reeve
d62cf3fecb Merge branch 'main' into smaller-statuses 2021-04-20 14:02:23 -07:00
Mouse Reeve
92bd5ab291
Merge pull request #970 from bookwyrm-social/display-fixes 
Display fixes
 2021-04-20 13:59:32 -07:00
Mouse Reeve
f4abd7b797 Linter fix 2021-04-20 13:50:53 -07:00
Mouse Reeve
5fc1e3f2fe Fixes merge regression for localized timestamps 2021-04-20 13:50:05 -07:00
Mouse Reeve
afde94d4c2
Merge branch 'main' into smaller-statuses 2021-04-20 13:48:21 -07:00
Mouse Reeve
c07dcb5458 Remove spaceless templatetags that cause rendering issues in statuses 2021-04-20 13:38:25 -07:00
Mouse Reeve
cbccb07252 Fixes display of replies 2021-04-20 11:18:59 -07:00