Commit graph

1572 commits

Author SHA1 Message Date
Alec Armbruster 8e767f2331
fix merge conflicts 2023-06-22 09:04:25 -04:00
Alec Armbruster fc40b473d7
move env utils into folder 2023-06-22 09:02:48 -04:00
Alec Armbruster 98cedb8832
fix capitalization (#1467)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-22 08:58:51 -04:00
Scott 0247f8a2cf
Fix buildThemeList() function to ensure no duplicates (#1466)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-22 08:55:11 -04:00
Dessalines 902930bb9d v0.18.0-rc.6 2023-06-22 08:52:52 -04:00
Alec Armbruster 9fc3da0264
Fix grave ReferenceError: fetch is not defined error (#1460)
* use cross-fetch

* remove from utils usage
2023-06-22 07:42:57 -04:00
dankxiaobong dfe394adca
Merge branch 'LemmyNet:main' into added-darkly-compact-552 2023-06-22 12:29:01 +02:00
Jay Sitter f0375889d3 feat: Default language dropdowns to user's primary language 2023-06-22 00:54:07 -04:00
Zetaphor 02717be15c Add community link class 2023-06-22 01:07:33 -03:00
Ivo Barros c06d386337 prettier 2023-06-22 04:52:04 +01:00
Zetaphor 92482cbe6b Add local community link parser plugin for Markdown-It 2023-06-22 00:48:09 -03:00
Ivo Barros 7b81c3c65c woodpecker trigger 2023-06-22 04:34:23 +01:00
Ivo Barros 52bbfb6ba8 woodpecker trigger 2023-06-22 04:27:35 +01:00
Ivo Barros aa36fe6e5e
Merge branch 'main' into main 2023-06-22 04:23:35 +01:00
SleeplessOne1917 cda9bd0a79
Regenerate manifest on HTTPBase external change (#1459)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-21 22:45:21 -04:00
SleeplessOne1917 cf857b4eca
Merge pull request #1456 from LemmyNet/remove-i18-circle
Fix I18 next circular reference
2023-06-22 02:44:36 +00:00
Ivo Barros ad54a2f0f5 woodpecker trigger 2023-06-22 02:53:44 +01:00
Ivo Barros 0beb2a4341 Merge remote-tracking branch 'upstream/main' into main 2023-06-22 02:17:22 +01:00
SleeplessOne1917 32e1fa747e
Merge branch 'main' into remove-i18-circle 2023-06-22 01:06:23 +00:00
SleeplessOne1917 3664b0600b
(Hopefully) fix webmanifest different origin issue (#1457)
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
2023-06-21 21:04:28 -04:00
SleeplessOne1917 468d78a06f
Merge pull request #1437 from cloventt/expand-video-embeds-to-fullwidth
Expand video embeds to fullwidth
2023-06-22 00:58:27 +00:00
SleeplessOne1917 090adeece5
Merge branch 'main' into expand-video-embeds-to-fullwidth 2023-06-22 00:56:01 +00:00
SleeplessOne1917 eae0990442 Fix I18 next circular reference 2023-06-21 20:54:35 -04:00
David Palmer 924e670699
remove embed prefix until a translation can be added 2023-06-22 12:23:36 +12:00
Dessalines f7df831499 v0.18.0-rc.5 2023-06-21 19:48:43 -04:00
Jay Sitter bf0f80e798 fix: Add post body preview to desktop post listing view 2023-06-21 19:40:24 -04:00
SleeplessOne1917 2c2b5ef8f3
Merge pull request #1453 from jsit/fix/fix-i18n-user-service-import
fix: Fix i18n UserService import issue
2023-06-21 23:29:26 +00:00
SleeplessOne1917 8ffe153f63
Merge branch 'main' into fix/fix-i18n-user-service-import 2023-06-21 23:27:07 +00:00
Jay Sitter 8e711c6b54 fix: Fix i18n UserService import issue 2023-06-21 19:26:51 -04:00
Jay Sitter 3f4f319160 fix: Fix i18n UserService import issue 2023-06-21 19:24:01 -04:00
David Palmer 5109118525
Merge branch 'main' into expand-video-embeds-to-fullwidth 2023-06-22 10:52:56 +12:00
SleeplessOne1917 cb5d20a775
Merge pull request #1448 from LemmyNet/remove_markdown_it_emoji
Commenting out markdown_it_emoji, because it breaks bolds.
2023-06-21 22:35:15 +00:00
Dessalines 91ab497e95 Merge branch 'main' into remove_markdown_it_emoji 2023-06-21 18:31:53 -04:00
Alec Armbruster 043b522ff1
utils.ts organization, round two (#1427)
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update src/shared/utils/app/convert-comment-sort-type.ts

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>

* prettier pass

---------

Co-authored-by: SleeplessOne1917 <abias1122@gmail.com>
2023-06-21 18:28:24 -04:00
SleeplessOne1917 46a7dddf4b
Merge pull request #1449 from LemmyNet/fix_new_comments_badge
Cleaning up new comment badge. Fixes #1443
2023-06-21 21:26:29 +00:00
David Palmer 3fca825f1f
Merge branch 'main' into expand-video-embeds-to-fullwidth 2023-06-22 09:25:50 +12:00
SleeplessOne1917 9c88c68e2f
Merge branch 'main' into remove_markdown_it_emoji 2023-06-21 21:16:17 +00:00
SleeplessOne1917 1ba0d0f408
Merge branch 'main' into fix_new_comments_badge 2023-06-21 21:14:40 +00:00
SleeplessOne1917 8f587e1c3e
Merge pull request #1447 from LemmyNet/center_emojis
Centering emojimart in view.
2023-06-21 21:12:41 +00:00
SleeplessOne1917 6052f4d6dc
Merge branch 'main' into remove_markdown_it_emoji 2023-06-21 21:09:38 +00:00
SleeplessOne1917 a1ead2b90f
Merge branch 'main' into fix_new_comments_badge 2023-06-21 21:06:14 +00:00
SleeplessOne1917 6c2fc35450
Merge branch 'main' into center_emojis 2023-06-21 20:42:18 +00:00
Ivo Barros 0e052602ad
Merge branch 'main' into main 2023-06-21 20:45:58 +01:00
Dessalines 5c55b41971
Upgrade lemmy-js-client to 0.18.0-rc.2 (#1445)
* Updating translations.

* Upgrading lemmy-js-client.
2023-06-21 15:08:21 -04:00
Dessalines 3e6236ada3 Cleaning up new comment badge. Fixes #1443 2023-06-21 15:02:23 -04:00
Dessalines 9480e6337b Commenting out markdown_it_emoji, because it breaks bolds.
- Fixes #1439
2023-06-21 14:46:29 -04:00
Dessalines 0c78cf22a7 Centering emojimart in view. 2023-06-21 14:44:37 -04:00
dankxiaobong c5542e9e9c
Merge branch 'LemmyNet:main' into added-darkly-compact-552 2023-06-21 17:24:15 +02:00
Nutomic 101b830d87
Remove docs translations from links (#1441)
See https://github.com/LemmyNet/lemmy-docs/pull/223

There are redirects in place so this is not urgent.
2023-06-21 10:41:08 -04:00
dankxiaobong a8320c2fa4
Merge branch 'main' into added-darkly-compact-552 2023-06-21 16:29:01 +02:00