Commit graph

1537 commits

Author SHA1 Message Date
SleeplessOne1917
74727cacd4
Merge branch 'main' into auth-error-message 2023-07-02 22:35:17 +00:00
SleeplessOne1917
e7f7bc2e36
Merge branch 'main' into feat/create-post-file-upload-a11y 2023-07-02 22:22:15 +00:00
SleeplessOne1917
73198ac03a
Merge branch 'main' into auth-error-message 2023-07-02 22:14:46 +00:00
SleeplessOne1917
02adbea61f Move export to barrel file 2023-07-02 18:14:13 -04:00
Jay Sitter
23ee563dfb
Merge branch 'main' into fix/vote-button-no-spinners-1761 2023-07-02 17:36:52 -04:00
Jay Sitter
d620dea0b3
Merge branch 'main' into feat/create-post-file-upload-a11y 2023-07-02 17:33:01 -04:00
Jay Sitter
0047c17eb3 fix: Fix avatar image overlay aspect ratio 2023-07-02 17:24:06 -04:00
Jay Sitter
61276ec4e5 fix: Fix circle image aspect ratio 2023-07-02 17:14:00 -04:00
Jay Sitter
3c6505b9fd fix: Add some spacing between upload field and image; fix circle image aspect ratio 2023-07-02 16:08:55 -04:00
SleeplessOne1917
31789495a2 Prevent JWT token from showing up on error page 2023-07-02 15:45:45 -04:00
SleeplessOne1917
b3d096d41d
Merge branch 'main' into fix/fix-joined-check-color 2023-07-02 19:25:36 +00:00
Jay Sitter
0bd0a49730
Merge branch 'main' into feat/create-post-file-upload-a11y 2023-07-02 15:24:18 -04:00
Jay Sitter
c2990fd644
Merge branch 'main' into undefined_quote 2023-07-02 15:11:48 -04:00
Jay Sitter
65fcaafab7 fix: Fix vote buttons not showing spinners while registering vote #1761 2023-07-02 15:07:37 -04:00
Jay Sitter
548e5560a1 fix: Fix joined button check color 2023-07-02 14:47:45 -04:00
Jay Sitter
b8c2e1e2ca fix: Fix up filter row gaps and margins a little 2023-07-02 14:42:30 -04:00
Jay Sitter
a48c20a772 fix: Fix heading levels 2023-07-02 14:29:56 -04:00
Jay Sitter
93d0bc44ea fix: Simplify row classes a bit 2023-07-02 13:43:28 -04:00
Jay Sitter
302c6b496d fix: Fix some gaps in search filters 2023-07-02 13:36:29 -04:00
Jay Sitter
2c56c2e59d fix: Fix row gap on search options 2023-07-02 13:26:07 -04:00
Jay Sitter
350b1b28ee fix: Add bottom margin to inbox controls 2023-07-02 13:22:03 -04:00
Jay Sitter
d258edfbaf fix: Small cleanup to search/inbox controls 2023-07-02 13:18:16 -04:00
SleeplessOne1917
1e2f333bb0
Merge branch 'main' into fix/expand-button-when-no-link 2023-07-02 15:48:24 +00:00
Jay Sitter
28dc62d44c
Merge branch 'main' into dm_fix 2023-07-02 11:46:51 -04:00
Jay Sitter
868601fa58 fix: Update comment to reflect new logic 2023-07-02 11:26:44 -04:00
Jay Sitter
195e258a51 fix: Post expand button was not showing if body-only post 2023-07-02 11:23:42 -04:00
SleeplessOne1917
53a5bdbb5c
Merge branch 'main' into fix/list-view-vote-button-width 2023-07-02 15:23:23 +00:00
Jay Sitter
a72cc6807e fix: Fix vote buttons in list view variable width 2023-07-02 11:20:02 -04:00
Jay Sitter
34f2b73063 fix: Fix thumb buttons having gray background #1754 2023-07-02 11:02:53 -04:00
Jeff Sandberg
17bcfe5257
Add metaKey to markdown-textarea, for macos
On MacOS, Ctrl is less commonly used than Command (⌘).
Javascript expresses command as `metaKey`.

This allows for _either_ Ctrl or Command to be used in the Markdown text
area.

Note that on Windows, on some browsers, the "windows" key is labeled as meta, so it would
work on windows as well.

