Merge branch 'release/2.4.2' into 'stable'

2.4.2 Release

See merge request pleroma/pleroma!3599
This commit is contained in:
rinpatch 2022-01-11 20:47:02 +00:00
commit 62a45747d9
114 changed files with 204 additions and 143 deletions

View File

@ -243,7 +243,7 @@ stop_review_app:
amd64:
stage: release
image: elixir:1.10.3
image: elixir:1.10.4
only: &release-only
- stable@pleroma/pleroma
- develop@pleroma/pleroma
@ -281,7 +281,7 @@ amd64-musl:
stage: release
artifacts: *release-artifacts
only: *release-only
image: elixir:1.10.3-alpine
image: elixir:1.10.4-alpine
cache: *release-cache
variables: *release-variables
before_script: &before-release-musl
@ -297,7 +297,7 @@ arm:
only: *release-only
tags:
- arm32-specified
image: arm32v7/elixir:1.10.3
image: arm32v7/elixir:1.10.4
cache: *release-cache
variables: *release-variables
before_script: *before-release
@ -309,7 +309,7 @@ arm-musl:
only: *release-only
tags:
- arm32-specified
image: arm32v7/elixir:1.10.3-alpine
image: arm32v7/elixir:1.10.4-alpine
cache: *release-cache
variables: *release-variables
before_script: *before-release-musl
@ -321,7 +321,7 @@ arm64:
only: *release-only
tags:
- arm
image: arm64v8/elixir:1.10.3
image: arm64v8/elixir:1.10.4
cache: *release-cache
variables: *release-variables
before_script: *before-release
@ -333,7 +333,7 @@ arm64-musl:
only: *release-only
tags:
- arm
image: arm64v8/elixir:1.10.3-alpine
image: arm64v8/elixir:1.10.4-alpine
cache: *release-cache
variables: *release-variables
before_script: *before-release-musl

View File

@ -14,6 +14,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed
## 2.4.2 - 2022-01-10
### Fixed
- Federation issues caused by HTTP pool checkout timeouts
- Compatibility with Elixir 1.13
### Upgrade notes
1. Restart Pleroma
## 2.4.1 - 2021-08-29
### Changed

View File

