Archives/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy synced 2024-11-09 01:10:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
786 Commits 1,061 Branches 556 Tags 50 MiB
47d55d9d2b
Commit Graph

460 Commits

Author SHA1 Message Date
Dessalines
d66c19825a Fix sidebar bug. 2019-09-06 13:04:04 -07:00
Dessalines
d281872f95 Upping version. 2019-09-05 18:39:29 -07:00
Dessalines
aca2c1abec Adding usable search urls 
- Fixes #242
 2019-09-05 18:34:10 -07:00
Dessalines
299285abb8 Fixing inbox refresh issue. 
- Fixes #265
 2019-09-05 17:55:57 -07:00
Dessalines
565fc0abdb Adding ability to do mod action on post creator 
- Fixes #248
- Show banned on user comment and user overview. Fixes #264
 2019-09-05 17:18:48 -07:00
Dessalines
beea10454b Upping version. 2019-09-04 22:42:09 -07:00
Dessalines
d16df598fa Adding emoji-short-name package. 
- Fixes #266
 2019-09-04 15:22:31 -07:00
Dessalines
b973e700cb Upping version. 2019-09-03 13:18:58 -07:00
Dessalines
f651635af8 Upping version. 2019-09-02 17:33:35 -07:00
Dessalines
d82117241d Removing markdown-it-emoji from index.html 2019-09-02 17:33:09 -07:00
Dessalines
7cdcc14d4c Upping version. 2019-09-02 16:21:39 -07:00
Dessalines
aec7679a07 Merge branch 'dev' 2019-09-02 16:21:15 -07:00
Dessalines
177ceff63c Making markdown heading font size smaller 
- Fixes #258
 2019-09-02 16:16:08 -07:00
Dessalines
f538b3fb22 Using a proper twitter emoji list for the definitions. 
- Fixes #260
 2019-09-02 15:55:50 -07:00
Dessalines
d99fa5268d Hiding vote bar on comment collapse 
- Fixes #259
 2019-09-02 15:00:49 -07:00
Dessalines
fc5fd3a58a Upping version. 2019-09-02 10:38:37 -07:00
Dessalines
449586972a Upping version. 2019-08-31 21:14:40 -07:00
Dessalines
ba55f1cefb Adding preview, image upload, and formatting help to comment and post 
forms.

- Fixes #253
 2019-08-31 21:10:48 -07:00
Dessalines
d53b105c02 Upping version. 2019-08-31 09:43:10 -07:00
Dessalines
6699c7112c Switch to Twemoji 
- Fixes #257
 2019-08-31 09:40:42 -07:00
Dessalines
55138b1dd2 Upping version. 2019-08-30 17:42:11 -07:00
Dessalines
ef70ea5799 Add emoji autocomplete 
- Fixes #255
 2019-08-30 17:40:59 -07:00
Dessalines
9df0800b65 Upping version. 2019-08-30 15:42:16 -07:00
Dessalines
172cff19b9 Merge branch 'AutomCoding-master' into dev_2 2019-08-30 15:35:26 -07:00
Autom
d524393169 Update Swedish translations 
Will make sv.ts up to date with en.ts.
 2019-08-30 23:47:15 +02:00
