attempt to fix crazy merge fiasco

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6df17d57c4f6b962bb01c55f4aadaed0f6756774..76916e604aeda28ef62a8e3bbd4ab7f8d13a8e82 100644 (file)
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @dessalines @SleeplessOne1917
+* @dessalines @SleeplessOne1917 @alectrocute

diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
index 2273a13823ab59f49a6b8bc70dbd5ffbf2d93e3a..ae2d4e51f0a74a9ffb498c83f10a0f8acced7bfc 100644 (file)
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -21,7 +21,7 @@ body:
         - label: Is this only a single bug? Do not put multiple bugs in one issue.
           required: true
         - label: Is this a server side (not related to the UI) issue? Use the [Lemmy back end](https://github.com/LemmyNet/lemmy) repo.
-          required: true
+          required: false
   - type: textarea
     id: summary
     attributes:

diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
index 2f6f3fc1f9dae8cc7bc265ade72d3ef93f140605..3c75050ab8a964b03a93030ba90821c505ef5de4 100644 (file)
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
@@ -19,7 +19,7 @@ body:
         - label: Is this only a feature request? Do not put multiple feature requests in one issue.
           required: true
         - label: Is this a server side (not related to the UI) issue? Use the [Lemmy back end](https://github.com/LemmyNet/lemmy) repo.
-          required: true
+          required: false
   - type: textarea
     id: problem
     attributes:

diff --git a/Dockerfile b/Dockerfile
index 3d6d6212d8dc4401373873cf3d9bb67cf5cfbecb..2b36581d28d6ceebe2a891d35abe15fb9da410a3 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:alpine as builder\r
+FROM node:20.2-alpine as builder\r
 RUN apk update && apk add curl yarn python3 build-base gcc wget git --no-cache\r
 RUN curl -sf https://gobinaries.com/tj/node-prune | sh\r
 \r

diff --git a/dev.dockerfile b/dev.dockerfile
index 0e925c0a90dfca99dceb40c7186bc82e79fb757d..3bfc10daed7f14b92853e908e5e16c488f45e1e3 100644 (file)
--- a/dev.dockerfile
+++ b/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM node:alpine as builder\r
+FROM node:20.2-alpine as builder\r
 RUN apk update && apk add curl yarn python3 build-base gcc wget git --no-cache\r
 \r
 WORKDIR /usr/src/app\r

diff --git a/package.json b/package.json
index 2298d9e140c6e40705f39fd9caf0e5173bc698ae..b7c48c79b070276ac94f7e6c5d536b9abaf393c1 100644 (file)
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "inferno-server": "^8.1.1",
     "isomorphic-cookie": "^1.2.4",
     "jwt-decode": "^3.1.2",
-    "lemmy-js-client": "0.17.2-rc.24",
+    "lemmy-js-client": "0.18.0-rc.1",
     "lodash": "^4.17.21",
     "markdown-it": "^13.0.1",
     "markdown-it-container": "^3.0.0",

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index e1adfc53e1fde6077b34e16b552c8a6604b73825..82f8433e89d063fd4c514dc9e5a09664fdbece4d 100644 (file)
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -80,30 +80,6 @@
   overflow-x: auto;
 }
 
-.md-div table {
-  border-collapse: collapse;
-  width: 100%;
-  margin-bottom: 1rem;
-  border: 1px solid var(--dark);
-}
-
-.md-div table th,
-.md-div table td {
-  padding: 0.3rem;
-  vertical-align: top;
-  border-top: 1px solid var(--dark);
-  border: 1px solid var(--dark);
-}
-
-.md-div table thead th {
-  vertical-align: bottom;
-  border-bottom: 2px solid var(--dark);
-}
-
-.md-div table tbody + tbody {
-  border-top: 2px solid var(--dark);
-}
-
 .vote-bar {
   margin-top: -6.5px;
 }

diff --git a/src/shared/components/common/html-tags.tsx b/src/shared/components/common/html-tags.tsx
index 0e6cb2d03ad381528ed3f78447e0c0bc18d2b1bf..387cd041302ef55d08337b86acd3129f1359131f 100644 (file)
--- a/src/shared/components/common/html-tags.tsx
+++ b/src/shared/components/common/html-tags.tsx
@@ -2,8 +2,8 @@ import { htmlToText } from "html-to-text";
 import { Component } from "inferno";
 import { Helmet } from "inferno-helmet";
 import { httpExternalPath } from "../../env";
-import { getLanguages, md } from "../../utils";
-
+import { i18n } from "../../i18next";
+import { md } from "../../utils";
 interface HtmlTagsProps {
   title: string;
   path: string;
@@ -17,11 +17,10 @@ export class HtmlTags extends Component<HtmlTagsProps, any> {
     const url = httpExternalPath(this.props.path);
     const desc = this.props.description;
     const image = this.props.image;
-    const lang = getLanguages()[0];
 
     return (
       <Helmet title={this.props.title}>
-        <html lang={lang == "browser" ? "en" : lang} />
+        <html lang={i18n.resolvedLanguage} />
 
         {["title", "og:title", "twitter:title"].map(t => (
           <meta key={t} property={t} content={this.props.title} />