@ -63,8 +63,7 @@ defmodule Pleroma.Web.ActivityPub.Publisher do
date: date
})
with {:ok, %{status: code}} when code in 200..299 <-
result =
with {:ok, %{status: code}} = result when code in 200..299 <-
HTTP.post(
inbox,
json,

View File

@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
def project do
[
app: :pleroma,
version: version("2.4.1"),
version: version("2.4.2"),
elixir: "~> 1.9",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@ -208,7 +208,7 @@ defmodule Pleroma.Mixfile do
{:mock, "~> 0.3.5", only: :test},
# temporary downgrade for excoveralls, hackney until hackney max_connections bug will be fixed
{:excoveralls, "0.12.3", only: :test},
{:hackney, "~> 1.17.0", override: true},
{:hackney, "~> 1.18.0", override: true},
{:mox, "~> 1.0", only: :test},
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
] ++ oauth_deps()

View File

@ -11,7 +11,7 @@
"calendar": {:hex, :calendar, "1.0.0", "f52073a708528482ec33d0a171954ca610fe2bd28f1e871f247dc7f1565fa807", [:mix], [{:tzdata, "~> 0.5.20 or ~> 0.1.201603 or ~> 1.0", [hex: :tzdata, repo: "hexpm", optional: false]}], "hexpm", "990e9581920c82912a5ee50e62ff5ef96da6b15949a2ee4734f935fdef0f0a6f"},
"captcha": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git", "e0f16822d578866e186a0974d65ad58cddc1e2ab", [ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"]},
"castore": {:hex, :castore, "0.1.10", "b01a007416a0ae4188e70b3b306236021b16c11474038ead7aff79dd75538c23", [:mix], [], "hexpm", "a48314e0cb45682db2ea27b8ebfa11bd6fa0a6e21a65e5772ad83ca136ff2665"},
"certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"},
"certifi": {:hex, :certifi, "2.8.0", "d4fb0a6bb20b7c9c3643e22507e42f356ac090a1dcea9ab99e27e0376d695eba", [:rebar3], [], "hexpm", "6ac7efc1c6f8600b08d625292d4bbf584e14847ce1b6b5c44d983d273e1097ea"},
"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
"comeonin": {:hex, :comeonin, "5.3.2", "5c2f893d05c56ae3f5e24c1b983c2d5dfb88c6d979c9287a76a7feb1e1d8d646", [:mix], [], "hexpm", "d0993402844c49539aeadb3fe46a3c9bd190f1ecf86b6f9ebd71957534c95f04"},
"concurrent_limiter": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/concurrent_limiter.git", "d81be41024569330f296fc472e24198d7499ba78", [ref: "d81be41024569330f296fc472e24198d7499ba78"]},
@ -55,7 +55,7 @@
"gen_state_machine": {:hex, :gen_state_machine, "2.0.5", "9ac15ec6e66acac994cc442dcc2c6f9796cf380ec4b08267223014be1c728a95", [:mix], [], "hexpm"},
"gettext": {:hex, :gettext, "0.18.2", "7df3ea191bb56c0309c00a783334b288d08a879f53a7014341284635850a6e55", [:mix], [], "hexpm", "f9f537b13d4fdd30f3039d33cb80144c3aa1f8d9698e47d7bcbcc8df93b1f5c5"},
"gun": {:hex, :gun, "2.0.0-rc.2", "7c489a32dedccb77b6e82d1f3c5a7dadfbfa004ec14e322cdb5e579c438632d2", [:make, :rebar3], [{:cowlib, "2.11.0", [hex: :cowlib, repo: "hexpm", optional: false]}], "hexpm", "6b9d1eae146410d727140dbf8b404b9631302ecc2066d1d12f22097ad7d254fc"},
"hackney": {:hex, :hackney, "1.17.4", "99da4674592504d3fb0cfef0db84c3ba02b4508bae2dff8c0108baa0d6e0977c", [:rebar3], [{:certifi, "~>2.6.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "de16ff4996556c8548d512f4dbe22dd58a587bf3332e7fd362430a7ef3986b16"},
"hackney": {:hex, :hackney, "1.18.0", "c4443d960bb9fba6d01161d01cd81173089686717d9490e5d3606644c48d121f", [:rebar3], [{:certifi, "~>2.8.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "9afcda620704d720db8c6a3123e9848d09c87586dc1c10479c42627b905b5c5e"},
"html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
"html_sanitize_ex": {:hex, :html_sanitize_ex, "1.3.0", "f005ad692b717691203f940c686208aa3d8ffd9dd4bb3699240096a51fa9564e", [:mix], [{:mochiweb, "~> 2.15", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm"},
"http_signatures": {:hex, :http_signatures, "0.1.0", "4e4b501a936dbf4cb5222597038a89ea10781776770d2e185849fa829686b34c", [:mix], [], "hexpm", "f8a7b3731e3fd17d38fa6e343fcad7b03d6874a3b0a108c8568a71ed9c2cf824"},

View File

@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/app.9a4c5ede37b2f0230836.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.fb9ee54b02db0c974e51.js></script><script type=text/javascript src=/static/js/app.ce97bd1883ee9dd7b809.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/app.7d2d223f75c3a14b0991.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.cea10ab53f3aa19fc30e.js></script><script type=text/javascript src=/static/js/app.6c972d84b60f601b01f8.js></script></body></html>

View File

@ -1,3 +1,55 @@
.RichContent blockquote {
margin: 0.2em 0 0.2em 2em;
font-style: italic;
}
.RichContent pre {
overflow: auto;
}
.RichContent code,
.RichContent samp,
.RichContent kbd,
.RichContent var,
.RichContent pre {
font-family: var(--postCodeFont, monospace);
}
.RichContent p {
margin: 0 0 1em 0;
}
.RichContent p:last-child {
margin: 0 0 0 0;
}
.RichContent h1 {
font-size: 1.1em;
line-height: 1.2em;
margin: 1.4em 0;
}
.RichContent h2 {
font-size: 1.1em;
margin: 1em 0;
}
.RichContent h3 {
font-size: 1em;
margin: 1.2em 0;
}
.RichContent h4 {
margin: 1.1em 0;
}
.RichContent .img {
display: inline-block;
}
.RichContent .emoji {
display: inline-block;
width: var(--emoji-size, 32px);
height: var(--emoji-size, 32px);
}
.RichContent .img,
.RichContent video {
max-width: 100%;
max-height: 400px;
vertical-align: middle;
-o-object-fit: contain;
object-fit: contain;
}
.tab-switcher {
display: -ms-flexbox;
display: flex;
@ -243,4 +295,4 @@
cursor: pointer;
}
/*# sourceMappingURL=app.9a4c5ede37b2f0230836.css.map*/
/*# sourceMappingURL=app.7d2d223f75c3a14b0991.css.map*/

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/11.7b11fd75fe61d6e10ac6.js","sourceRoot":""}
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/10.02ffbc25214f297f720f.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/12.a3dc3473565ec07a88c2.js","sourceRoot":""}
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/11.c173c6036fb3af5581b3.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/13.cdc076533397e24391bc.js","sourceRoot":""}
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/12.5ca41e245bb40263bc7f.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/10.fdbf093cc5602ca4f2e1.js","sourceRoot":""}
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/13.99621e6c47936075b44d.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/14.4e05e7c284119777ecc5.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/14.a2b9acaf9caa95d1fd7f.js","sourceRoot":""}

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/15.23f179cc3adc903bb537.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/15.fe4e76f27cc478289a42.js","sourceRoot":""}

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/16.43dd2c64dcb160dd96a6.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/16.90b5ee380da41d6d061c.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/17.c5a6513076aa9c5a9564.js","sourceRoot":""}

View File

@ -1,2 +1,2 @@
(window.webpackJsonp=window.webpackJsonp||[]).push([[17],{597:function(e){e.exports=JSON.parse('{"finder":{"error_fetching_user":"Hiba felhasználó beszerzésével","find_user":"Felhasználó keresése"},"general":{"submit":"Elküld"},"login":{"login":"Bejelentkezés","logout":"Kijelentkezés","password":"Jelszó","placeholder":"e.g. lain","register":"Feliratkozás","username":"Felhasználó név"},"nav":{"mentions":"Említéseim","public_tl":"Publikus Idővonal","timeline":"Idővonal","twkn":"Az Egész Ismert Hálózat"},"notifications":{"followed_you":"követ téged","notifications":"Értesítések","read":"Olvasva!"},"post_status":{"default":"Most érkeztem L.A.-be","posting":"Küldés folyamatban"},"registration":{"bio":"Bio","email":"Email","fullname":"Teljes név","password_confirm":"Jelszó megerősítése","registration":"Feliratkozás"},"settings":{"attachments":"Csatolmányok","avatar":"Avatár","bio":"Bio","current_avatar":"Jelenlegi avatár","current_profile_banner":"Jelenlegi profil banner","filtering":"Szűrés","filtering_explanation":"Minden tartalom mely ezen szavakat tartalmazza némítva lesz, soronként egy","hide_attachments_in_convo":"Csatolmányok elrejtése a társalgásokban","hide_attachments_in_tl":"Csatolmányok elrejtése az idővonalon","name":"Név","name_bio":"Név és Bio","nsfw_clickthrough":"NSFW átkattintási tartalom elrejtésének engedélyezése","profile_background":"Profil háttérkép","profile_banner":"Profil Banner","set_new_avatar":"Új avatár","set_new_profile_background":"Új profil háttér beállítása","set_new_profile_banner":"Új profil banner","settings":"Beállítások","theme":"Téma","user_settings":"Felhasználói beállítások"},"timeline":{"conversation":"Társalgás","error_fetching":"Hiba a frissítések beszerzésénél","load_older":"Régebbi állapotok betöltése","show_new":"Újak mutatása","up_to_date":"Naprakész"},"user_card":{"block":"Letilt","blocked":"Letiltva!","follow":"Követ","followees":"Követettek","followers":"Követők","following":"Követve!","follows_you":"Követ téged!","mute":"Némít","muted":"Némított","per_day":"naponta","statuses":"Állapotok"}}')}}]);
//# sourceMappingURL=17.c5a6513076aa9c5a9564.js.map
(window.webpackJsonp=window.webpackJsonp||[]).push([[17],{610:function(e){e.exports=JSON.parse('{"finder":{"error_fetching_user":"Hiba felhasználó beszerzésével","find_user":"Felhasználó keresése"},"general":{"submit":"Elküld"},"login":{"login":"Bejelentkezés","logout":"Kijelentkezés","password":"Jelszó","placeholder":"e.g. lain","register":"Feliratkozás","username":"Felhasználó név"},"nav":{"mentions":"Említéseim","public_tl":"Publikus Idővonal","timeline":"Idővonal","twkn":"Az Egész Ismert Hálózat"},"notifications":{"followed_you":"követ téged","notifications":"Értesítések","read":"Olvasva!"},"post_status":{"default":"Most érkeztem L.A.-be","posting":"Küldés folyamatban"},"registration":{"bio":"Bio","email":"Email","fullname":"Teljes név","password_confirm":"Jelszó megerősítése","registration":"Feliratkozás"},"settings":{"attachments":"Csatolmányok","avatar":"Avatár","bio":"Bio","current_avatar":"Jelenlegi avatár","current_profile_banner":"Jelenlegi profil banner","filtering":"Szűrés","filtering_explanation":"Minden tartalom mely ezen szavakat tartalmazza némítva lesz, soronként egy","hide_attachments_in_convo":"Csatolmányok elrejtése a társalgásokban","hide_attachments_in_tl":"Csatolmányok elrejtése az idővonalon","name":"Név","name_bio":"Név és Bio","nsfw_clickthrough":"NSFW átkattintási tartalom elrejtésének engedélyezése","profile_background":"Profil háttérkép","profile_banner":"Profil Banner","set_new_avatar":"Új avatár","set_new_profile_background":"Új profil háttér beállítása","set_new_profile_banner":"Új profil banner","settings":"Beállítások","theme":"Téma","user_settings":"Felhasználói beállítások"},"timeline":{"conversation":"Társalgás","error_fetching":"Hiba a frissítések beszerzésénél","load_older":"Régebbi állapotok betöltése","show_new":"Újak mutatása","up_to_date":"Naprakész"},"user_card":{"block":"Letilt","blocked":"Letiltva!","follow":"Követ","followees":"Követettek","followers":"Követők","following":"Követve!","follows_you":"Követ téged!","mute":"Némít","muted":"Némított","per_day":"naponta","statuses":"Állapotok"}}')}}]);
//# sourceMappingURL=17.d1deeeb81b7cab98b068.js.map

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/17.d1deeeb81b7cab98b068.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/18.a4d5b399e228a6a45a7b.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/18.ffde79cfe78615dbb020.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/19.c031807287d659bd841d.js","sourceRoot":""}

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/19.e513835c3274271258fa.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/20.683b112f4dcea887f707.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/20.abb0d332055536a87c38.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/21.6e952388ef8d5a0276dc.js","sourceRoot":""}

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/21.b2844ccdcfc3c8191e8e.js","sourceRoot":""}

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/22.68c0a771d79e3383f5e8.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/22.dbc79965f66b0bb62d88.js","sourceRoot":""}

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/23.0b6cdf4c9dc52c4291c0.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/23.4addb03e0862c780c55f.js","sourceRoot":""}

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/24.5cfb87799bd882b933dd.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/24.e4b623be1780a14a6168.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/25.34eeae0070f7f1eb6843.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/25.8185e4d775cea9fe47e1.js","sourceRoot":""}

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/26.34ec129dd8f860ce4a8e.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/26.bd86a0d958de2bb3905a.js","sourceRoot":""}

View File

@ -1,2 +1,2 @@
(window.webpackJsonp=window.webpackJsonp||[]).push([[27],{607:function(e){e.exports=JSON.parse('{"finder":{"error_fetching_user":"Eroare la preluarea utilizatorului","find_user":"Găsește utilizator"},"general":{"submit":"trimite"},"login":{"login":"Loghează","logout":"Deloghează","password":"Parolă","placeholder":"d.e. lain","register":"Înregistrare","username":"Nume utilizator"},"nav":{"mentions":"Menționări","public_tl":"Cronologie Publică","timeline":"Cronologie","twkn":"Toată Reșeaua Cunoscută"},"notifications":{"followed_you":"te-a urmărit","notifications":"Notificări","read":"Citit!"},"post_status":{"default":"Nu de mult am aterizat în L.A.","posting":"Postează"},"registration":{"bio":"Bio","email":"Email","fullname":"Numele întreg","password_confirm":"Cofirmă parola","registration":"Îregistrare"},"settings":{"attachments":"Atașamente","avatar":"Avatar","bio":"Bio","current_avatar":"Avatarul curent","current_profile_banner":"Bannerul curent al profilului","filtering":"Filtru","filtering_explanation":"Toate stările care conțin aceste cuvinte vor fi puse pe mut, una pe linie","hide_attachments_in_convo":"Ascunde atașamentele în conversații","hide_attachments_in_tl":"Ascunde atașamentele în cronologie","name":"Nume","name_bio":"Nume și Bio","nsfw_clickthrough":"Permite ascunderea al atașamentelor NSFW","profile_background":"Fundalul de profil","profile_banner":"Banner de profil","set_new_avatar":"Setează avatar nou","set_new_profile_background":"Setează fundal nou","set_new_profile_banner":"Setează banner nou la profil","settings":"Setări","theme":"Temă","user_settings":"Setările utilizatorului"},"timeline":{"conversation":"Conversație","error_fetching":"Erare la preluarea actualizărilor","load_older":"Încarcă stări mai vechi","show_new":"Arată cele noi","up_to_date":"La zi"},"user_card":{"block":"Blochează","blocked":"Blocat!","follow":"Urmărește","followees":"Urmărește","followers":"Următori","following":"Urmărit!","follows_you":"Te urmărește!","mute":"Pune pe mut","muted":"Pus pe mut","per_day":"pe zi","statuses":"Stări"}}')}}]);
//# sourceMappingURL=27.7d4ab8716762d6f57135.js.map
(window.webpackJsonp=window.webpackJsonp||[]).push([[27],{620:function(e){e.exports=JSON.parse('{"finder":{"error_fetching_user":"Eroare la preluarea utilizatorului","find_user":"Găsește utilizator"},"general":{"submit":"trimite"},"login":{"login":"Loghează","logout":"Deloghează","password":"Parolă","placeholder":"d.e. lain","register":"Înregistrare","username":"Nume utilizator"},"nav":{"mentions":"Menționări","public_tl":"Cronologie Publică","timeline":"Cronologie","twkn":"Toată Reșeaua Cunoscută"},"notifications":{"followed_you":"te-a urmărit","notifications":"Notificări","read":"Citit!"},"post_status":{"default":"Nu de mult am aterizat în L.A.","posting":"Postează"},"registration":{"bio":"Bio","email":"Email","fullname":"Numele întreg","password_confirm":"Cofirmă parola","registration":"Îregistrare"},"settings":{"attachments":"Atașamente","avatar":"Avatar","bio":"Bio","current_avatar":"Avatarul curent","current_profile_banner":"Bannerul curent al profilului","filtering":"Filtru","filtering_explanation":"Toate stările care conțin aceste cuvinte vor fi puse pe mut, una pe linie","hide_attachments_in_convo":"Ascunde atașamentele în conversații","hide_attachments_in_tl":"Ascunde atașamentele în cronologie","name":"Nume","name_bio":"Nume și Bio","nsfw_clickthrough":"Permite ascunderea al atașamentelor NSFW","profile_background":"Fundalul de profil","profile_banner":"Banner de profil","set_new_avatar":"Setează avatar nou","set_new_profile_background":"Setează fundal nou","set_new_profile_banner":"Setează banner nou la profil","settings":"Setări","theme":"Temă","user_settings":"Setările utilizatorului"},"timeline":{"conversation":"Conversație","error_fetching":"Erare la preluarea actualizărilor","load_older":"Încarcă stări mai vechi","show_new":"Arată cele noi","up_to_date":"La zi"},"user_card":{"block":"Blochează","blocked":"Blocat!","follow":"Urmărește","followees":"Urmărește","followers":"Următori","following":"Urmărit!","follows_you":"Te urmărește!","mute":"Pune pe mut","muted":"Pus pe mut","per_day":"pe zi","statuses":"Stări"}}')}}]);
//# sourceMappingURL=27.0f4a5145681cfb5a896e.js.map

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/27.0f4a5145681cfb5a896e.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/27.7d4ab8716762d6f57135.js","sourceRoot":""}

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/28.75c01cd71372c39d5af8.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/28.a88999ebb3f7ec930aad.js","sourceRoot":""}

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/29.519f681d194c212ae75f.js","sourceRoot":""}

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/29.b53cf1f3bcece005d78a.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/30.064c236fa83ac21c252f.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/30.d29cd76b0781bb654f87.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/31.15b545bb42e21d39c678.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/31.226f7a848d733df38095.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/32.19ca50edbb4d711838dc.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/32.899035ede0115c5c0f99.js","sourceRoot":""}

View File

@ -1,2 +1,2 @@
(window.webpackJsonp=window.webpackJsonp||[]).push([[4],{614:function(t,e,i){var c=i(615);"string"==typeof c&&(c=[[t.i,c,""]]),c.locals&&(t.exports=c.locals);(0,i(7).default)("cc6cdea4",c,!0,{})},615:function(t,e,i){(t.exports=i(6)(!1)).push([t.i,".sticker-picker{width:100%}.sticker-picker .contents{min-height:250px}.sticker-picker .contents .sticker-picker-content{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0 4px}.sticker-picker .contents .sticker-picker-content .sticker{display:-ms-flexbox;display:flex;-ms-flex:1 1 auto;flex:1 1 auto;margin:4px;width:56px;height:56px}.sticker-picker .contents .sticker-picker-content .sticker img{height:100%}.sticker-picker .contents .sticker-picker-content .sticker img:hover{filter:drop-shadow(0 0 5px var(--accent,#d8a070))}",""])},669:function(t,e,i){"use strict";i.r(e);var c=i(66),n={components:{TabSwitcher:i(150).a},data:function(){return{meta:{stickers:[]},path:""}},computed:{pack:function(){return this.$store.state.instance.stickers||[]}},methods:{clear:function(){this.meta={stickers:[]}},pick:function(t,e){var i=this,n=this.$store;fetch(t).then((function(t){t.blob().then((function(t){var a=new File([t],e,{mimetype:"image/png"}),r=new FormData;r.append("file",a),c.a.uploadMedia({store:n,formData:r}).then((function(t){i.$emit("uploaded",t),i.clear()}),(function(t){console.warn("Can't attach sticker"),console.warn(t),i.$emit("upload-failed","default")}))}))}))}}},a=i(0);var r=function(t){i(614)},s=Object(a.a)(n,(function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"sticker-picker"},[i("tab-switcher",{staticClass:"tab-switcher",attrs:{"render-only-focused":!0,"scrollable-tabs":""}},t._l(t.pack,(function(e){return i("div",{key:e.path,staticClass:"sticker-picker-content",attrs:{"image-tooltip":e.meta.title,image:e.path+e.meta.tabIcon}},t._l(e.meta.stickers,(function(c){return i("div",{key:c,staticClass:"sticker",on:{click:function(i){return i.stopPropagation(),i.preventDefault(),t.pick(e.path+c,e.meta.title)}}},[i("img",{attrs:{src:e.path+c}})])})),0)})),0)],1)}),[],!1,r,null,null);e.default=s.exports}}]);
//# sourceMappingURL=4.564b2a8cbfe4d5e93949.js.map
(window.webpackJsonp=window.webpackJsonp||[]).push([[4],{627:function(t,e,i){var c=i(628);"string"==typeof c&&(c=[[t.i,c,""]]),c.locals&&(t.exports=c.locals);(0,i(6).default)("cc6cdea4",c,!0,{})},628:function(t,e,i){(t.exports=i(5)(!1)).push([t.i,".sticker-picker{width:100%}.sticker-picker .contents{min-height:250px}.sticker-picker .contents .sticker-picker-content{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0 4px}.sticker-picker .contents .sticker-picker-content .sticker{display:-ms-flexbox;display:flex;-ms-flex:1 1 auto;flex:1 1 auto;margin:4px;width:56px;height:56px}.sticker-picker .contents .sticker-picker-content .sticker img{height:100%}.sticker-picker .contents .sticker-picker-content .sticker img:hover{filter:drop-shadow(0 0 5px var(--accent,#d8a070))}",""])},682:function(t,e,i){"use strict";i.r(e);var c=i(69),n={components:{TabSwitcher:i(155).a},data:function(){return{meta:{stickers:[]},path:""}},computed:{pack:function(){return this.$store.state.instance.stickers||[]}},methods:{clear:function(){this.meta={stickers:[]}},pick:function(t,e){var i=this,n=this.$store;fetch(t).then((function(t){t.blob().then((function(t){var a=new File([t],e,{mimetype:"image/png"}),r=new FormData;r.append("file",a),c.a.uploadMedia({store:n,formData:r}).then((function(t){i.$emit("uploaded",t),i.clear()}),(function(t){console.warn("Can't attach sticker"),console.warn(t),i.$emit("upload-failed","default")}))}))}))}}},a=i(0);var r=function(t){i(627)},s=Object(a.a)(n,(function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"sticker-picker"},[i("tab-switcher",{staticClass:"tab-switcher",attrs:{"render-only-focused":!0,"scrollable-tabs":""}},t._l(t.pack,(function(e){return i("div",{key:e.path,staticClass:"sticker-picker-content",attrs:{"image-tooltip":e.meta.title,image:e.path+e.meta.tabIcon}},t._l(e.meta.stickers,(function(c){return i("div",{key:c,staticClass:"sticker",on:{click:function(i){return i.stopPropagation(),i.preventDefault(),t.pick(e.path+c,e.meta.title)}}},[i("img",{attrs:{src:e.path+c}})])})),0)})),0)],1)}),[],!1,r,null,null);e.default=s.exports}}]);
//# sourceMappingURL=4.7077bff64d63355b1635.js.map

View File

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/5.6024023b2804dafc6bcb.js","sourceRoot":""}
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/5.cfb722ac8eea8919f749.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/6.b0c7a2b19cc70c33dc1e.js","sourceRoot":""}
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/6.613b0d6b08c3f5f9ef13.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/7.4dbb03c6731e1c8190af.js","sourceRoot":""}
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/7.199d52eb458f775043ed.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/8.d11ae57b3255a1c74681.js","sourceRoot":""}
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/8.7f96f22f9f65ad394684.js","sourceRoot":""}

File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More