Dessalines
f0dc7f8356 Changing margins. 2019-08-30 14:46:35 -07:00
Dessalines
aa2344bc10 Changing link aggregator to social media aggregation. 2019-08-30 13:03:39 -07:00
Dessalines
ce9c0b4aa7 Better tribute. 2019-08-30 12:34:38 -07:00
Dessalines
6c84c3b971 Better urls. 2019-08-29 21:41:41 -07:00
Dessalines
a47af02e1b Fixing tribute. 2019-08-29 21:38:06 -07:00
Dessalines
4e982ccf51 Merge branch 'autocomplete' into dev 2019-08-29 20:13:37 -07:00
Dessalines
4d329c8da5 Adding support for mentions via tribute. 
- Adding mentions in comment textareas for users (@) and communities
(#). Fixes #129
- Removing balloon-css
 2019-08-29 20:11:29 -07:00
Dessalines
2d112dbd55 Add loading indicators. 2019-08-29 16:49:58 -07:00
Dessalines
4f427d0e61 Remove dividing lines again. 2019-08-29 16:46:09 -07:00
Dessalines
988eef2e65 Adding emoji support. 2019-08-29 16:14:28 -07:00
Dessalines
8d1db3c395 Allow admins to add mods and transfer communities 
- Fixes #238
 2019-08-29 15:18:50 -07:00
Dessalines
de6ddeeca4 Merge branch 'master' into dev 2019-08-29 12:06:39 -07:00
Dessalines
e4c9335278 Lightening hr 
- Fixes #222
 2019-08-29 12:06:08 -07:00
Dessalines
e196ccd47f Some additions for Dutch. 2019-08-29 11:20:21 -07:00
Splinter Suidman
14ae99000d Add Dutch translations. 2019-08-29 18:36:04 +02:00
Dessalines
68dbac1fc7 Better margins. 2019-08-28 21:57:38 -07:00
Dessalines
fb11f890b1 Upping version. 2019-08-28 21:32:24 -07:00
Dessalines
b50ae1dafc Showing community count on main sidebar 
- Fixes #232
 2019-08-28 21:28:06 -07:00
Dessalines
d8ad56c647 Adding are you sure dialogs for transferring community and site. 
- Fixes #241
 2019-08-28 19:22:50 -07:00
Dessalines
465f5080c0 Adding some UI suggestions. 
- Adding divider lines in between post listings.
- Increasing button sizes.
- Fixes #222
 2019-08-28 18:43:51 -07:00
Dessalines
f137c73885 Upping version. 2019-08-26 20:37:31 -07:00
Dessalines
8b416c467c Fixing symbols. 2019-08-26 20:37:03 -07:00
Dessalines
ece80890bd Upping version. 2019-08-26 19:39:32 -07:00
Dessalines
a753a2f5ba Adding extra spanish translations. 2019-08-26 19:38:01 -07:00
Dessalines
977a996920 Updating icon. 2019-08-26 19:26:07 -07:00
Dessalines
38edb60be9 Adding Esperanto. 
- Fixes #240
 2019-08-26 14:42:53 -07:00
Dessalines
02de461878 Upping version. 2019-08-25 10:59:22 -07:00
Dessalines
d5606d7726 Upping version. 2019-08-25 10:57:05 -07:00
Dessalines
ed10673250 Refactoring chat sidebar. #237 2019-08-25 10:42:10 -07:00
Dessalines
4e9c071049 Fixing removing communities. 2019-08-25 00:22:46 -07:00
Dessalines
ccb58f6ff2 Nicening translation report. 2019-08-24 17:58:55 -07:00
Dessalines
e4ee79fab2 Adding a margin to comment paragraphs. 2019-08-24 14:27:25 -07:00
Dessalines
61617ff5f3 Upping version. 2019-08-24 00:02:58 -07:00
Dessalines
2f52d0a14f Fixing post listing rows. 2019-08-23 23:58:26 -07:00
Dessalines
b821f8e40c Widening thumbnails. 2019-08-23 23:44:44 -07:00
Dessalines
0a44ca81b1 Adding a translation report tool. 
- Fixes #231
 2019-08-23 21:43:12 -07:00
Dessalines
dcf0f13d71 Merge branch 'transfer_community' into dev 2019-08-23 20:02:52 -07:00
Dessalines
cfa2ef3a05 Merge branch 'master' into dev 2019-08-23 19:59:23 -07:00
Dessalines
3561ef93a0 Adding Community and Site transfer 
- Fixes #139
 2019-08-23 19:40:41 -07:00
Dessalines
d5b9ba724d Add missing by and to translations. 2019-08-23 15:55:48 -07:00
Dessalines
b1e1dcf163 Upping version. 2019-08-22 20:49:56 -07:00
Dessalines
5cbbf5a4ac Adding spanish translation. 
- Fixes #191
 2019-08-22 18:34:24 -07:00
Dessalines
20fec100b5 Cross posting working. 2019-08-22 16:13:26 -07:00
Dessalines
23150946d8 Merge branch 'dev' into similar_url_search 2019-08-22 12:19:39 -07:00
Dessalines
bfc3bbc371 Don't allow html rendering in markdown parser 
- Fixes #229
 2019-08-22 12:09:17 -07:00
Dessalines
954c89edaf cross-posting almost done. 2019-08-22 11:46:54 -07:00
Dessalines
b7e73a5559 View where a URL has been cross-posted to in the past 
- This shows when creating a post, or when viewing a post.
- Fixes #131
 2019-08-21 22:17:15 -07:00
Dessalines
c86a1d339e Adding new favicon. 
- Fixes #225
 2019-08-21 20:59:54 -07:00
Dessalines
e7c588cbbc Fix inferno link. 2019-08-20 17:05:57 -07:00
Dessalines
b5fc4bca10 Merge branch 'dev' 2019-08-20 14:48:48 -07:00
Dessalines
cc40916bf5 Adding Monero sponsor link 
- Fixes #224
 2019-08-20 14:47:19 -07:00
Dessalines
baf205e113 Removing navbar toggler border. 2019-08-20 14:40:51 -07:00
Dessalines
46363811f0 Separate sidebar. 2019-08-19 21:45:06 -07:00
Dessalines
977c043509 Adding extra margin. 2019-08-19 20:16:34 -07:00
Dessalines
297755e757 Adding cards for sidebars in UI. 2019-08-19 19:37:32 -07:00
Dessalines
ee9d053251 Fixing comment buttons now. 2019-08-19 15:39:45 -07:00
Dessalines
1fe8ecaf7a Try changing votes to buttons. 2019-08-19 15:32:32 -07:00
Dessalines
1e9cd32e1d Fixing logout after browser close. 2019-08-19 15:22:05 -07:00
Dessalines
64c0f7ed6e Upping version. 2019-08-19 15:06:38 -07:00
Dessalines
eb629be1ce Merge branch 'master' of https://github.com/AutomCoding/lemmy into AutomCoding-master 2019-08-19 14:56:06 -07:00
Dessalines
f019a56a1d Merge branch 'add-more-translations-de' of https://github.com/matthiasbeyer/lemmy into matthiasbeyer-add-more-translations-de 2019-08-19 14:51:17 -07:00
Dessalines
5a1c7a2605 Merge branch 'master' into dev 2019-08-19 14:29:52 -07:00
Dessalines
fa625e560b Adding russian locales. 2019-08-19 14:29:28 -07:00
Dessalines
70354d6e10 Upping title size again. 2019-08-19 14:13:15 -07:00
Autom
14fb74abd1 Missing space 2019-08-19 00:11:35 +02:00
digitalkiller
a5b68527bb Added a Russian localization 2019-08-18 22:02:34 +05:00
Matthias Beyer
cc492b44a3 Add missing translations 2019-08-18 11:18:16 +02:00
Autom
215a82ac98 Fix character escaping 2019-08-18 08:08:54 +02:00
Dessalines
d3aadc436b fixing vote bar 2019-08-17 22:11:03 -07:00
Dessalines
0162af30c7 more styles 2. 2019-08-17 22:04:17 -07:00
Dessalines
30e3c76022 more styles. 2019-08-17 22:00:11 -07:00
Dessalines
dea92b9b2d Fixing style 2. 2019-08-17 21:55:06 -07:00
Dessalines
3a1177dfd0 Fixing style. 2019-08-17 21:47:25 -07:00
Dessalines
037e2f0229 Adding better title wrap. 2019-08-17 21:41:55 -07:00
Dessalines
e97feea785 Better offsets 2019-08-17 19:31:32 -07:00
Dessalines
0fc1551dbc Offsetting image. 2019-08-17 19:17:12 -07:00
Dessalines
3e77924741 fixed again. 2019-08-17 19:12:48 -07:00
Dessalines
3d84a08aaa Trying some extra spacing. 2019-08-17 18:59:59 -07:00
Dessalines
01738fb554 Adding more settings for german. 2019-08-17 13:32:59 -07:00
Dessalines
4e8b9701df Merge branch 'de' of https://github.com/kpcyrd/lemmy into kpcyrd-de 2019-08-17 13:27:45 -07:00
Dessalines
f38f9c2e16 Needs to go below image expander 2019-08-17 13:18:25 -07:00
kpcyrd
38d1adda5b Add basic German translations 2019-08-17 22:00:33 +02:00
Dessalines
89db00124f Fixing vote margins. 2019-08-17 12:46:32 -07:00
Dessalines
98b8793dec Fixing navbar icon position. 2019-08-17 12:15:53 -07:00
Dessalines
7e6e9b6d81 Fixing up index.html 2019-08-17 12:11:22 -07:00
Dessalines
c69f1722ac Fix moment locale issue. 
- Fixes #206
 2019-08-17 10:22:38 -07:00
Dessalines
947fcaf732 Upping version. 2019-08-16 19:34:23 -07:00
Dessalines
1ae50f89c6 Fixing create post bug. 
- Fixes #202
 2019-08-16 18:46:39 -07:00
Dessalines
8d36cba9f9 Adding new icon by Andy Cuccaro. 
- Fixes #203
 2019-08-16 17:36:35 -07:00
Dessalines
f8cfc28a07 Merge branch 'master' into dev 2019-08-15 14:22:19 -07:00
Dessalines
96eefccdc3 Squashed commit of the following: 
commit 3008b45a89
Author: Dessalines <happydooby@gmail.com>
Date:   Thu Aug 15 14:11:02 2019 -0700

    Adding moment translation, and to i18next.ts file.

commit 620be4ecd8
Author: Autom <40275136+AutomCoding@users.noreply.github.com>
Date:   Thu Aug 15 19:08:57 2019 +0200

    Minor tweaks

    Line 74: Change grammatical gender to neutrum for undefined target.
    Line 126: Possibly a more accurate translation.

commit e053040c58
Author: Autom <40275136+AutomCoding@users.noreply.github.com>
Date:   Thu Aug 15 18:55:32 2019 +0200

    Translate remaining Swedish

commit b126b59e15
Author: Autom <40275136+AutomCoding@users.noreply.github.com>
Date:   Thu Aug 15 18:38:20 2019 +0200

    Typo (missing apostrophe in contraction)

commit 50a0c6b590
Author: Autom <40275136+AutomCoding@users.noreply.github.com>
Date:   Thu Aug 15 18:36:22 2019 +0200

    Create sv.ts

    First half translated
 2019-08-15 14:11:22 -07:00
Dessalines
d7ab85ab70 Squashed commit of the following: 
commit ecd6c5a2f4
Author: Dessalines <happydooby@gmail.com>
Date:   Tue Aug 13 19:49:38 2019 -0700

    Adding some docs

commit 3babd09aff
Author: Dessalines <happydooby@gmail.com>
Date:   Tue Aug 13 19:28:46 2019 -0700

    Adding save user settings

commit 6e8da9cc9e
Merge: 3246d5d c148eef
Author: Dessalines <happydooby@gmail.com>
Date:   Tue Aug 13 17:26:25 2019 -0700

    Merge branch 'dev' into nsfw

commit b3d4a5c4ce
Author: Dessalines <happydooby@gmail.com>
Date:   Sun Aug 11 20:55:09 2019 -0700

    nsfw mostly done, except for settings page.
 2019-08-13 19:52:43 -07:00
Dessalines
4c978d74f9 Adding the imports. 2019-08-10 11:33:54 -07:00
Dessalines
d3219ea156 Merge branch 'patch-1' of https://github.com/finkiki/lemmy into finkiki-patch-1 2019-08-10 11:30:05 -07:00
Dessalines
fc5fd7ff98 Fixing locales in fuse. Coercing zh to zh-cn for moment. 2019-08-10 11:26:28 -07:00
Dessalines
3656a3009b Merge branch 'i18n-zh' of https://github.com/tqcenglish/lemmy into tqcenglish-i18n-zh 2019-08-10 10:38:40 -07:00
Dessalines
d0d429a627 Adding support for community and user searching. 
- Fixes #130
 2019-08-10 10:32:06 -07:00
tqcenglish
1ffa652bcf fix comment error 2019-08-11 00:43:36 +08:00
tqcenglish
4ad00e9fb7 i18n zh 2019-08-10 23:51:21 +08:00
Popol
bfb809003d Update fr.ts 
\\\
 2019-08-10 14:29:36 +02:00
Popol
c009ad12d2 Create fr.ts 
French translation. I hope to see it online soon ! :-)
 2019-08-10 14:15:39 +02:00
