Merge branch 'mergeback' into 'develop'
Merge stable back into develop Closes #2753 See merge request pleroma/pleroma!3602
This commit is contained in:
rinpatch
commit
8b5a658991
109 changed files with 181 additions and 119 deletions
10
CHANGELOG.md
10
CHANGELOG.md
|
|
@ -42,6 +42,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
|
|
||||||
### Removed
|
### 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
|
## 2.4.1 - 2021-08-29
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
|
||||||
|
|
@ -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>
|
||||||
|
|
@ -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 {
|
.tab-switcher {
|
||||||
display: -ms-flexbox;
|
display: -ms-flexbox;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -243,4 +295,4 @@ .with-load-more-footer a {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*# sourceMappingURL=app.9a4c5ede37b2f0230836.css.map*/
|
/*# sourceMappingURL=app.7d2d223f75c3a14b0991.css.map*/
|
||||||
1
priv/static/static/css/app.7d2d223f75c3a14b0991.css.map
Normal file
1
priv/static/static/css/app.7d2d223f75c3a14b0991.css.map
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
priv/static/static/js/10.02ffbc25214f297f720f.js
Normal file
2
priv/static/static/js/10.02ffbc25214f297f720f.js
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -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
File diff suppressed because one or more lines are too long
|
|
@ -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":""}
|
||||||
2
priv/static/static/js/12.5ca41e245bb40263bc7f.js
Normal file
2
priv/static/static/js/12.5ca41e245bb40263bc7f.js
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -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
File diff suppressed because one or more lines are too long
|
|
@ -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":""}
|
||||||
2
priv/static/static/js/14.4e05e7c284119777ecc5.js
Normal file
2
priv/static/static/js/14.4e05e7c284119777ecc5.js
Normal file
File diff suppressed because one or more lines are too long
1
priv/static/static/js/14.4e05e7c284119777ecc5.js.map
Normal file
1
priv/static/static/js/14.4e05e7c284119777ecc5.js.map
Normal 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
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/14.a2b9acaf9caa95d1fd7f.js","sourceRoot":""}
|
|
||||||
File diff suppressed because one or more lines are too long
1
priv/static/static/js/15.23f179cc3adc903bb537.js.map
Normal file
1
priv/static/static/js/15.23f179cc3adc903bb537.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/15.23f179cc3adc903bb537.js","sourceRoot":""}
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/15.fe4e76f27cc478289a42.js","sourceRoot":""}
|
|
||||||
File diff suppressed because one or more lines are too long
1
priv/static/static/js/16.43dd2c64dcb160dd96a6.js.map
Normal file
1
priv/static/static/js/16.43dd2c64dcb160dd96a6.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/16.43dd2c64dcb160dd96a6.js","sourceRoot":""}
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/16.90b5ee380da41d6d061c.js","sourceRoot":""}
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/17.c5a6513076aa9c5a9564.js","sourceRoot":""}
|
|
||||||
|
|
@ -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"}}')}}]);
|
(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.c5a6513076aa9c5a9564.js.map
|
//# sourceMappingURL=17.d1deeeb81b7cab98b068.js.map
|
||||||
1
priv/static/static/js/17.d1deeeb81b7cab98b068.js.map
Normal file
1
priv/static/static/js/17.d1deeeb81b7cab98b068.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/17.d1deeeb81b7cab98b068.js","sourceRoot":""}
|
||||||
2
priv/static/static/js/18.a4d5b399e228a6a45a7b.js
Normal file
2
priv/static/static/js/18.a4d5b399e228a6a45a7b.js
Normal file
File diff suppressed because one or more lines are too long
1
priv/static/static/js/18.a4d5b399e228a6a45a7b.js.map
Normal file
1
priv/static/static/js/18.a4d5b399e228a6a45a7b.js.map
Normal 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
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/18.ffde79cfe78615dbb020.js","sourceRoot":""}
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/19.c031807287d659bd841d.js","sourceRoot":""}
|
|
||||||
File diff suppressed because one or more lines are too long
1
priv/static/static/js/19.e513835c3274271258fa.js.map
Normal file
1
priv/static/static/js/19.e513835c3274271258fa.js.map
Normal 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
2
priv/static/static/js/2.fec2056b00b4fa3921ba.js
Normal file
2
priv/static/static/js/2.fec2056b00b4fa3921ba.js
Normal file
File diff suppressed because one or more lines are too long
1
priv/static/static/js/2.fec2056b00b4fa3921ba.js.map
Normal file
1
priv/static/static/js/2.fec2056b00b4fa3921ba.js.map
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
priv/static/static/js/20.683b112f4dcea887f707.js.map
Normal file
1
priv/static/static/js/20.683b112f4dcea887f707.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/20.683b112f4dcea887f707.js","sourceRoot":""}
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/20.abb0d332055536a87c38.js","sourceRoot":""}
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/21.6e952388ef8d5a0276dc.js","sourceRoot":""}
|
|
||||||
File diff suppressed because one or more lines are too long
1
priv/static/static/js/21.b2844ccdcfc3c8191e8e.js.map
Normal file
1
priv/static/static/js/21.b2844ccdcfc3c8191e8e.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/21.b2844ccdcfc3c8191e8e.js","sourceRoot":""}
|
||||||
File diff suppressed because one or more lines are too long
1
priv/static/static/js/22.68c0a771d79e3383f5e8.js.map
Normal file
1
priv/static/static/js/22.68c0a771d79e3383f5e8.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/22.68c0a771d79e3383f5e8.js","sourceRoot":""}
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/22.dbc79965f66b0bb62d88.js","sourceRoot":""}
|
|
||||||
File diff suppressed because one or more lines are too long
1
priv/static/static/js/23.0b6cdf4c9dc52c4291c0.js.map
Normal file
1
priv/static/static/js/23.0b6cdf4c9dc52c4291c0.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/23.0b6cdf4c9dc52c4291c0.js","sourceRoot":""}
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/23.4addb03e0862c780c55f.js","sourceRoot":""}
|
|
||||||
File diff suppressed because one or more lines are too long
1
priv/static/static/js/24.5cfb87799bd882b933dd.js.map
Normal file
1
priv/static/static/js/24.5cfb87799bd882b933dd.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/24.5cfb87799bd882b933dd.js","sourceRoot":""}
|
||||||
|
|
@ -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
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/25.34eeae0070f7f1eb6843.js","sourceRoot":""}
|
|
||||||
2
priv/static/static/js/25.8185e4d775cea9fe47e1.js
Normal file
2
priv/static/static/js/25.8185e4d775cea9fe47e1.js
Normal file
File diff suppressed because one or more lines are too long
1
priv/static/static/js/25.8185e4d775cea9fe47e1.js.map
Normal file
1
priv/static/static/js/25.8185e4d775cea9fe47e1.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/25.8185e4d775cea9fe47e1.js","sourceRoot":""}
|
||||||
File diff suppressed because one or more lines are too long
1
priv/static/static/js/26.34ec129dd8f860ce4a8e.js.map
Normal file
1
priv/static/static/js/26.34ec129dd8f860ce4a8e.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/26.34ec129dd8f860ce4a8e.js","sourceRoot":""}
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/26.bd86a0d958de2bb3905a.js","sourceRoot":""}
|
|
||||||
|
|
@ -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"}}')}}]);
|
(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.7d4ab8716762d6f57135.js.map
|
//# sourceMappingURL=27.0f4a5145681cfb5a896e.js.map
|
||||||
1
priv/static/static/js/27.0f4a5145681cfb5a896e.js.map
Normal file
1
priv/static/static/js/27.0f4a5145681cfb5a896e.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/27.0f4a5145681cfb5a896e.js","sourceRoot":""}
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/27.7d4ab8716762d6f57135.js","sourceRoot":""}
|
|
||||||
File diff suppressed because one or more lines are too long
1
priv/static/static/js/28.75c01cd71372c39d5af8.js.map
Normal file
1
priv/static/static/js/28.75c01cd71372c39d5af8.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/28.75c01cd71372c39d5af8.js","sourceRoot":""}
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/28.a88999ebb3f7ec930aad.js","sourceRoot":""}
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/29.519f681d194c212ae75f.js","sourceRoot":""}
|
|
||||||
File diff suppressed because one or more lines are too long
1
priv/static/static/js/29.b53cf1f3bcece005d78a.js.map
Normal file
1
priv/static/static/js/29.b53cf1f3bcece005d78a.js.map
Normal 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
File diff suppressed because one or more lines are too long
2
priv/static/static/js/30.064c236fa83ac21c252f.js
Normal file
2
priv/static/static/js/30.064c236fa83ac21c252f.js
Normal file
File diff suppressed because one or more lines are too long
1
priv/static/static/js/30.064c236fa83ac21c252f.js.map
Normal file
1
priv/static/static/js/30.064c236fa83ac21c252f.js.map
Normal 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
|
|
@ -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
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/31.15b545bb42e21d39c678.js","sourceRoot":""}
|
|
||||||
2
priv/static/static/js/31.226f7a848d733df38095.js
Normal file
2
priv/static/static/js/31.226f7a848d733df38095.js
Normal file
File diff suppressed because one or more lines are too long
1
priv/static/static/js/31.226f7a848d733df38095.js.map
Normal file
1
priv/static/static/js/31.226f7a848d733df38095.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/31.226f7a848d733df38095.js","sourceRoot":""}
|
||||||
2
priv/static/static/js/32.19ca50edbb4d711838dc.js
Normal file
2
priv/static/static/js/32.19ca50edbb4d711838dc.js
Normal file
File diff suppressed because one or more lines are too long
1
priv/static/static/js/32.19ca50edbb4d711838dc.js.map
Normal file
1
priv/static/static/js/32.19ca50edbb4d711838dc.js.map
Normal 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
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/32.899035ede0115c5c0f99.js","sourceRoot":""}
|
|
||||||
|
|
@ -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}}]);
|
(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.564b2a8cbfe4d5e93949.js.map
|
//# sourceMappingURL=4.7077bff64d63355b1635.js.map
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -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":""}
|
||||||
2
priv/static/static/js/6.613b0d6b08c3f5f9ef13.js
Normal file
2
priv/static/static/js/6.613b0d6b08c3f5f9ef13.js
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -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
File diff suppressed because one or more lines are too long
|
|
@ -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":""}
|
||||||
2
priv/static/static/js/8.7f96f22f9f65ad394684.js
Normal file
2
priv/static/static/js/8.7f96f22f9f65ad394684.js
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -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
File diff suppressed because one or more lines are too long
|
|
@ -1 +0,0 @@
|
||||||
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/9.80dc09c85f557dd2c96f.js","sourceRoot":""}
|
|
||||||
2
priv/static/static/js/9.f8fc2497d5f27a9df682.js
Normal file
2
priv/static/static/js/9.f8fc2497d5f27a9df682.js
Normal file
File diff suppressed because one or more lines are too long
1
priv/static/static/js/9.f8fc2497d5f27a9df682.js.map
Normal file
1
priv/static/static/js/9.f8fc2497d5f27a9df682.js.map
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/9.f8fc2497d5f27a9df682.js","sourceRoot":""}
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue