diff --git a/.gitignore b/.gitignore index 845929f4..4804240a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ erl_crash.dump # secrets files as long as you replace their contents by environment # variables. /config/*.secret.exs +/config/runtime.exs /setup_db.psql diff --git a/.sobelow-conf b/.sobelow-conf index fc094090..8cd2246e 100644 --- a/.sobelow-conf +++ b/.sobelow-conf @@ -8,5 +8,5 @@ out: "", threshold: "medium", ignore: ["Config.HTTPS", "Config.CSP"], - ignore_files: ["config/dev.1.secret.exs", "config/dev.2.secret.exs", "config/dev.3.secret.exs", "config/dev.secret.exs", "config/e2e.secret.exs", "config/prod.secret.exs", "config/test.secret.exs"] + ignore_files: ["config/dev.1.secret.exs", "config/dev.2.secret.exs", "config/dev.3.secret.exs", "config/dev.secret.exs", "config/e2e.secret.exs", "config/prod.secret.exs", "config/test.secret.exs", "config/runtime.1.secret.exs", "config/runtime.2.secret.exs", "config/runtime.3.secret.exs", "config/runtime.exs"] ] diff --git a/.sobelow-skips b/.sobelow-skips index bbe2ea12..2141d476 100644 --- a/.sobelow-skips +++ b/.sobelow-skips @@ -1,4 +1,5 @@ 5048AE33D6269B15E21CF28C6F545AB6 -752C0E897CA81ACD81F4BB215FA5F8E4 \ No newline at end of file +752C0E897CA81ACD81F4BB215FA5F8E4 +23412CF16549E4E88366DC9DECF39071 \ No newline at end of file diff --git a/config/config.exs b/config/config.exs index 3d0c6ac3..038cd81c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -59,7 +59,8 @@ config :mobilizon, Mobilizon.Web.Endpoint, config :mime, :types, %{ "application/activity+json" => ["activity-json"], "application/ld+json" => ["activity-json"], - "application/jrd+json" => ["jrd-json"] + "application/jrd+json" => ["jrd-json"], + "application/xrd+xml" => ["xrd-xml"] } # Upload configuration diff --git a/config/dev.exs b/config/dev.exs index 3209d7e5..970788f9 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -97,20 +97,3 @@ config :mobilizon, :anonymous, reports: [ allowed: true ] - -require Logger - -cond do - System.get_env("INSTANCE_CONFIG") && - File.exists?("./config/#{System.get_env("INSTANCE_CONFIG")}") -> - import_config System.get_env("INSTANCE_CONFIG") - - System.get_env("DOCKER", "false") == "false" && File.exists?("./config/dev.secret.exs") -> - import_config "dev.secret.exs" - - System.get_env("DOCKER", "false") == "true" -> - Logger.info("Using environment configuration for Docker") - - true -> - Logger.error("No configuration file found") -end diff --git a/js/package.json b/js/package.json index 930c01f0..200e5182 100644 --- a/js/package.json +++ b/js/package.json @@ -33,7 +33,7 @@ "graphql-tag": "^2.10.3", "intersection-observer": "^0.12.0", "leaflet": "^1.4.0", - "leaflet.locatecontrol": "^0.72.0", + "leaflet.locatecontrol": "^0.73.0", "lodash": "^4.17.11", "ngeohash": "^0.6.3", "phoenix": "^1.4.11", @@ -67,14 +67,14 @@ "@types/vuedraggable": "^2.23.0", "@typescript-eslint/eslint-plugin": "^4.14.1", "@typescript-eslint/parser": "^4.14.1", - "@vue/cli-plugin-babel": "~4.5.11", - "@vue/cli-plugin-e2e-cypress": "~4.5.11", - "@vue/cli-plugin-eslint": "~4.5.11", - "@vue/cli-plugin-pwa": "~4.5.11", - "@vue/cli-plugin-router": "~4.5.11", - "@vue/cli-plugin-typescript": "~4.5.11", - "@vue/cli-plugin-unit-jest": "~4.5.11", - "@vue/cli-service": "~4.5.11", + "@vue/cli-plugin-babel": "~4.5.12", + "@vue/cli-plugin-e2e-cypress": "~4.5.12", + "@vue/cli-plugin-eslint": "~4.5.12", + "@vue/cli-plugin-pwa": "~4.5.12", + "@vue/cli-plugin-router": "~4.5.12", + "@vue/cli-plugin-typescript": "~4.5.12", + "@vue/cli-plugin-unit-jest": "~4.5.12", + "@vue/cli-service": "~4.5.12", "@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", "@vue/test-utils": "^1.1.0", diff --git a/js/src/components/Comment/CommentTree.vue b/js/src/components/Comment/CommentTree.vue index 363f517a..d845ebc5 100644 --- a/js/src/components/Comment/CommentTree.vue +++ b/js/src/components/Comment/CommentTree.vue @@ -24,6 +24,9 @@ v-model="newComment.text" />
++ {{ $t("Comment text can't be empty") }} +
{{ $t("Create a discussion") }}