Dessalines
ec4699e9ca Forgot to add subscribed. 2019-08-09 17:41:24 -07:00
Dessalines
25d502f252 Upping version. 2019-08-09 17:36:35 -07:00
Dessalines
c494fe8e9b Making a few internationalization fixes. 2019-08-09 17:15:27 -07:00
Dessalines
e702618e25 Adding back end translations. 2019-08-09 16:51:47 -07:00
Dessalines
9f73a79b33 Added a few more translations. 2019-08-09 15:53:10 -07:00
Dessalines
3060608a45 Second front end pass. 2019-08-09 15:52:32 -07:00
Dessalines
91a3d14393 Localization testing mostly done. 2019-08-08 22:09:36 -07:00
Dessalines
75e014ef5a i18n translations first pass. 2019-08-08 18:58:04 -07:00
Dessalines
411e7ef16e Main done. 2019-08-07 12:12:53 -07:00
Dessalines
5ef8b8bb06 Starting to work on internationalization 2019-08-07 11:01:26 -07:00
Dessalines
9ef14d7262 Still not working 2019-08-06 11:23:34 -07:00
Dessalines
5a1e8aa645 Adding a debounce. 2019-08-03 13:26:20 -07:00
Dessalines
caf0af3539 Updating yarn deps. 2019-07-28 18:59:02 -07:00
Dessalines
e27ca774cd Adding similar post searching before creating post. 
- Fixes #185.
- Offsetting create post and community columns.
 2019-07-28 18:57:09 -07:00