http://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/metaKey
2023-07-02 04:11:09 -06:00
SleeplessOne1917
2c335483dd
Merge branch 'main' into undefined_quote 2023-07-01 23:32:59 +00:00
sunaurus
c68d2b8ee6
Fix jwt cookie path 2023-07-02 02:04:44 +03:00
sunaurus
47cbe3e002
Fix quotedText bugs in markdown editor 2023-07-01 19:57:06 +03:00
sunaurus
653094eddb
Fix DM replies 2023-07-01 19:26:30 +03:00
sunaurus
515f5f5af3
Add fallback date-fns locale import 2023-07-01 18:57:19 +03:00
sunaurus
ed1f208e47
Fix date-fns locale import failing for some locales 2023-06-30 19:59:44 +03:00
Alec Armbruster
af22947c0f
fix req.cookie nonexistent -.- 2023-06-30 10:35:57 -04:00
Alec Armbruster
0bcb2d77be
wip 2023-06-30 10:04:19 -04:00
Alec Armbruster
7743fa98b9
wip 2023-06-30 10:04:01 -04:00
Alec Armbruster
c804cf958a
Merge branch 'main' of https://github.com/LemmyNet/lemmy-ui into fix-cache-auth 2023-06-30 09:52:15 -04:00
Diamond
a7592d74bb
Enforce SameSite=Strict (#1713) 2023-06-30 09:51:41 -04:00
Alec Armbruster
da45ffb46b
fix cache auth method 2023-06-30 09:42:09 -04:00
SleeplessOne1917
cc184a86c8 Fix authorized route false flag 2023-06-29 18:12:22 -04:00
SleeplessOne1917
2d88e42cab Fix dev caching issue 2023-06-29 16:33:08 -04:00
SleeplessOne1917
fa41117320
Merge branch 'main' into cache-control 2023-06-29 13:35:44 -04:00
Alec Armbruster
d8ee0ec78a
change max-age to 5 for non-authed responses 2023-06-29 13:33:30 -04:00
Alec Armbruster
fead020bdc
Fix PostListing mobile margin layout issue (#1706) 2023-06-29 17:28:55 +00:00
SleeplessOne1917
339cefa2b0 Cache static data for a day 2023-06-29 13:14:48 -04:00
Alec Armbruster
80d9aac1ca
Fix taglines on Home (#1701)
* fix taglines on home

* fix error on admin panel
2023-06-29 10:38:35 -04:00
SleeplessOne1917
751495702c
Use git hash to break cache (#1684)
* Use git hash to break cache

* Address PR feedback

* Make hash docker agnostic

* Add trailing slash

* Update .prettierignore

Co-authored-by: Alec Armbruster <35377827+alectrocute@users.noreply.github.com>

* Remove debugging log

* implement getStaticDir util

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Alec Armbruster <35377827+alectrocute@users.noreply.github.com>
2023-06-29 10:29:33 -04:00
SleeplessOne1917
6bf159261a
Merge branch 'main' into fix_datetime_2 2023-06-29 09:36:24 -04:00
Alec Armbruster
73be96880a
fix issue with thumbnails (#1695) 2023-06-29 09:34:47 -04:00
Alec Armbruster
dc439b8dee
Merge branch 'main' into fix_datetime_2 2023-06-29 09:32:03 -04:00
Dessalines
ec649d1911
Fixing site setup. Fixes #1694 (#1697) 2023-06-29 09:04:09 -04:00
eee1f443a8 Removing unecessary timezone adjusting 2023-06-29 08:59:54 -04:00
Alec Armbruster
d9d4a3195f
Merge branch 'main' into community-search 2023-06-29 07:31:50 -04:00
SleeplessOne1917
005135d4f2
Allow audio captcha through CSP (#1690)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-29 07:20:45 -04:00
Raicuparta
75c2e803c9 fix formatting 2023-06-29 13:12:30 +02:00
SleeplessOne1917
500003f310
Merge branch 'main' into community-search 2023-06-29 06:07:44 -04:00
Dessalines
6b1ea447e5
Fixing lints. (#1686) 2023-06-29 01:24:52 -04:00
Raicuparta
6305f593d0
Merge branch 'main' into community-search 2023-06-29 04:22:07 +01:00
Raicuparta
92f6fe914f
Search only communities by default when coming from communities page 2023-06-29 04:12:16 +01:00
Robert C. Maehl
9a04d0c58e
Add Security.txt (#1408)
* Create security-handler.ts

https://securitytxt.org/

* Add SecurityHandler

* Update security-handler.ts

* Update index.tsx

* Ensure external domain.tld is used

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
2023-06-28 23:10:13 -04:00
Dessalines
a2716d5f48
Fixing timezone issue with date-fns. Fixes #1680 (#1681)
Co-authored-by: Alec Armbruster <35377827+alectrocute@users.noreply.github.com>
2023-06-28 23:09:25 -04:00
Sander Saarend
bca438b2c6
Add error toast for 413 content too large response on image uploads (#1675)
Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
2023-06-28 22:53:15 -04:00
Scott
a077924f38
Fix search page to stop couldnt_find_object error (#1669)
* Add silent client and use it for resolve object

* more changes

* Fix more issues

* make double equals a triple equals
2023-06-28 22:44:47 -04:00
Alec Armbruster
38a109ba92
Add fixed width/height to PostListing thumbnail parent (#1660)
* add static width/height for post listing thumbnails

* Update src/shared/components/post/post-listing.tsx

Co-authored-by: Jay Sitter <jsit@users.noreply.github.com>

* make hopefully final tweaks

* remove .overflow-hidden

---------

Co-authored-by: Jay Sitter <jsit@users.noreply.github.com>
Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
2023-06-28 22:44:10 -04:00
Jay Sitter
a30c112048
fix: Add user action buttons to post dropdown #1653 (#1655)
* fix: Add user action buttons to post dropdown #1653

* fix: Fix alignment of preview mini-overlay buttons on thumbs

* fix: Restore mdNoImages import

* fix: Change style and capitalization of post user action buttons

* fix: Move Trasnfer Community button to dropdown

* fix: Remove some changes that shouldn't have been in here

* chore: Empty commit to re-trigger Woodpecker

* fix: Remove some unnecessary aria-labels

* fix: Capitalize first letter on transfer community button

* chore: Empty commit to re-trigger Woodpecker

---------

Co-authored-by: Alec Armbruster <35377827+alectrocute@users.noreply.github.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-28 22:43:44 -04:00
SleeplessOne1917
ef66dfa6fd
Return appropriate error codes (#1665)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-28 16:44:26 -04:00
SleeplessOne1917
5c16be767c
Add i386 theme (#1662)
* Add i386 theme

* Make searchable selects display properly

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-28 16:43:33 -04:00
32063a5794
Set cache-control headers to reduce server load (fixes #412) (#1641)
* Set cache-control headers to reduce server load (fixes #412)

* add missing file

* remove old middleware folder

* use let

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
2023-06-28 16:32:07 -04:00
Alec Armbruster
068e6eb4a2
Merge branch 'main' into bugfix/fix-subscribe-button-layout 2023-06-28 11:43:40 -04:00
Alec Armbruster
2f3aa5a26d
formatting 2023-06-28 11:09:52 -04:00
Alec Armbruster
a8339c38c7
make subscribe/unsub/pending button consistent 2023-06-28 11:06:55 -04:00
Alec Armbruster
3c11b61961
Merge branch 'main' into feat/pureblack-theme 2023-06-28 10:52:24 -04:00
Jay Sitter
7be10eb35b Revert #1463, markdown default lang select 2023-06-28 08:44:39 -04:00
Alec Armbruster
0ef2e8969c
Merge branch 'main' into feat/pureblack-theme 2023-06-28 00:12:10 -04:00
SleeplessOne1917
cf26c3d8e9
Merge branch 'main' into subscribe-fix 2023-06-27 19:28:52 -04:00
Alec Armbruster
874ae62fba
remove hard-coded text foreground color classes (#1658)
Signed-off-by: Alec Armbruster <35377827+alectrocute@users.noreply.github.com>
2023-06-27 19:08:01 -04:00
SleeplessOne1917
e7c121aff9 Fix subscribe and block community buttons not showing up on first load 2023-06-27 19:01:47 -04:00
Alec Armbruster
68b3940a9b
Merge branch 'main' into fix/thumb-action-button-alignment 2023-06-27 17:16:26 -04:00
Alec Armbruster
8f1b0ad559
refactor 2023-06-27 15:49:14 -04:00
Alec Armbruster
4e161f5f91
refactor again 2023-06-27 15:00:35 -04:00
Alec Armbruster
4944f19143
change me-2 to me-1, no need for me-2 width 2023-06-27 14:39:30 -04:00
Alec Armbruster
f333710077
make mod shrunken label text-primary 2023-06-27 14:36:19 -04:00
Alec Armbruster
0b7e2b7e4d
oops 2023-06-27 14:31:53 -04:00
Alec Armbruster
086052a69a
refactor x2 2023-06-27 14:29:44 -04:00
Alec Armbruster
6d65abc3ee
refactor 2023-06-27 14:10:05 -04:00
Alec Armbruster
e9f3701d8d
Merge branch 'main' of https://github.com/LemmyNet/lemmy-ui into bugfix/make-post-creator-badge-stand-out-more 2023-06-27 13:49:34 -04:00
Alec Armbruster
746b52f378
add @jsit advice 2023-06-27 13:41:31 -04:00
Alec Armbruster
9cf3c33823
fix weird borders when markdown textarea is disabled 2023-06-27 12:59:06 -04:00
Alec Armbruster
c020debf6d
use span 2023-06-27 11:44:17 -04:00
Jay Sitter
1e4e468e5a
Merge branch 'main' into fix/thumb-action-button-alignment 2023-06-27 11:42:31 -04:00
Alec Armbruster
9e1eb5fe19
always show badge on mobile 2023-06-27 11:42:00 -04:00
Alec Armbruster
06736c3df1
Merge branch 'main' of https://github.com/LemmyNet/lemmy-ui into bugfix/make-post-creator-badge-stand-out-more 2023-06-27 11:41:15 -04:00
Alec Armbruster
93e015393c
Merge branch 'main' into feat/pureblack-theme 2023-06-27 11:31:07 -04:00
Alec Armbruster
63337848ed
fix a few colors 2023-06-27 11:30:32 -04:00
Sander Saarend
934cabcec4
Reduce fetchLimit (40 -> 20) (#1638)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-27 10:52:01 -04:00
Jay Sitter
8dfe3c6106
Merge branch 'main' into feat/toggle-body-1595 2023-06-27 08:57:06 -04:00
SleeplessOne1917
34188ebd84
Fix allowed and blocked instances not being fetched for admin settings (#1627)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-27 08:09:55 -04:00
Dessalines
857b0d9db3
Merge branch 'main' into create_space_between_cancel_and_ban_button 2023-06-27 07:46:25 -04:00
Jay Sitter
3439512a1c fix: Restore mdNoImages import 2023-06-26 21:12:43 -04:00
Jay Sitter
ee84634a73 fix: Fix alignment of preview mini-overlay buttons on thumbs 2023-06-26 21:05:50 -04:00
Jay Sitter
5da6f27227 fix: Remove body preview 2023-06-26 20:37:28 -04:00
SleeplessOne1917
eef3ac41d3
Merge branch 'main' into fix/wider-max-width-1536 2023-06-26 20:29:13 -04:00
Jay Sitter
084345f0c5
Merge branch 'main' into fix/wider-max-width-1536 2023-06-26 20:22:38 -04:00
Jay Sitter
af67240163
Merge branch 'main' into feat/hide-avatars-on-listings 2023-06-26 20:22:26 -04:00
Jay Sitter
8b637a1773 fix: Move toggle button to its own function 2023-06-26 20:20:14 -04:00
Jay Sitter
5c964440da fix: Show metadata preview card on all post pages 2023-06-26 20:13:30 -04:00
Pascal de Vink
1dd83dafdc Fix feedback on banning an unbanning
When banning or unbanning, the API call was done, but updating the
frontend failed. This caused a confusing experience for an admin, until
the page was reloaded.
2023-06-26 20:13:30 -04:00
Alec Armbruster
936eb115bc fix vote button alignment 2023-06-26 20:13:30 -04:00
Alec Armbruster
0956863b28 remove icon (#1618)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 20:13:28 -04:00
dullbananas
7efc136ff5 Indicate valid and invalid fields in signup form (#1450)
* Use was-validated class in signup form

* Update signup.tsx

* Update signup.tsx

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
2023-06-26 20:12:41 -04:00
Alec Armbruster
7d63117c28 capitalize button (#1616)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 20:12:41 -04:00
Alec Armbruster
921cd976a4 Move password reset form to separate route, view (#1390)
* rework password reset form

* make self-suggested changes

* cleaning

* validate in handlePasswordReset as well

* update submodule

* partially make suggested changes

* make suggested changes

* resolve merge conflicts

* resolve merge conflicts

* resolve merge conflicts

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 20:12:41 -04:00
Jay Sitter
6edbb027f1 feat(UI): Reduce base font size (#1591)
* feat: Reduce base font size

* chore: Build themes

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 20:12:41 -04:00
Anansi
b2bd193160 Fix: missing semantic css classes and html elements (#1583)
* Fix: missing semantic css classes and html elements.

Now all pages have a main and aside element when a sidebar is present to facilitate custom theming. This does not impact the default behavior of the front.

* Fix: re-added communityref on main element

---------

Co-authored-by: 0xAnansi <0xAnansi@omageni.com>
Co-authored-by: Jay Sitter <jsit@users.noreply.github.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 20:12:41 -04:00
Alec Armbruster
87a5231745 partially revert change 2023-06-26 20:12:41 -04:00
Jay Sitter
a320f1edb1 fix: Remove unnecessary class 2023-06-26 20:12:41 -04:00
Jay Sitter
e84e2bfd1d fix: Remove unnecessary classes 2023-06-26 20:12:41 -04:00
Jay Sitter
6e6bbb06c0 fix: Restore removed classes 2023-06-26 20:12:40 -04:00
Jay Sitter
ffb0ffb255 fix: Remove wrapping li's 2023-06-26 20:12:40 -04:00
Jay Sitter
2547f68a6b fix: Remove extraneous classes 2023-06-26 20:12:40 -04:00
Jay Sitter
a4c819cdeb fix: Move things back to where they were 2023-06-26 20:12:40 -04:00
Jay Sitter
7e7bbde721 chore: Separate post mod buttons into functions 2023-06-26 20:12:40 -04:00
Alec Armbruster
a29cb0e83b remove hook entirely 2023-06-26 20:12:40 -04:00
Alec Armbruster
a6b59b78d2 fix bug collapsing previews when voting 2023-06-26 20:12:40 -04:00
Jay Sitter
4b5fe717ad fix: Remove unnecessary string interpolations 2023-06-26 20:12:40 -04:00
Jay Sitter
319bb4116f fix: Remove smallavatars prop 2023-06-26 19:46:29 -04:00
Jay Sitter
f57bf3bb8b fix: Restore icon avatars; make smaller and roundrect 2023-06-26 19:04:13 -04:00
SleeplessOne1917
6021d20559
Merge branch 'main' into bug/fix-image-collapse-upon-vote 2023-06-26 18:47:49 -04:00
SleeplessOne1917
165d1aa181
Merge branch 'main' into create_space_between_cancel_and_ban_button 2023-06-26 18:46:22 -04:00
Jay Sitter
b2b6f4521f fix: Use Bootstrap file upload form control styles 2023-06-26 18:42:44 -04:00
Pascal de Vink
8e2f83eb4e Fix feedback on banning an unbanning
When banning or unbanning, the API call was done, but updating the
frontend failed. This caused a confusing experience for an admin, until
the page was reloaded.
2023-06-26 18:30:31 -04:00
Alec Armbruster
28661dfacf fix vote button alignment 2023-06-26 18:30:31 -04:00
Alec Armbruster
d816b8f863 remove icon (#1618)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 18:30:31 -04:00
dullbananas
dd09b3cade Indicate valid and invalid fields in signup form (#1450)
* Use was-validated class in signup form

* Update signup.tsx

* Update signup.tsx

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
2023-06-26 18:30:31 -04:00
Alec Armbruster
022c27aec2 capitalize button (#1616)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 18:30:31 -04:00
Alec Armbruster
950dfad659 Move password reset form to separate route, view (#1390)
* rework password reset form

* make self-suggested changes

* cleaning

* validate in handlePasswordReset as well

* update submodule

* partially make suggested changes

* make suggested changes

* resolve merge conflicts

* resolve merge conflicts

* resolve merge conflicts

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 18:30:31 -04:00
Jay Sitter
f5be909d64 feat(UI): Reduce base font size (#1591)
* feat: Reduce base font size

* chore: Build themes

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 18:30:31 -04:00
Anansi
cf10bd64ad Fix: missing semantic css classes and html elements (#1583)
* Fix: missing semantic css classes and html elements.

Now all pages have a main and aside element when a sidebar is present to facilitate custom theming. This does not impact the default behavior of the front.

* Fix: re-added communityref on main element

---------

Co-authored-by: 0xAnansi <0xAnansi@omageni.com>
Co-authored-by: Jay Sitter <jsit@users.noreply.github.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 18:30:31 -04:00
SleeplessOne1917
308785b472 Only give child comments colored borders 2023-06-26 18:30:31 -04:00
Dominic Mazzoni
9dc25f2247 Associate NSFW label with its checkbox 2023-06-26 18:30:31 -04:00
Jay Sitter
8fd08e58e3 fix: Remove unnecessary string interpolations 2023-06-26 18:30:31 -04:00
Jay Sitter
04770d7ef8 fix: Remove unnecessary class 2023-06-26 18:30:31 -04:00
Jay Sitter
32cc2538d4 fix: Remove unnecessary classes 2023-06-26 18:30:30 -04:00
Jay Sitter
984de714cd fix: Restore removed classes 2023-06-26 18:30:30 -04:00
Jay Sitter
bbe897dc01 fix: Remove wrapping li's 2023-06-26 18:30:30 -04:00
Jay Sitter
1db654ecf5 fix: Remove extraneous classes 2023-06-26 18:30:30 -04:00
Jay Sitter
00d7a8dbb7 fix: Move things back to where they were 2023-06-26 18:30:30 -04:00
Jay Sitter
f27bb07fcd chore: Separate post mod buttons into functions 2023-06-26 18:30:30 -04:00
Jay Sitter
d62424d491 Merge remote-tracking branch 'lemmy/main' into fix/wider-max-width-1536
* lemmy/main:
  fix vote button alignment
  Fix feedback on banning an unbanning
  remove icon (#1618)
  Indicate valid and invalid fields in signup form (#1450)
  capitalize button (#1616)
  Move password reset form to separate route, view (#1390)
  feat(UI): Reduce base font size (#1591)
  Fix: missing semantic css classes and html elements (#1583)
2023-06-26 18:24:31 -04:00
Jay Sitter
43253b01d2
Merge branch 'main' into feat/hide-avatars-on-listings 2023-06-26 18:12:04 -04:00
Alec Armbruster
03a4bfad46
remove toUpperCase since the translation is uppercase 2023-06-26 17:19:34 -04:00
SleeplessOne1917
1c5e2f1c04
Merge branch 'main' into bugfix/vote-button-position 2023-06-26 21:15:53 +00:00
Alec Armbruster
937ebfc649
fix vote button alignment 2023-06-26 17:10:39 -04:00
SleeplessOne1917
70e8b05509
Merge branch 'main' into fix_feedback_on_ban_and_unban 2023-06-26 21:08:32 +00:00
Alec Armbruster
2b1647c9b8
partially revert change 2023-06-26 17:04:19 -04:00
Pascal de Vink
6dc9c6376b
Add space between cancel and ban button
When banning a user, the modal has two buttons: cancel and ban. These
buttons are so close to each other that it's hard to see they are
separate buttons.
By putting each button on their own row, there is more space between
them.
2023-06-26 21:58:16 +01:00
Alec Armbruster
1faa9f354b
add tooltip 2023-06-26 16:49:09 -04:00
Pascal de Vink
170bd7d693
Fix feedback on banning an unbanning
When banning or unbanning, the API call was done, but updating the
frontend failed. This caused a confusing experience for an admin, until
the page was reloaded.
2023-06-26 21:45:56 +01:00
Alec Armbruster
b69ad1264d
make post creator badge stand out more 2023-06-26 16:41:14 -04:00
Alec Armbruster
16f2f0d244
remove icon (#1618)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 16:09:11 -04:00
dullbananas
6810742757
Indicate valid and invalid fields in signup form (#1450)
* Use was-validated class in signup form

* Update signup.tsx

* Update signup.tsx

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
2023-06-26 15:57:23 -04:00
Alec Armbruster
6d92c07c89
Merge branch 'main' into feat/pureblack-theme 2023-06-26 15:50:14 -04:00
Alec Armbruster
7ea9f26a1c
capitalize button (#1616)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 15:25:22 -04:00
Alec Armbruster
96cf021105
Move password reset form to separate route, view (#1390)
* rework password reset form

* make self-suggested changes

* cleaning

* validate in handlePasswordReset as well

* update submodule

* partially make suggested changes

* make suggested changes

* resolve merge conflicts

* resolve merge conflicts

* resolve merge conflicts

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 14:54:38 -04:00
Jay Sitter
aee7e4d45b
feat(UI): Reduce base font size (#1591)
* feat: Reduce base font size

* chore: Build themes

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 14:53:37 -04:00
Anansi
cb6ab15254
Fix: missing semantic css classes and html elements (#1583)
* Fix: missing semantic css classes and html elements.

Now all pages have a main and aside element when a sidebar is present to facilitate custom theming. This does not impact the default behavior of the front.

* Fix: re-added communityref on main element

---------

Co-authored-by: 0xAnansi <0xAnansi@omageni.com>
Co-authored-by: Jay Sitter <jsit@users.noreply.github.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-26 14:51:04 -04:00
Alec Armbruster
cff56a9875
Merge branch 'main' into feat/pureblack-theme 2023-06-26 14:35:03 -04:00
Jay Sitter
20d54a7e51 Merge remote-tracking branch 'lemmy/main' into fix/wider-max-width-1536
* lemmy/main:
  fix: Remove unnecessary class
  fix: Remove unnecessary classes
  fix: Restore removed classes
  fix: Remove wrapping li's
  fix: Remove extraneous classes
  fix: Move things back to where they were
  chore: Separate post mod buttons into functions
2023-06-26 14:25:29 -04:00
Alec Armbruster
500a0113c4
Merge branch 'main' into bug/fix-image-collapse-upon-vote 2023-06-26 14:02:16 -04:00
Alec Armbruster
81131d2804
remove hook entirely 2023-06-26 12:16:32 -04:00
Jay Sitter
a6a65d9519
Merge branch 'main' into chore/separate-mod-button-functions 2023-06-26 12:03:26 -04:00
Jay Sitter
b4fdf88915 Merge remote-tracking branch 'lemmy/main' into fix/wider-max-width-1536
* lemmy/main:
  chore(DX): Add prettier to eslint config for use with editors
  fix: Remove unnecessary string interpolations
2023-06-26 11:31:01 -04:00
Alec Armbruster
3730cc6d82
run prettier 2023-06-26 10:41:21 -04:00
Alec Armbruster
94d223b162
add darkly-pureblack theme 2023-06-26 10:37:39 -04:00
Alec Armbruster
e6909d4cd1
fix bug collapsing previews when voting 2023-06-26 09:25:00 -04:00
Jay Sitter
8700f65a7c
Merge branch 'main' into chore/fix-unnecessary-string-interpolation 2023-06-26 08:50:54 -04:00
Jay Sitter
c04ce03cf4
Merge branch 'main' into feat/hide-avatars-on-listings 2023-06-26 08:50:41 -04:00
Jay Sitter
c16ff6c187
Merge branch 'main' into feat/toggle-body-1595 2023-06-26 08:50:34 -04:00
Jay Sitter
7999dd1ba8
Merge branch 'main' into fix/wider-max-width-1536 2023-06-26 08:50:12 -04:00
SleeplessOne1917
7f3d1c4ebd
Merge branch 'main' into chore/fix-unnecessary-string-interpolation 2023-06-26 10:18:14 +00:00
SleeplessOne1917
08ad1fb183
Merge branch 'main' into comment-border 2023-06-26 10:15:27 +00:00
Dominic Mazzoni
af2013059b Associate NSFW label with its checkbox 2023-06-25 21:11:23 -07:00
Jay Sitter
4f398d842e fix: Remove unused comment 2023-06-25 22:01:24 -04:00
Jay Sitter
ce3c308961 fix: Fix image/title wrapping on small 2023-06-25 20:06:34 -04:00
Jay Sitter
271425b963 fix: Fix post listing vote/image/title widths 2023-06-25 20:00:43 -04:00
Jay Sitter
a90c34eb7f fix: Fix a too-small thumbnail column 2023-06-25 19:46:27 -04:00
Jay Sitter
424d29847b fix: Set max height on post listing thumbnails 2023-06-25 19:40:49 -04:00
Jay Sitter
d0f6fdbe4a fix: Remove unnecessary string interpolations 2023-06-25 19:36:19 -04:00
Jay Sitter
5fdbaa0dd9 fix: Tidy up divs 2023-06-25 19:29:31 -04:00
Jay Sitter
4800a408fd fix: Make navbar container full screen width #1536 2023-06-25 19:29:31 -04:00
Jay Sitter
077603b43e feat: Use plus/minus expand button in title for showing body/preview 2023-06-25 19:10:10 -04:00
Jay Sitter
78e1ab994e
Merge branch 'main' into feat/create-post-file-upload-a11y 2023-06-25 18:20:04 -04:00
Jay Sitter
90b69f8cdd
Merge branch 'main' into chore/separate-mod-button-functions 2023-06-25 18:19:24 -04:00
Jay Sitter
0bab91948c fix: Remove unnecessary class 2023-06-25 18:18:47 -04:00
Jay Sitter
e7889c4f69 fix: Remove unnecessary classes 2023-06-25 18:18:16 -04:00
Jay Sitter
7259472254 fix: Restore removed classes 2023-06-25 18:15:59 -04:00
Jay Sitter
6c2ee399b9 fix: Remove wrapping li's 2023-06-25 18:13:13 -04:00
Jay Sitter
69966369d3 fix: Remove extraneous classes 2023-06-25 18:11:12 -04:00
Jay Sitter
c1e86f43a1 fix: Move things back to where they were 2023-06-25 18:08:26 -04:00
Jay Sitter
ba5cafef08 chore: Separate post mod buttons into functions 2023-06-25 18:01:55 -04:00
Jay Sitter
6b5ea004a6
Merge branch 'main' into fix/wider-max-width-1536 2023-06-25 17:51:21 -04:00
Jay Sitter
6773fe83d8
Merge branch 'main' into feat/toggle-body-1595 2023-06-25 17:50:02 -04:00
Jay Sitter
a9feae7da0 Merge remote-tracking branch 'lemmy/main' into feat/hide-avatars-on-listings
* lemmy/main:
  feat(UI): Fix some link hover colors
2023-06-25 17:49:37 -04:00
Jay Sitter
f4793d2a33
Merge branch 'main' into fix/wider-max-width-1536 2023-06-25 17:41:26 -04:00
Jay Sitter
937dd5f86a feat(UI): Fix some link hover colors 2023-06-25 17:18:25 -04:00
Jay Sitter
528aed7f58 feat(UI): Hide avatars on listings 2023-06-25 16:33:11 -04:00
Jay Sitter
a92dd541a7 feat(UI): Always put post body behind togggle on post listings (home/community) #1595 2023-06-25 16:21:58 -04:00
SleeplessOne1917
c2b44db2ac Only give child comments colored borders 2023-06-25 15:20:06 -04:00
SleeplessOne1917
1ce6eb3284
Merge branch 'main' into csp_media_src_data_urls 2023-06-25 19:16:46 +00:00
SleeplessOne1917
353d4c7e39
Update post-listing.tsx
Removed unnecessary bootstrap class
2023-06-25 15:13:27 -04:00
Dominic Mazzoni
434502c678 CSP should allow data urls for media-src or the audio captcha won't work 2023-06-25 12:12:32 -07:00
Jay Sitter
c9c70065fe
Merge branch 'main' into fix/wider-max-width-1536 2023-06-25 14:05:17 -04:00
Jay Sitter
71b7375773 fix(UI): Make max-width wider, and make sidebar narrower on wide screens #1536 2023-06-25 14:00:55 -04:00
SleeplessOne1917
fe1124ef7d
Merge branch 'main' into new-comment-space 2023-06-25 17:29:02 +00:00
SleeplessOne1917
6a69d6b063 Use spae instead of margin 2023-06-25 13:28:00 -04:00
Alec Armbruster
9f6b48c665
Merge branch 'main' into double-search 2023-06-25 13:18:55 -04:00
SleeplessOne1917
25cab15cfa Fix search request being called twice on search page 2023-06-25 13:07:18 -04:00
Jay Sitter
e4ee7f334f
Merge branch 'main' into bug/cant-set-headers-after-sent-fix 2023-06-25 12:41:28 -04:00
SleeplessOne1917
d8963d9bfe Add margin to new comment text 2023-06-25 12:09:53 -04:00
Alec Armbruster
462c7ab748
handle embedded iframe content better 2023-06-25 11:01:40 -04:00
Alec Armbruster
9938ac6ee4
fix lint error 2023-06-25 10:47:21 -04:00
Alec Armbruster
d1cf01061b
fix error on prod 2023-06-25 10:43:58 -04:00
Jay Sitter
7d44bc4993 Merge remote-tracking branch 'lemmy/main' into feat/create-post-file-upload-a11y
* lemmy/main:
  fix: Add type=button to buttons
  chore: Empty commit to re-trigger Woodpecker
  fix: Fix some Bootstrap 5 font classes
  fix: Fix some Bootstrap 5 font classes
  fix: Specify vote content type so buttons work for both comments and posts
  v0.18.0
  Fix homepage `scrollTo(0, 0)` failing when document size changes.
  v0.18.0-rc.8
  Moved `!isBrowser()` check to `FirstLoadServer.isFirstLoad`
  Fix server-side rendering after first load.
  fix!: Try to get Vote Buttons component working in Comments
  fix: Remove unused prop
  fix: Rework some vote buttons architecture
  fix: Undo some other extraneous changes
  fix: Undo some extraneous changes
  fix: Remove tippy duplicate functions
  fix: Revert to old mobile vote style
  feat: Move vote buttons to separate component
2023-06-25 02:27:37 -04:00
Jay Sitter
dc43c51b0d fix(a11y): Change the look and behavior of some file upload fields 2023-06-25 02:27:07 -04:00
SleeplessOne1917
c7aa92706b
Merge branch 'main' into feat/vote-components 2023-06-25 06:13:28 +00:00
Jay Sitter
a127eea3d8 fix: Add type=button to buttons 2023-06-25 01:40:21 -04:00
Jay Sitter
3f0f053968 fix: Fix some classes on private message collapse/expand button 2023-06-25 01:37:36 -04:00
Jay Sitter
0cc354b264 fix(a11y): Change divs and links to buttons 2023-06-25 01:35:34 -04:00
Jay Sitter
7aa2860bd6 fix: Remove invalid class 2023-06-25 01:34:49 -04:00
Jay Sitter
731c407e31 Merge remote-tracking branch 'lemmy/main' into feat/vote-components
* lemmy/main:
  fix(a11y): Restore aria-activedescendant
  chore: Empty commit to re-trigger Woodpecker
  fix(a11y): Make foreground of 'remove image button' white
  fix(a11y): Add alt text to emojis form
  fix(a11y): Fix some a11y markup in Searchable Select component
  fix(a11y): Change image remove button to true button element
  fix: Ignore rule for clickaway div; 'Esc' works for this
  fix: Fix another class
  fix: Fix some Bootstrap 5 font classes
2023-06-25 01:15:57 -04:00
Jay Sitter
fa5faf76cf fix: Fix some Bootstrap 5 font classes 2023-06-25 01:12:56 -04:00
Jay Sitter
88811f9ecb fix: Fix some Bootstrap 5 font classes 2023-06-25 01:11:27 -04:00
Jay Sitter
e09b1f53d3 Merge remote-tracking branch 'lemmy/main' into fix/a11y-fixes-2
* lemmy/main: (38 commits)
  chore: Empty commit to re-trigger Woodpecker
  fix(a11y): Fix non-list item being inside ul list in navbar
  fix: Fix non-unique ID attribute on re-used element
  fix: Fix another class
  fix: Fix some Bootstrap 5 font classes
  fix: Fix some emoji escape logic
  fix: Button doesn't need tabindex
  fix: Fix incorrect function reference
  fix: Emoji picker can be closed with escape key, other a11y fixes
  fix: Fix some a11y issues on jump to content button
  fix: Clarify a comment
  fix: Fix merge error
  Remove federation worker count
  fix: Add triangle alert icon to language warning
  added litely-compact
  changed where custom compact code goes
  added darkly-compact - issue 552
  Refactor first load handling
  Fix issue when navigating awat from settings
  Give function better name
  ...
2023-06-25 01:05:36 -04:00
Jay Sitter
5365d16d62 fix(a11y): Restore aria-activedescendant 2023-06-25 01:03:06 -04:00
Jay Sitter
0b6f7ad8f3 Merge remote-tracking branch 'lemmy/main' into fix/fix-font-classes-bs5
* lemmy/main: (35 commits)
  fix(a11y): Fix non-list item being inside ul list in navbar
  fix: Fix non-unique ID attribute on re-used element
  fix: Fix some emoji escape logic
  fix: Button doesn't need tabindex
  fix: Fix incorrect function reference
  fix: Emoji picker can be closed with escape key, other a11y fixes
  fix: Fix some a11y issues on jump to content button
  fix: Clarify a comment
  fix: Fix merge error
  Remove federation worker count
  fix: Add triangle alert icon to language warning
  added litely-compact
  changed where custom compact code goes
  added darkly-compact - issue 552
  Refactor first load handling
  Fix issue when navigating awat from settings
  Give function better name
  Change function name
  Make date distance format use correct verbiage
  Extract date fns setup
  ...
2023-06-25 00:56:12 -04:00
Jay Sitter
cfd2830d0d
Merge branch 'main' into feat/vote-components 2023-06-25 00:53:48 -04:00
SleeplessOne1917
b770a4ef2e
Merge branch 'main' into emoji-upload-button 2023-06-25 04:50:57 +00:00
SleeplessOne1917
3f7f4e9d2b
Merge branch 'main' into fix/non-list-item-in-navbar 2023-06-25 04:36:20 +00:00
SleeplessOne1917
4630362247
Merge branch 'main' into fix/fix-dropdown-id-unique 2023-06-25 04:33:21 +00:00
SleeplessOne1917
083d7a2f05
Merge branch 'main' into fix/a11y-fixes 2023-06-25 04:29:53 +00:00
SleeplessOne1917
90ee8d3f9b
Merge branch 'main' into emoji-upload-button 2023-06-25 04:27:02 +00:00
Jay Sitter
99de15b10b fix(a11y): Make foreground of 'remove image button' white 2023-06-24 19:58:06 -04:00
Jay Sitter
36c1577718 fix(a11y): Add alt text to emojis form 2023-06-24 19:55:04 -04:00
Jay Sitter
47aafed45f fix(a11y): Fix some a11y markup in Searchable Select component 2023-06-24 19:52:30 -04:00
Jay Sitter
dccfc72e73 fix(a11y): Change image remove button to true button element 2023-06-24 19:44:22 -04:00
Jay Sitter
d3b8943341 fix: Ignore rule for clickaway div; 'Esc' works for this 2023-06-24 19:24:09 -04:00
Jay Sitter
13d0a52dc8 fix(a11y): Fix non-list item being inside ul list in navbar 2023-06-24 18:47:14 -04:00
Jay Sitter
a5c5922408 fix: Fix non-unique ID attribute on re-used element 2023-06-24 18:44:39 -04:00
Jay Sitter
b543ef5ecb fix: Fix another class 2023-06-24 18:43:12 -04:00
Jay Sitter
83ab9e4d8e fix: Fix some Bootstrap 5 font classes 2023-06-24 18:41:29 -04:00
Jay Sitter
93da81c210
Merge branch 'main' into feat/vote-components 2023-06-24 16:33:45 -04:00
Jay Sitter
cf15af7c74
Merge branch 'main' into fix/a11y-fixes 2023-06-24 16:33:17 -04:00
Jay Sitter
f6a40fbb28
Merge branch 'main' into feat/create-private-message-updates 2023-06-24 16:30:35 -04:00
Jay Sitter
b98939dd0f fix: Fix some emoji escape logic 2023-06-24 16:29:41 -04:00
Jay Sitter
b2ef79f5e4 fix: Button doesn't need tabindex 2023-06-24 16:27:29 -04:00
Jay Sitter
2978e18a28 fix: Fix incorrect function reference 2023-06-24 16:23:21 -04:00
Jay Sitter
ffa98c8e3a
Merge branch 'main' into feat/vote-components 2023-06-24 15:00:52 -04:00
Alec Armbruster
77ff6b45f7
Merge branch 'main' into emoji-upload-button 2023-06-24 12:24:23 -04:00
Jay Sitter
5ed7352359 fix: Emoji picker can be closed with escape key, other a11y fixes 2023-06-24 01:58:21 -04:00
Jay Sitter
07c7177a25 fix: Fix some a11y issues on jump to content button 2023-06-24 00:54:22 -04:00
Jay Sitter
8184e33c9f fix: Fix up some interface language logic and design 2023-06-24 00:44:01 -04:00
Jay Sitter
2a5988e0ff Merge remote-tracking branch 'lemmy/main' into feat/create-private-message-updates
* lemmy/main: (21 commits)
  Fix comments expanding when they're not supposed to (#1540)
  Remove federation worker count
  fix: Add triangle alert icon to language warning
  Refactor first load handling
  fix: Add aria-describedby for language warning
  Fix issue when navigating awat from settings
  Give function better name
  Cache post listings and restore listing state when using browser back navigation buttons.
  Change function name
  Make date distance format use correct verbiage
  Extract date fns setup
  Fix homepage `scrollTo(0, 0)` failing when document size changes.
  v0.18.0
  v0.18.0-rc.8
  Moved `!isBrowser()` check to `FirstLoadServer.isFirstLoad`
  Fix server-side rendering after first load.
  Remove unused dep
  Replace momentjs with date-fns
  added litely-compact
  changed where custom compact code goes
  ...
2023-06-24 00:40:18 -04:00
Jay Sitter
a9e6b47ad8 fix: Clarify a comment 2023-06-24 00:38:17 -04:00
Jay Sitter
d70d252209 fix: Fix merge error 2023-06-24 00:33:12 -04:00
cetra3
1b469d7269 Remove federation worker count 2023-06-24 00:15:04 -04:00
Jay Sitter
f8228b5af9 fix: Add triangle alert icon to language warning 2023-06-24 00:15:04 -04:00
dankxiaobong
158535fee3 added litely-compact 2023-06-24 00:15:04 -04:00
dankxiaobong
d7f7dd8689 changed where custom compact code goes 2023-06-24 00:15:04 -04:00
dankxiaobong
c57ca6cb16 added darkly-compact - issue 552 2023-06-24 00:15:03 -04:00
SleeplessOne1917
175d43d067 Refactor first load handling 2023-06-24 00:14:11 -04:00
SleeplessOne1917
9166491544 Fix issue when navigating awat from settings 2023-06-24 00:14:11 -04:00
SleeplessOne1917
6dd871f42d Give function better name 2023-06-24 00:14:11 -04:00
SleeplessOne1917
8bed597fe0 Change function name 2023-06-24 00:14:11 -04:00
SleeplessOne1917
543de49622 Make date distance format use correct verbiage 2023-06-24 00:14:11 -04:00
SleeplessOne1917
40c236eb9d Extract date fns setup 2023-06-24 00:14:10 -04:00
SleeplessOne1917
de3cdb421e Replace momentjs with date-fns 2023-06-24 00:14:10 -04:00
dudeami0
34e70f3128 Cache post listings and restore listing state when using browser back navigation buttons. 2023-06-24 00:14:10 -04:00
dudeami0
f1a5a46f11 Fix homepage scrollTo(0, 0) failing when document size changes. 2023-06-24 00:14:10 -04:00
dudeami0
9aef820542 Moved !isBrowser() check to FirstLoadServer.isFirstLoad 2023-06-24 00:14:10 -04:00
dudeami0
c627678acd Fix server-side rendering after first load. 2023-06-24 00:14:10 -04:00
Jay Sitter
d78514c665 fix: Add aria-describedby for language warning 2023-06-24 00:14:10 -04:00
Jay Sitter
35d20491ea
Merge branch 'main' into feat/default-to-user-primary-lang 2023-06-24 00:12:34 -04:00
Jay Sitter
d735369db0
Update src/shared/components/common/markdown-textarea.tsx
Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
2023-06-24 00:06:40 -04:00
SleeplessOne1917
e8dda77d4b
Fix comments expanding when they're not supposed to (#1540) 2023-06-24 00:06:19 -04:00
Jay Sitter
4959d342bb
Update src/shared/components/common/markdown-textarea.tsx
Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
2023-06-24 00:06:18 -04:00
Jay Sitter
9eb11bb768
Merge branch 'main' into feat/default-to-user-primary-lang 2023-06-23 23:48:48 -04:00
Jay Sitter
5d85e3a7c9 fix: Disable save button if no text is entered 2023-06-23 23:43:49 -04:00
Jay Sitter
7145e0be27 fix: Fix some more private message form stuff 2023-06-23 23:38:39 -04:00
cetra3
3158cacc18 Remove federation worker count 2023-06-24 12:56:49 +09:30
Jay Sitter
b231fd1e5b feat: Clean up the Create Private Message page a bit 2023-06-23 23:13:09 -04:00
SleeplessOne1917
0ad285b166 Fix emojis being unable to save 2023-06-23 22:46:33 -04:00
Jay Sitter
251592c1bf fix: Use simpler syntax for languageId array 2023-06-23 22:09:27 -04:00
SleeplessOne1917
7cbdfce24c
Merge branch 'main' into feat/default-to-user-primary-lang 2023-06-24 00:53:03 +00:00
Jay Sitter
2bd8fdac33 fix: Add triangle alert icon to language warning 2023-06-23 17:50:30 -04:00
SleeplessOne1917
dac0fa50ad
Merge branch 'main' into fix/add-aria-describedby-lang-warn 2023-06-23 21:34:43 +00:00
Jay Sitter
ccf0a6dbaa fix: Fix language selection bug 2023-06-23 17:24:07 -04:00
Jay Sitter
bf54d40433 fix: Use Interface Language instead 2023-06-23 17:24:07 -04:00