Dessalines
7a6c596a24 Maybe #183 2019-07-22 20:15:00 -07:00
Dessalines
7ee486081e Adding collapse comments 
- Fixes #179
 2019-07-15 22:56:46 -07:00
Dessalines
c6dacb485c Remove Kubernetes build, not supported. 2019-07-15 08:24:43 -07:00
Dessalines
32d1bb3e96 Switching to BrowserRouter. 
- Fixes #178.
- #176
 2019-07-14 19:43:31 -07:00
Dessalines
026af39053 Formatting fixes. 2019-07-13 14:14:59 -07:00
Dessalines
f95b9994d2 Fix parenthesis 2019-06-19 13:36:05 -07:00
Dessalines
e7d096e1a0 Version bump. 2019-06-11 18:41:48 -07:00
Dessalines
f4fd06aa5b Fixing GetSite 
- Fixes #171
 2019-06-11 18:41:01 -07:00
Dessalines
03435b5d3a Version bump 2019-06-02 19:46:30 -07:00
Dessalines
ab9659c2e2 Fix page titles for custom site name 
- Fixes #113
 2019-06-02 18:35:46 -07:00
Dessalines
107765619a Fixing communities sorting 
- Fixes #159
 2019-06-02 09:41:57 -07:00
Dessalines
842c8b0885 Disable create post button when community is deleted or removed. 
- Fixes #167
 2019-06-01 15:46:40 -07:00
Dessalines
178a2ed933 Fix site-form cancel button. 
- Fixes #164
 2019-06-01 15:12:10 -07:00
Dessalines
9cb10f7258 Adding emoji support 
- Fixes #163
- Bad because it doubles the size of the codebase, and it breaks hot
module reloading. Decide later on merge.
 2019-06-01 11:58:14 -07:00
Dessalines
e5fd7a0ac8 Fixing the fuse assets build. 2019-06-01 10:44:38 -07:00
Dessalines
0cf0569f4d Merge branch 'use-local-assets' of https://github.com/Perflyst/lemmy into Perflyst-use-local-assets 2019-06-01 10:30:15 -07:00
perflyst
b2fb1eadbe Use local assets instead of cloudflare cdn 2019-05-27 13:39:05 +02:00
Dessalines
b2997c8e7c Merge branch 'dev' 2019-05-19 11:05:44 -07:00
Dessalines
4668eac0d0 Moving create post to below unsubscribe. 2019-05-19 09:34:27 -07:00
Dessalines
1b6ddb869c Mark as read if viewing link. 
- Fixes #154. #153
 2019-05-19 09:15:08 -07:00
Dessalines
d1fee01c6a Adding browser notifications. 
- Fixes #153
 2019-05-18 16:41:22 -07:00
Dessalines
4772fee9f0 Updating broken bitcoin link. 2019-05-17 08:32:07 -07:00
Dessalines
ef23be6420 Version bump. 2019-05-15 09:47:23 -07:00
Dessalines
8820eac129 Removing need for spam_timer 2019-05-15 09:32:33 -07:00
Dessalines
13d7adab94 Adding API to footer 2019-05-15 09:12:54 -07:00
Dessalines
5e1fcd318a Adding API docs for app developers. 
- Fixes #99.
 2019-05-15 09:04:05 -07:00
Dessalines
73a129a24d Adding create community and post buttons from sidebar. 
- Fixes #148
 2019-05-08 09:07:34 -07:00
Dessalines
2f0a7c5584 Better columns 2019-05-06 09:26:21 -07:00
Dessalines
deb8fd317d Upgrading front end dependencies. 2019-05-05 16:50:44 -07:00
Dessalines
869d7a4552 Softer white background. 2019-05-05 15:47:35 -07:00
Dessalines
f034308070 Better image click 2019-05-05 14:50:17 -07:00
Dessalines
b4a43d9b2a Version bump 2019-05-05 10:02:16 -07:00
Dessalines
eaa96f178f Merge branch 'master' into dev 2019-05-04 09:02:49 -07:00
Felix Pojtinger
45dd106c13 Merge branch 'master' into master 2019-05-04 14:23:37 +02:00
Dessalines
9903e3d508 Fix scrolling issue on refetch. 2019-05-02 15:16:38 -07:00
Dessalines
820af56387 Externalizing JWT token 2019-05-02 09:55:29 -07:00
Dessalines
9d3b4de436 Version bump 2019-05-01 22:29:14 -07:00
Dessalines
2e487214ff Reworking some UI. Adding proper trending communities with hot rank. 
- Breaking out subscribed and all into radios. Fixes #142
 2019-05-01 22:26:31 -07:00
Dessalines
c69af0cc16 Adding a register, community, and forum rate limit, based on IP. 
- Fixes #124
 2019-05-01 15:44:39 -07:00
Dessalines
95579eb892 Sponsor 2019-05-01 08:27:54 -07:00
Dessalines
64261214f8 Version bump 2019-04-30 08:22:46 -07:00
Dessalines
675cf61654 Custom site name. 
- Fixes #113
 2019-04-30 08:19:00 -07:00
Dessalines
b04d4f03c5 format fix 2019-04-30 07:55:19 -07:00
Dessalines
5efce2f98b Version bump 2019-04-30 07:47:31 -07:00
Dessalines
4c150a0f4e Adding simple suggested post title from textance. 
- Fixes #112
 2019-04-30 07:45:50 -07:00
Dessalines
ad97e06bfb Adding paging on communities. 2019-04-30 06:49:01 -07:00
Dessalines
9dd8003cf0 Merge branch 'master' into dev 2019-04-29 21:10:01 -07:00
Anthony Ettinger
4d25d989ce use wildcards for fuse 2019-04-29 17:17:49 -07:00
Dessalines
8e0cc3498e Getting your votes on a user details page. 2019-04-29 14:19:00 -07:00
Anthony Ettinger
38457d9bc1 remove changes 2019-04-29 13:53:07 -07:00
Anthony Ettinger
a034839fdf add apple-touch-icon 2019-04-29 13:43:26 -07:00
Dessalines
746362f9ef Adding a max character of 10k to textareas 2019-04-29 12:42:22 -07:00
Anthony Ettinger
40d722ff7d fix apple ios icon. add gitignore 2019-04-29 12:31:51 -07:00
Dessalines
f57004d7fa Adding proper deletes for Post, Community, and Comments. 
- Fixes #132
- Fixes #108
 2019-04-29 12:14:54 -07:00
Dessalines
d13a95da27 Adding support for spoilers. 
- Fixes #104

example :
```
::: spoiler hidden stuff
*a bunch of spoilers here*
:::
```
 2019-04-29 10:16:43 -07:00
Dessalines
85ed895c5f Adding mark all as read 
- Fixes #107
 2019-04-29 09:51:13 -07:00
Dessalines
fe89bc2a42 Auto-select current community if creating a post from the community 
page.

Fixes #133
 2019-04-29 09:07:41 -07:00
Dessalines
50dfcefc95 Changing from forum to community 
- Fixes #121
 2019-04-28 19:05:11 -07:00
Dessalines
3c19843ce8 Fix 2019-04-28 18:31:20 -07:00
Dessalines
9ffe740ab6 Switching back to hash router 2019-04-28 18:30:52 -07:00