From eb34546c784a0f1c15ded2477790b9b1c9d62566 Mon Sep 17 00:00:00 2001 From: Curtis ROck Date: Sun, 30 Aug 2020 14:21:29 -0500 Subject: [PATCH 01/83] Added method='post' to all HTML forms --- .../auth_login/components/login_form.js | Bin 1861 -> 1875 bytes .../auth_login/components/otp_auth_form.js | Bin 3032 -> 3046 bytes app/soapbox/features/forms/index.js | Bin 8586 -> 8600 bytes app/soapbox/features/groups/create/index.js | Bin 3833 -> 3847 bytes app/soapbox/features/groups/edit/index.js | Bin 4652 -> 4666 bytes .../list_editor/components/edit_list_form.js | Bin 1879 -> 1893 bytes .../lists/components/new_list_form.js | Bin 2173 -> 2187 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/auth_login/components/login_form.js b/app/soapbox/features/auth_login/components/login_form.js index 0a964f44925eabfa5da498c2a64aa9b0681bd51a..bb616a0769925d1cb906f005b2618e4a643e937c 100644 GIT binary patch delta 25 hcmX@gcbRX)aweYK)RK(+6kGLz{Nj?$OPLn1004q)3Bv#Y delta 12 Ucmcc2ca(3#a;D8&ndY$o03>h)8UO$Q diff --git a/app/soapbox/features/auth_login/components/otp_auth_form.js b/app/soapbox/features/auth_login/components/otp_auth_form.js index 21655f49298694278d36a84e8ab9ceaa8e54e3ee..49aa3c7350b15a855645423259388095eb609176 100644 GIT binary patch delta 25 hcmca1{!Dzs2R5GE)RK(+6kGLz{Nj?$@7P|k0056(3f}+# delta 12 UcmaDRenWi22e!@s*j}&z04kvdHUIzs diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index 9faf30e597f1f51039de0e68491ab3e97fa5a667..e6e29681899de0f47a772f8b6780d563d7e418b4 100644 GIT binary patch delta 25 gcmeBjp5eS^}M%*0fR{jD*ylh delta 12 TcmbQ?+~vGsBk$(@yf=jbB-jOl diff --git a/app/soapbox/features/groups/create/index.js b/app/soapbox/features/groups/create/index.js index 20d5add354ef77f7e16c065bded8c6cb36fc0b0e..cba67711bed815e7eb00118ff2d65b127d2903ae 100644 GIT binary patch delta 25 gcmew<+b*|3n2RSjwIm}y#a6u_zqn+xAlC~P0Cv;}`Tzg` delta 12 TcmZpd`zgCYm}|2l*E1FX9-9PF diff --git a/app/soapbox/features/groups/edit/index.js b/app/soapbox/features/groups/edit/index.js index 83ae43f4d8d561cd817df17500ea1269f03fd118..756b2640f8b38b3213f7d8e2a8e36451cc7583ed 100644 GIT binary patch delta 25 gcmZ3ZvP)${EH6)PYDq?ZimiGXx@t~0DKe)Z~y=R delta 12 Tcmdm`vPNY?Ebr!Q-t#N~A(;fn diff --git a/app/soapbox/features/list_editor/components/edit_list_form.js b/app/soapbox/features/list_editor/components/edit_list_form.js index 7fcf5e414f994198035c251df52d9c1157276de9..a3694508f4326628bbdf111f6d028777bdf8cc6d 100644 GIT binary patch delta 25 gcmcc4_mpqLWmcZt)RK(+6kGLz{Nj?$7g^gF0g3ktC;$Ke delta 12 TcmaFLcb#v;W!B9PSz8zZC&UGR diff --git a/app/soapbox/features/lists/components/new_list_form.js b/app/soapbox/features/lists/components/new_list_form.js index 15c488e3d59f65e88ec55eaab5bfd623e4031ae8..ae3f74f859337e597fdf425ae24d9c272d2beb94 100644 GIT binary patch delta 25 gcmew>&@H$jo{c9rwIm}y#a6u_zqn*`ESmxo0D5!?t^fc4 delta 12 TcmeAc{41~_o^5k3n;a7WAAJM` From 68bd985eee3e4d0279848e5dc9c47e178d540685 Mon Sep 17 00:00:00 2001 From: Curtis ROck Date: Sun, 30 Aug 2020 14:48:46 -0500 Subject: [PATCH 02/83] fix jest test issues --- .../components/__tests__/__snapshots__/login_form-test.js.snap | 2 +- .../components/__tests__/__snapshots__/login_page-test.js.snap | 2 +- .../features/forms/__tests__/__snapshots__/forms-test.js.snap | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap index 646a96d498..3684d2bcdf 100644 --- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap +++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap @@ -2,7 +2,7 @@ exports[` renders correctly 1`] = `
renders correctly on load 1`] = `
renders correctly 1`] = ` `; From e5de8427f124b112f993713428104f3cd208bfa3 Mon Sep 17 00:00:00 2001 From: Curtis ROck Date: Sun, 30 Aug 2020 15:19:47 -0500 Subject: [PATCH 03/83] fix jest test errors --- .../components/__tests__/__snapshots__/login_page-test.js.snap | 2 +- .../features/forms/__tests__/__snapshots__/forms-test.js.snap | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap index 353ee8358e..ed6ba800a4 100644 --- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap +++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap @@ -2,7 +2,7 @@ exports[` renders correctly on load 1`] = `
renders correctly 1`] = ` exports[` renders correctly 1`] = ` `; From 7acf9fb7021a12374eece18dd191a221a8be4f68 Mon Sep 17 00:00:00 2001 From: Sean King Date: Sun, 30 Aug 2020 20:34:24 -0600 Subject: [PATCH 04/83] Fix jest tests for method='post' MR --- .../components/__tests__/__snapshots__/login_form-test.js.snap | 3 ++- .../components/__tests__/__snapshots__/login_page-test.js.snap | 3 ++- .../features/forms/__tests__/__snapshots__/forms-test.js.snap | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap index 3684d2bcdf..e78d07cab8 100644 --- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap +++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap @@ -2,7 +2,8 @@ exports[` renders correctly 1`] = `
renders correctly on load 1`] = `
renders correctly 1`] = ` exports[` renders correctly 1`] = ` `; From f9d7da0d51d1681810f0444996f87a27476d8014 Mon Sep 17 00:00:00 2001 From: Sean King Date: Sun, 30 Aug 2020 23:09:02 -0600 Subject: [PATCH 05/83] Add bookmark button to detailed status action bar view --- .../features/status/components/action_bar.js | Bin 12051 -> 12458 bytes .../containers/detailed_status_container.js | Bin 5837 -> 6017 bytes app/soapbox/features/status/index.js | Bin 16356 -> 16616 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/status/components/action_bar.js b/app/soapbox/features/status/components/action_bar.js index c5db0cab59634958d435ea76368df4a6c7ce230c..886e1a2b495f0780411b998eed10aa61cb675a75 100644 GIT binary patch delta 266 zcmbOnw<>XiJ*Sd_LQ;Nyc5Y%(wv|G)LS~AUf_iaDVo7PS9!z|40gH&S6I7A9Lah#$ zfEJ?G{NoC}yXPvDu(ytzuCgmS4ctw From b337a4560ec9e57d461be9eb44fc057d3c4bd3bc Mon Sep 17 00:00:00 2001 From: Curtis ROck Date: Mon, 31 Aug 2020 22:00:11 -0500 Subject: [PATCH 06/83] Apply non-blank default BrandColor only when API and soapbox.json methods fail, and only when API and/or JSON method succeeds, but brandColor value is blank --- app/soapbox/actions/soapbox.js | Bin 1799 -> 1990 bytes app/soapbox/reducers/soapbox.js | Bin 940 -> 1163 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js index eedd1787f76db520e2bbac1b1cb45545e4b98283..f975bf84805ce967bc762bee4b6f9685389a1fb9 100644 GIT binary patch delta 220 zcmZqYJI22ujFDSiM?qg-!8Ny_q;hixV=_yc6sNQ0CsC?x0S6_+Taq^2d7=9D|H!z8`j)S~oMm(sy=<0@0A>XTApigX diff --git a/app/soapbox/reducers/soapbox.js b/app/soapbox/reducers/soapbox.js index dd7b0bea39a5514839253df284bbeac587d772dd..c58b22ddbe7177eb026bc781a0f146964bf4ea02 100644 GIT binary patch delta 198 zcmZ3(-px6|gNaLF@&hJ$W*sms!RF@Z>7&E7G2PsOu=` z>nk``l@_IfRn=-*gXyBwlG36)OtbZJWmAjNQ(aP13p9#L5=&C`(o;(`)Qj^I3zG6H L)HNroGq(Z&QEWY- delta 20 ccmeC?T*E%WV`7fPL|N&LbGI=~7GS9c08Ly6CIA2c From cd5ee4837c53ecf42e6868c324934f21955d0bc7 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 1 Sep 2020 00:02:01 -0500 Subject: [PATCH 07/83] Check that soapbox.json is really an object before importing, fixes #376 --- app/soapbox/actions/soapbox.js | Bin 1799 -> 1872 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js index eedd1787f76db520e2bbac1b1cb45545e4b98283..c072a0bbc22536fe829f8cd375ed013457e3b1c3 100644 GIT binary patch delta 222 zcmZqYyTG@BjnzY=S|KH|BvGMOQ^D3wp_)qp3^LOcG!!$7{gbj%lS?!}3N$qpN-~P_ z%N5j%^Aih_@+DT>AP786_nJ z#a8*Uq6Eo8kG!#>dit>x}U@{cJhB#-O0<@bO925EyDl+ From eec61b957b4d2ea9eddbc2a9d10d172c0b653bc8 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 1 Sep 2020 00:05:00 -0500 Subject: [PATCH 08/83] Style links in chats --- app/styles/chats.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/styles/chats.scss b/app/styles/chats.scss index a7369c53b9..d6cb2bed80 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -276,5 +276,9 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + + a { + color: var(--highlight-text-color); + } } } From 70bd26526b6b69a57ba8f3484f69d9444f6981cd Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 1 Sep 2020 00:23:40 -0500 Subject: [PATCH 09/83] Chats: make links open in a new tab, fixes #371 --- .../chats/components/chat_message_list.js | Bin 2570 -> 2859 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index 3f5dce8ebb1d862da125f5bcea457d0883f57655..05869c74eaf93bf978a99176b245c40f0ddcd90d 100644 GIT binary patch delta 291 zcmaKov1$TA5QYokz$=4T4?@@#;=X{Ka7DUQ5kUw+)^*N19B$3-93mq2w&{I=G=eXf z-7{d9sb-k}|G#0*y`TPdo}4`LI~I_EG(*THa7ZDPv9)KQs^0jpGU}^Ax1S=RVe4`t zDfEX!$_CBa3_ithoVK>spbG0=wJBws9+A+-DMQ-(x5~59tCbWdQ)(VXWekbvKV7&h zXLi-HVU!}U#0!W(gW49B$nHX8w^*b5*T~wfk)wC9B>kWqTiP+b&64NN6M(}aJ8)Tf Kb$`e=buYi`-dfcF delta 16 XcmZ22)+Mqbf^BmoyAt!{*<2F Date: Tue, 1 Sep 2020 09:18:51 -0500 Subject: [PATCH 10/83] Fix chat close error, fixes #378 --- .../chats/components/chat_message_list.js | Bin 2859 -> 2879 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index 05869c74eaf93bf978a99176b245c40f0ddcd90d..8e52e327088d1a28c701465974447d02eb43e924 100644 GIT binary patch delta 28 jcmZ22wqI;R9vgpVnu3O6vZg{&YDsBPp7rKTwnHoch&>5$ delta 12 TcmdllwpwgM9^2+7w!JI>AtMC0 From f9f43ebb9cd718491c8bbf8cb8db1ba68e269731 Mon Sep 17 00:00:00 2001 From: crockwave Date: Wed, 2 Sep 2020 18:16:58 -0500 Subject: [PATCH 11/83] Browser tab indicates total count of both Notifications and Unread Chat Messages --- app/soapbox/components/helmet.js | Bin 926 -> 1165 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/helmet.js b/app/soapbox/components/helmet.js index 27bdb659155e363b15c93b223b110ab0a36eabfb..f3bff8740a0827b5bffde82f0720480ac42840bb 100644 GIT binary patch delta 249 zcmbQo-pe^*vVMAMiC=z6W?D#oNn%d1f~`VvNn%N=f~}oGHJ5@ya(-TMi9%j}Q7%}K zg6+f)n)TLjiR6q#h;EoZJ)m(K>LB4_bxpmZ)RfZXR1J;9oX0+4^5m(EaT5<~Z02BUWdZ<1RtBa3 From a98fadb4d4b60f2f7136fe37de777dce423b06fc Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 2 Sep 2020 20:49:40 -0500 Subject: [PATCH 12/83] Show remote favicons on statuses, #258 --- app/soapbox/components/status.js | Bin 17997 -> 18225 bytes .../status/components/detailed_status.js | Bin 7546 -> 7774 bytes app/styles/components/detailed-status.scss | 5 +++++ app/styles/components/status.scss | 12 ++++++++++++ 4 files changed, 17 insertions(+) diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index 4e76a622daae4cb86a1262012565467d1f805172..ffca8efeb77d9e958f22028593968005f19969f2 100644 GIT binary patch delta 165 zcmX@x!?>}Jal;lni|XQ%#FElty^O?S&peH2^~B`l{L;J6%unwY}M5# Y7ix-erev1c)p7w10-3z|j9nu;07ecoi2wiq delta 18 acmdnk$9T4fal;n7$vVywn>W}uvI7837YBg= diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js index 0564ed617c1beccf51d5b63265605f57350e3411..454c22fba2d16795939f69b29ab7ea5ae6fcc27f 100644 GIT binary patch delta 147 zcmexmb0K9`NrT_o{ delta 12 Tcmca-^UG=jyUga-GR2GlCzS Date: Wed, 2 Sep 2020 21:47:46 -0500 Subject: [PATCH 13/83] corrected errors --- app/soapbox/actions/soapbox.js | Bin 1990 -> 1874 bytes app/soapbox/reducers/soapbox.js | Bin 1163 -> 1144 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js index f975bf84805ce967bc762bee4b6f9685389a1fb9..e6cced78b25da67d6ffa596a0bb196994ae0515b 100644 GIT binary patch delta 92 zcmX@ce~E9y5mtXqg=#JZh0HVs4aMU8#Db*!3g`U1w9It9q@u*U6zBY${33`F1qEF4 V3bqRB$_6GDMkyBRo7>s!83C&H9rgeK delta 209 zcmcb_cZ`3-5!QMgh4j=C&pb_qYAywZ%ruSS{KSH!{0is%ytK@8J)oS1dQwqhUW#*m zPJWTPrh=`lt%5p`1}RriNY2kIE>TEHO-n4zDRF|UQ?OO=%*`z=NleN~^-V0$fGAc_ zK$v8upss9SVqxTxVxg|1ps%msSXEk-3O2J=(;7@;n5vhXT9lsZlA2n8>PpSc!ff`8 E0D}!eBLDyZ diff --git a/app/soapbox/reducers/soapbox.js b/app/soapbox/reducers/soapbox.js index c58b22ddbe7177eb026bc781a0f146964bf4ea02..3e448add28c73e03d2f278dac8a090b46379a169 100644 GIT binary patch delta 75 zcmeC?{K2syf>Ay#F()S}F*!T9B(Wq_!B)XDH@CDTF)1h2H?csYnrrexW+lej&3=q( UOd>_8C8b4q3Me`zKWAP70O}wb{Qv*} delta 103 zcmeyt(apIbf^qW_Mj0mE Date: Wed, 2 Sep 2020 22:38:04 -0500 Subject: [PATCH 14/83] Favicon: refactor, show domain in alt/title --- app/soapbox/components/status.js | Bin 18225 -> 18340 bytes .../status/components/detailed_status.js | Bin 7774 -> 7889 bytes app/soapbox/utils/accounts.js | Bin 1165 -> 1236 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index ffca8efeb77d9e958f22028593968005f19969f2..e03c4399d7a867e9f202e342a575de428f66aea1 100644 GIT binary patch delta 219 zcmdnk$GD`Qal>2|!_3@*{Gt+tYK8RF5|{kk#LPT}T7|Tt{9Fa~;{3#dr2Go~(vr-a zV*SMA6o4Q(Kd-n%AuX{i6Ub7qRhaxxNosO{y{M@*7eYD(Vx}#^ ze2wCg#FEltJ)nge>QGbFH8nS%vU<(T3o}hk4QR$>IcK%W0`_XkP|;e2#GDe_YKW1w V3MH8(IjJ!2wBbK?VdaXkl}c9y=ulASNaXARv>GLnf1! bKPHosIvSHMI~53hAYp8DJtrr#;6KC%MrIct diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js index 454c22fba2d16795939f69b29ab7ea5ae6fcc27f..3ff82a810e8ef864b61bdb4c6f69d636826b1139 100644 GIT binary patch delta 204 zcmca-bJ2E#E{kDiZb5!gi9)qPdTNPFer{rBo<)S3$+odPk_7Gb_d zaYMoHn#jyuvvlRXaI9ued}Zy)?DB*d;$VF*8rWRv|GtIlnZoM8Vchp_)rUp`@r1Oi%1q znYdO{RY9RvAvv)mIYT2=6D+QvP?TCyT9l`dSDKS!4b)J}RXZ_BpDhJ!-ehw|MW<-P zSdc_!nu3NRL|9V+LIbTsvRngdwI)b4)KrMNiB|$yKyIC^&S)BjVh&VUbZK#Fkq%bF hV)e4}GxIdm9n_J{g<7STo?4=z4&;<CauK?zuS3&E3k53gWY zww-VIX1kLDob?9Oy Date: Thu, 3 Sep 2020 00:26:50 -0500 Subject: [PATCH 15/83] Favicons: empty alt text --- app/soapbox/components/status.js | Bin 18340 -> 18334 bytes .../status/components/detailed_status.js | Bin 7889 -> 7883 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index e03c4399d7a867e9f202e342a575de428f66aea1..f8d46b043371cbb0aa9c6c414466ddb5ca783ca7 100644 GIT binary patch delta 17 ZcmZ3|&p5B2al=V_CUy1A7ws>z0{}q42M7QF delta 23 fcmbQ&&$y(Yal=V_j_Q>B+{Dbh+Rdl!FS7#xcr*$s diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js index 3ff82a810e8ef864b61bdb4c6f69d636826b1139..d58bd7e72a886d8eaffb05d5d63b345d92ef1c3d 100644 GIT binary patch delta 15 Wcmca;d)jt`s4SDZ`es?#EsOvy^aSew delta 21 ccmX?Yd(n1-s4PcyN`7u)W?t=PaoH`50A8X94FCWD From 91605d7d911f8eccbad7dae543488a98e2d0e750 Mon Sep 17 00:00:00 2001 From: crockwave Date: Thu, 3 Sep 2020 11:10:03 -0500 Subject: [PATCH 16/83] Fixed reducer error --- app/soapbox/reducers/soapbox.js | Bin 1144 -> 1129 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/reducers/soapbox.js b/app/soapbox/reducers/soapbox.js index 3e448add28c73e03d2f278dac8a090b46379a169..ecf1656f54aa4eac5f9f3032ffdf853f76884981 100644 GIT binary patch delta 11 Scmeyt@seZ16XwaEnOgxPTLqT@ delta 27 icmaFK@q=T-6J~zB^wbg!_2T@*f~5Qkb Date: Thu, 3 Sep 2020 13:02:26 -0500 Subject: [PATCH 17/83] Theme toggle: fix color in sidebar menu light mode --- app/styles/components/theme-toggle.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/styles/components/theme-toggle.scss b/app/styles/components/theme-toggle.scss index 1f2697b89a..c0cadc68f4 100644 --- a/app/styles/components/theme-toggle.scss +++ b/app/styles/components/theme-toggle.scss @@ -9,10 +9,6 @@ .react-toggle { vertical-align: middle; - &-track { - background-color: var(--foreground-color); - } - &-track-check, &-track-x { display: flex; From 35a0cdb64e99efcac00074492f78ac79af80898d Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 3 Sep 2020 13:03:30 -0500 Subject: [PATCH 18/83] Chats: fix chatroom title text color --- app/styles/chats.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/chats.scss b/app/styles/chats.scss index d6cb2bed80..7ae51847dc 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -252,7 +252,7 @@ background: transparent; border: 0; padding: 0; - color: #fff; + color: var(--primary-text-color); font-weight: bold; text-align: left; font-size: 14px; From 2db5c67a497acde4234df796bc87a6617252185c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 3 Sep 2020 13:48:15 -0500 Subject: [PATCH 19/83] Chats: parse custom emoji, #386 --- .../chats/components/chat_message_list.js | Bin 2879 -> 3218 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index 8e52e327088d1a28c701465974447d02eb43e924..3888d92225d7e5853591dcabef7fb9d7f9709df6 100644 GIT binary patch delta 351 zcmdllHc4`WB%_FLVu37}QZXsD-x6cnrLAawg=7MEyfYU&lGrj#b9YG~vFO;Z3X(*$X*=28F}P*Pfy zrvQ}ED+U^pV5L$GRsb=wI3vHPBso7NRZ(5D)+zy}*_x{s$rhlSfR=2Y#Td*MRghRz zoa&sPSCX1n0(59{Mq-I?YH@L5dMeC91%>4Nyy6mwGa%l{O+@%k14)afHPC@DCr%FK m(iDU`0H{r`B;PAoLv! Date: Thu, 3 Sep 2020 14:11:33 -0500 Subject: [PATCH 20/83] Chats: format content, fixes #382, related #380 --- .../features/chats/components/chat_box.js | Bin 2894 -> 3205 bytes .../chats/components/chat_message_list.js | Bin 3218 -> 3519 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js index 0f1de7dbbdf6863851dd8207e22d09b99761dcdb..40123ca251b5dfc8e623836979a2e4b98ecf3ac4 100644 GIT binary patch delta 227 zcmX>n)+)K-Jqv$vYF>(OYH@L5da8o0g2rSdEC2ui delta 41 xcmZpbJSVo{J1uu_;VWV6~jA%P!5LuC7o!xrecCg|wplTm|)<{FKDvjLqv9S=gfjQu9(W z^U|I3^GZ_lN)&7rl3^@6g=#JZASg;LDJ{x_nxO%e*3>IXEyzhsPSw!Yu(ygSipi^q zDXNLd)6`GbQBb!@Dza0byqLp;3vQaiWC2bEQERY?K*8b?g#w7p3bvCcb1C^D%cSKO x Date: Thu, 3 Sep 2020 14:18:11 -0500 Subject: [PATCH 21/83] Chats: fetch chats in UI instead of chat list, fixes #384 --- .../features/chats/components/chat_list.js | Bin 1752 -> 1632 bytes app/soapbox/features/ui/index.js | Bin 22076 -> 22169 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_list.js b/app/soapbox/features/chats/components/chat_list.js index 41aae6397763b1aa02797065d20bd9c811375c6d..e24d31ab99595f33c2cf242cd208ffcc490527b8 100644 GIT binary patch delta 16 Ycmcb?`+#S{?alm*5zL!cv*;M1& delta 123 zcmaFBbAxxnZLMmBwA7O14Cjo*l46Bgg|wplTm|*w{KSH!{0jZVUv#tkQ!)zeZ-k~5q$5=)8|Y8BFo@^cl`i}Mo;lJYC`6O&6a^Ye=JlYz3E ZcQgB1O}=I;GFje^l?9}J^B-FW2>=3V8)5(e delta 19 bcmbQamT}J-#tkQ!H~(RFu-cqzXCeUrSyu=8 From 9b55f813bb3a3604dd7c32fd15ce923c08be27d4 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 3 Sep 2020 14:47:04 -0500 Subject: [PATCH 22/83] Chats: mark read more aggresively on mobile, fixes #367 --- app/soapbox/features/chats/chat_room.js | Bin 1948 -> 2474 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/chat_room.js b/app/soapbox/features/chats/chat_room.js index e6df1953da64dea80351acd3a771cede7de662e2..4a8c480eae4d56e7f090de7e3da80f9112a382bc 100644 GIT binary patch delta 519 zcmaKoK}rKL6ozSSLAua|7kDmY5;_d-%XDEy7{MZntI|cBq&DazA<0yvl&(q-Fk4UH zO6VN~7v8|bn9OvPZpn8(oRXhM zUeW`hfYSiu;=A>{1h7+XqS^ytFR7Al(8Kg9uU2CZf-eIVR2U1XO zxeLLej!F>NB9|u0kCv;$aU4S~C|gdrU^M)%w<6Akb}IxJ`fysck9(dHfKT8zqCbL& f&6s{csn09*u{lGlbB6KOt6F=1n=RT5+r#D$@SUW& delta 55 zcmV-70LcHU6PypQg#nY30nL+<0(+BL13nddAZcVeAaG%FVQq6RV`yP?Nn{{>vzr6P N0h8$kZL?tqNdiFB6hHs~ From 9df386b477009e0bc64f25e1baf8e9b8642ddc16 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 3 Sep 2020 14:57:58 -0500 Subject: [PATCH 23/83] Chats: fix #375 truncated message text --- app/styles/chats.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/styles/chats.scss b/app/styles/chats.scss index 7ae51847dc..011543ca3d 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -113,6 +113,8 @@ background-color: var(--background-color); overflow: hidden; text-overflow: ellipsis; + overflow-wrap: break-word; + white-space: break-spaces; a { color: var(--brand-color--hicontrast); From 529cb0d4172bc05c53dd2864d42f1328a3c81189 Mon Sep 17 00:00:00 2001 From: Sean King Date: Thu, 3 Sep 2020 17:04:34 -0600 Subject: [PATCH 24/83] Fix theme toggle CSS on dark --- app/styles/components/tabs-bar.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/styles/components/tabs-bar.scss b/app/styles/components/tabs-bar.scss index 76920534b3..7da26b28c9 100644 --- a/app/styles/components/tabs-bar.scss +++ b/app/styles/components/tabs-bar.scss @@ -143,6 +143,10 @@ .setting-toggle { margin-left: 10px; + .react-toggle-track { + background-color: rgba(0,0,0,0.2); + } + .react-toggle--checked { .react-toggle-track { background-color: var(--accent-color); From 0e7132d25e34ddd0aa737f4795f6d83981f2b6d2 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 3 Sep 2020 19:23:00 -0500 Subject: [PATCH 25/83] Chats: add the building blocks for pagination --- app/soapbox/actions/chats.js | Bin 5498 -> 5564 bytes .../features/chats/components/chat_box.js | Bin 3205 -> 3229 bytes .../chats/components/chat_message_list.js | Bin 3519 -> 4191 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/chats.js b/app/soapbox/actions/chats.js index a3e743c87b49fbf6528ac2f17df70d31a4a02ff5..935efc9a602a421349c1d8e6e8baaf828bcab8cf 100644 GIT binary patch delta 115 zcmeyRwMToyc~(9hh1|pn&lCk)g}l<7oXLeO4wL!WcO%7nwlGRbDRwzg; zO3W>`0#uZ}`;Mq-I)3fP3nC)skCfvPtfvU~CY E0E>Dh4gdfE delta 70 zcmdm^{Yz`ZdDh77gS;>nFdCQuoU$sgDR WCv&i8Os?l-ojgZSZSx{_DLw#>A{V~^ diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js index 40123ca251b5dfc8e623836979a2e4b98ecf3ac4..387a0f94418d30380c67f54d17ea8d62026475f5 100644 GIT binary patch delta 37 kcmZpboGZD(fr~9UBeBFYWwIUD5k3ghwi-fj;%;RG0P3>ps80 zKOjPOZrne3zu|$u#7WcE^4`W-%)p&9=bm%!yl?)6*K4PpLxd)bk78!}s5QGm4I_vY zrO?#GvH{)iu+StV^-gF(y0~y|SA8(CB4b4P?z}Cm_xK+CRFs`RWT*peR3dLmTKu!H zbT}Lg1eTrUEoZe)Lup(O^5SIW=`o}F7Rwz^Y-ogQNwO^^^_RzlS1f%?c6jS-S@cVseoUAKrn4hRc&F$=KhzdJEb49c>l_*#ar@8 ztmw|Ey@DhH_bZax{W)dOfp)9q&8IN+TPqs*(B5tN6VpbqMA*sffl)*BtDwC7^7qP% ybFI<*!l()1UjdVv0b#QR0=WW{aRn2z?*y;{v!w?f0h8bebhGUWssWM>YO{O| JJOY!x51|4&6Q}?H From f89f4e08fe6614c982e999df06a14f03691132da Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 3 Sep 2020 23:51:16 -0500 Subject: [PATCH 26/83] Theme toggle: use dark bg in tabs-bar again --- app/styles/components/tabs-bar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/components/tabs-bar.scss b/app/styles/components/tabs-bar.scss index 7da26b28c9..a9cf3b1d45 100644 --- a/app/styles/components/tabs-bar.scss +++ b/app/styles/components/tabs-bar.scss @@ -144,7 +144,7 @@ margin-left: 10px; .react-toggle-track { - background-color: rgba(0,0,0,0.2); + background-color: var(--foreground-color); } .react-toggle--checked { From d464d53a92f237e8a07e168a739d076a1b3dbf91 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 3 Sep 2020 23:52:16 -0500 Subject: [PATCH 27/83] Composer: change globe icon to globe-w --- .../compose/components/privacy_dropdown.js | Bin 8536 -> 8538 bytes app/soapbox/features/compose/index.js | Bin 5482 -> 5484 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/compose/components/privacy_dropdown.js b/app/soapbox/features/compose/components/privacy_dropdown.js index d024b68e59884479ed681b712d15bf72a0baf264..8a6cdcc9a024cd3eeed0835c058d5abfd4fe70ef 100644 GIT binary patch delta 15 WcmccNbjxYO9Wf@|^38X|YPbM9vj(aF delta 12 TcmccRbi--G9kI>##A>(zEFT62 diff --git a/app/soapbox/features/compose/index.js b/app/soapbox/features/compose/index.js index a7e177d2af260b9b69665ec2d26279910e2100bd..c66c5b82addbc496d86d0f013607f58e442ee4c1 100644 GIT binary patch delta 19 acmaE*^+sz0rvQ^~`Q(K>dYjD!j9CFmjRraZ delta 16 XcmaE(^-604r@-WeJbIfg1&mn%IuHex From cf8f5fde60229f1b7aa005d2ebd2061564e363e4 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 4 Sep 2020 00:11:27 -0500 Subject: [PATCH 28/83] Composer: use paperclip for uploads icon --- .../compose/components/upload_button.js | Bin 2272 -> 2275 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/compose/components/upload_button.js b/app/soapbox/features/compose/components/upload_button.js index 04d2c74cd8f27ddf6d95b0d85d8d4bd9b99d3f3d..79a13c4a0d56bc6e3f6f933bcbf54f2a61cbcca8 100644 GIT binary patch delta 22 dcmaDL_*ig592;jrVnJ$Aa!zK!<`lLXCIDv42wngH delta 19 acmaDX_&{(&92;9{K~8>R%I0*o8YTcu=?5bK From 57b2a120e5d0f21122a76f1ff6e418f00a38e013 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 4 Sep 2020 00:15:10 -0500 Subject: [PATCH 29/83] Composer: allow attaching any type of file --- .../compose/components/upload_button.js | Bin 2275 -> 2299 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/compose/components/upload_button.js b/app/soapbox/features/compose/components/upload_button.js index 79a13c4a0d56bc6e3f6f933bcbf54f2a61cbcca8..32472d9a2ab3e584c234a231909965840a9a2693 100644 GIT binary patch delta 60 zcmaDX_*-zp8rIDRSUs7v_4O4Tlao^mN)!@vauiA`3sQ>}((;QG^76~|xD=3pzW!tm Gj@tltI1)Pm delta 37 tcmew@_*ihm8deb0st5k4rc%W From 8e6a662fbb9084f591a95b367f584bd0ba64ff78 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 4 Sep 2020 17:16:23 -0500 Subject: [PATCH 30/83] Chats: fix error loading chatroom page --- app/soapbox/features/chats/chat_room.js | Bin 2474 -> 2451 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/chat_room.js b/app/soapbox/features/chats/chat_room.js index 4a8c480eae4d56e7f090de7e3da80f9112a382bc..f3e81cc12035b2b8cae692973bcc6e6e1caed401 100644 GIT binary patch delta 22 ecmZ1_JXv_d88$|p$s5>YCVyvh-R#Pq$^-yk83(ff delta 46 zcmbO%yh?b(88&_eMO#~i(!7+^w9LHJ6rIT%*kmTZWOL Date: Fri, 4 Sep 2020 17:19:26 -0500 Subject: [PATCH 31/83] Chats: fix pagination bugs, use flex column-reverse --- .../chats/components/chat_message_list.js | Bin 4191 -> 4708 bytes app/styles/chats.scss | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index 4c86677a4acd7a16a42f2fc68c351ec9e58e68ba..a0e6458561ea3f5ada0647944325822de665ef0d 100644 GIT binary patch delta 715 zcma))Jxjw-6oxUPXs8HECs9tZvNC{n>biDsU z5rm9_qrbq#$;JPm;NnegBlQc+l-zsH`=0kXd4`wl?ToTT>ppSa8exnaK?O8)@kobC z6`~hI-mao!HyO;!Gty{KWM9u@-5zO$Y2{&H#PG3=KE?29@NQt5nGA(=M+NaXbe))% z_Y0|`+4mDc;>T>8NntpaYY0rDDIGuwcYLTed8;{+`oD zw&rR3^9ys3cdYz@4w*^?{+iG3elIVp5?lkcPbiT>5?1e#6>LRGe;8f5B+HQr6JoNw zKY}dJ8DhJ;(ayBak8MHF;~ntz(JTHoT9}~5_kg^pmS&;n{i_!9PY?orsIE!39r>jg} z3ySrUGZIUDQ;Ule(^HET6m4x4N-{Ew^$IZLG`SQ&0A$o;PwwSRo+*<*aO-n=rWEVt vBo>!wOg7{(o!rOc!en5u`7Mty(_~vtr^&4RZJQtP=QB<28jlMPs diff --git a/app/styles/chats.scss b/app/styles/chats.scss index 011543ca3d..38550ac3b5 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -99,12 +99,18 @@ .chat-messages { overflow-y: scroll; flex: 1; + display: flex; + flex-direction: column-reverse; } .chat-message { - margin: 14px 10px; + padding: 7px 10px; display: flex; + &:last-child { + padding-top: 14px; + } + &__bubble { font-size: 15px; padding: 4px 10px; From 9da87405f8dccddade4bede7dcee676eb63ee8f8 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 4 Sep 2020 18:03:38 -0500 Subject: [PATCH 32/83] Chats: improve the way messageIds are sorted --- app/soapbox/actions/chats.js | Bin 5564 -> 5587 bytes .../chats/components/chat_message_list.js | Bin 4708 -> 4691 bytes app/soapbox/reducers/chat_message_lists.js | Bin 1798 -> 2103 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/chats.js b/app/soapbox/actions/chats.js index 935efc9a602a421349c1d8e6e8baaf828bcab8cf..729dc128e00a5a23244b5476c3bba8ce6103dbc2 100644 GIT binary patch delta 44 xcmdm^eOY_McXs)NXLDA^t5mxrmZa+C<(F${)&hB@rI{&ZCO~$==Kt(_c>$_y5*z>k delta 21 ccmcbty+?b)cXp1_(#(`H6AjJHVjO#U0bPx# diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index a0e6458561ea3f5ada0647944325822de665ef0d..45b597577ca77ed8e9765105b1de74b8a2f8dbc8 100644 GIT binary patch delta 12 TcmaE&a#>}A4$Ed+7Ii)VA#nr= delta 29 kcmcbt@h#p#T5? diff --git a/app/soapbox/reducers/chat_message_lists.js b/app/soapbox/reducers/chat_message_lists.js index 0d635070fe1271de6fecfaa3863242b31e2d25e0..b584dca7242f6b114f3888823fb86574689b992a 100644 GIT binary patch delta 299 zcmZqU+b*ynmN7gt#W_E>Ah9U1B)>?(RzV|CM^m>-5P5YzBN#`+QT2ixbmRCpWT)D zq1fbPw)rp>jO;Un^oml;Qj3aHH8eG$iYLpni%wq8E;TuTT~RJNF}Wl&KTj_?BeBFc UwYWGjJykC=B^Ii7vH*uV021#koB#j- From 8f1b11a3947ee7f6eb85234518763e06580a63f2 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 4 Sep 2020 18:08:53 -0500 Subject: [PATCH 33/83] Chats: move messages fetch logic into ChatMessageList --- .../features/chats/components/chat_box.js | Bin 3229 -> 3093 bytes .../chats/components/chat_message_list.js | Bin 4691 -> 4778 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js index 387a0f94418d30380c67f54d17ea8d62026475f5..12b28d513beeb0d89b1a9b10c2430046864aa34d 100644 GIT binary patch delta 17 ZcmbO$IaOkVHsfXoMpyRDKRA{$0{}HI1=|1s delta 80 zcmbO#F;{YfHlt8lYDsd2b4Fr`Z)$OIVtQ(^&Snip4|aCn{L;J<4b921?6&e4YBZ98 U8az`pHLbZ66lymoaBO7;07BpzhX4Qo diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index 45b597577ca77ed8e9765105b1de74b8a2f8dbc8..baa50a08f27dbd2135c8c50d4d37f1d47f60709b 100644 GIT binary patch delta 50 zcmcbtvPyM>9;ZZdeqM2jLbXClW^qAcNpgmcLUKl8iD$~>4{V~7)p- Date: Fri, 4 Sep 2020 20:17:03 -0500 Subject: [PATCH 34/83] Chats: basic display of attachments --- .../chats/components/chat_message_list.js | Bin 4778 -> 5423 bytes app/styles/chats.scss | 5 +++++ 2 files changed, 5 insertions(+) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index baa50a08f27dbd2135c8c50d4d37f1d47f60709b..d8568d3854bde067d5dd80b7086bd9ff82722662 100644 GIT binary patch delta 533 zcmZXR!AiqG5Qb3{p{3H4VugZ?pd=M+sz;mjpa&7{MZAfJZL)0^Hk+F43MGV|J?|5E z6+xj7;k)!HOtNjFxW}1q{{NrZ_v6o#uhwRZ_|qWd5W^6=1YILaaX5oSzHRIqf|!C6 zYNBYyoKq)AQHB|h^nPVEb}5)kaRxV2xFpO`-dHp@QMK-)*$Cfb=Hf6nk;~e_9C3~u z&rjvR2FF8uh@%KiaCd^ap_g5~)2~4K$QX>nvfP0Xa}hFNf>K4S3Pz3tSSlNgF?YPH zb#^;ed(PFO$zVkT#03NP0M;s*wN-QqI4k?v!R+|P_XS5Iitk9ojmI+LQz!Yudzef- zZpUZ6UQ#*F6x1`z48??Hs`RRrpCDO0*LJq#L%l9vwLsoBjwI1`rO@`|x7MyY0psa0 g_0&=>HKhMiRW>pANYwrJ7av-C+cI79BBzau9|4Y|g8%>k delta 39 vcmZ3lwMun^IMe32OmW Date: Sat, 5 Sep 2020 16:39:57 -0500 Subject: [PATCH 35/83] Chats: improve attachments, make modal work --- .../chats/components/chat_message_list.js | Bin 5423 -> 5622 bytes app/styles/chats.scss | 14 +++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index d8568d3854bde067d5dd80b7086bd9ff82722662..d6acefe2f303306a775deef8ff49e37b333a659b 100644 GIT binary patch delta 209 zcmZ3l^-X)jS4Q>xg48_U{FKBTg<6HQqWoM1_2T@*f~5Qk{lw&w%>2A!{aldj=9i2@ zJSq8k{vhS4DVd21wh9`#Acl@YW?o8ag{Fe7okBI20uYpBWESfc6y+Bb>!oBC7bKP> zXK28!(NOnwb@6mm*HNfeK-RBNtEp)X)Ly&!8?P>-u8~14*esBFAb@1EZ8g{eB$3Uk H{9J4R>NG_4 delta 25 hcmeySySH{g6Ol&-xr}JqrG8q_be#6hj1^|862r&Qv diff --git a/app/styles/chats.scss b/app/styles/chats.scss index f49450155b..7d8c7d6fb2 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -291,7 +291,15 @@ } } -.chat-message .media-gallery__item-thumbnail img, -.chat-message .media-gallery__item-thumbnail .still-image img { - object-fit: contain; +.chat-message .media-gallery { + height: 120px !important; + + .spoiler-button { + display: none; + } + + &__item-thumbnail img, + &__item-thumbnail .still-image img { + object-fit: contain; + } } From 6dc38adeaa37993fef4ae647d82d39a0250b24ca Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 5 Sep 2020 21:48:25 -0500 Subject: [PATCH 36/83] Chats: add upload button to chat input --- .../features/chats/components/chat_box.js | Bin 3093 -> 3295 bytes app/styles/chats.scss | 15 +++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js index 12b28d513beeb0d89b1a9b10c2430046864aa34d..e307325a50a11f8cd147e3d0443db3787ced575e 100644 GIT binary patch delta 203 zcmbO#abI%7Jx1@$+=Bd~5{1x$oczQTr_z#={5*xUqWoM1_2T@*f~5Qk{j}7?lG38o zV*TWNpxWY82%VRjS5mBB3f2~%1lG6tHsdyS%Z$Xll$=zz%$(F>1zQD;G!R2m!PZWp zno9u)^z{`&{9XL5pf)NbmXstWXXFA++uX_N&!~suko>&h)ST4h5|C-O)g>93#d=7_ N*DC05KF#ID2moPAN@xH8 delta 22 ecmcaFIaOlAJ;u#COq Date: Sun, 6 Sep 2020 12:37:38 -0500 Subject: [PATCH 37/83] Chats: get media uploads working --- .../features/chats/components/chat_box.js | Bin 3295 -> 3597 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js index e307325a50a11f8cd147e3d0443db3787ced575e..41ac52b0570e75bc8d5994509f9e6299ab8c4947 100644 GIT binary patch delta 341 zcmYk0&q~BF5Qni?54{&$5u8QbO`rt5uI`>>PwUB}h=gWp18rK`Srkg~=1nhs5urC< z#`o}K(*1+EOeXW2FW=AT>fqSV-L>c5uNMLg&68F$ zSQ~|jHmJHYe>sW^Q@d?j2@OU2U^hMr&vgQ9I}sV0XG-A)u3$2O@ebI(`>%(K4Ms_l zFb9J#uq>+l*0zja2VjpI30anC6q_bG!)XMr)DM@By!-S|-v0SBm*!khiiTBKmsS#C zzJO+60Z^)IQ6t@xBxKEAdIr0+7(Ubr+O0s#MJy>!8RG+K^WFxQSXn9TFM@CH53Jp8 AHUIzs delta 87 zcmeB`xi7gvhiP*n(|4xHg{)4BnQ00dB^jB;dc`G)C8>JJ`FSO&c_n%|sd?!o845NE qhMQT~Dp;iS^%X+=UHq*SLJM;86H^otOG*-xGjf4SH@k5kX955reI0uM From afd823fae05d8699d49266ac923888ac13418f81 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 6 Sep 2020 13:55:24 -0500 Subject: [PATCH 38/83] Chats: refactor ChatBox state --- .../features/chats/components/chat_box.js | Bin 3597 -> 4068 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js index 41ac52b0570e75bc8d5994509f9e6299ab8c4947..7d9f03342c53f26f64a61da06860759ea43df57b 100644 GIT binary patch delta 651 zcmZuu%Sr<=6vdHFv8CO0;fvmlOaf)-PN=lFRVWl(`XWx#HaM9nlZcBlxOU+x;MQMI z=2zT_JO98RFv-kF2hAdn`#ATUlc&9}?kjP8#+Pv-VFhEd1R~&s^E*jyLTcVA%#xUc z$I4)K<$O9V7BR_4I3Wq)LLJu*ZzYiwhOlaYUP~JvRG^StFyU7kaZgvL4ZR5}b1V%J z(fjf~D)53h5{6-pt6toLK{+BneNK}(MZc{WQhZc`2O%X%2?aBJ013h8UKL7v# delta 215 zcmaDN-z&2rk!kZJrdv#`#U+U)sgo;N%_pB?a}i9=&nrpIE74KNO-;#6jL%G&9LOuF z2^H1LNzF?y$xyISFjP=eQ&5Dd(Nri(Eh#O^v*wz-hTVX-BqOs}4{WTaruF0oHc@`4 zek%oab%k1>7!QXgJ5&s4zUX8FHUR;+8Yp9PJ%<$I Date: Sun, 6 Sep 2020 16:08:09 -0300 Subject: [PATCH 39/83] Show file icon and name for other file types Currently the media preview looks blank when the file type is anything other than an image, video or audio. This commit inserts a generic file icon and also a label with the filename for these other extensions. --- app/soapbox/components/media_gallery.js | Bin 19002 -> 19681 bytes app/styles/components/media-gallery.scss | 1 + 2 files changed, 1 insertion(+) diff --git a/app/soapbox/components/media_gallery.js b/app/soapbox/components/media_gallery.js index f848a396f1ec263c4e1399ec0d97bae3321ec29f..0fc7dcb6755bc828dbf8fc7eaf0797fb52cc56af 100644 GIT binary patch delta 491 zcmdlrh4JA`#tl>WT$1ziic1uH9V6o1JbhgK9DQBmfs}iQhk~twiK#W00uVsdq^FiR z7v&ceq^7uK=A`B&=B5IbXlN?f+D-NsbLB{b3QoQxrd+SDt_jf!(+raZYAH(1%`Zs} z4f4?|E=?*fDbj$+`6L#Xc;=;~Rw!sI7{c{urYXQx=mG6bFUe4_vBlWCZCs3nA{^EwE48ae#Xr@!doo?r(p{w diff --git a/app/styles/components/media-gallery.scss b/app/styles/components/media-gallery.scss index 731f361fc2..02318c6d81 100644 --- a/app/styles/components/media-gallery.scss +++ b/app/styles/components/media-gallery.scss @@ -134,6 +134,7 @@ } .media-gallery__gifv__label, +.media-gallery__filename__label, .media-gallery__file-extension__label { display: block; position: absolute; From 07f29ebcb94dbb71c420dcac0f9ba3d3b88ed8e6 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 6 Sep 2020 14:15:06 -0500 Subject: [PATCH 40/83] Chats: put attachment above content --- .../chats/components/chat_message_list.js | Bin 5622 -> 5622 bytes app/styles/chats.scss | 1 + 2 files changed, 1 insertion(+) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index d6acefe2f303306a775deef8ff49e37b333a659b..2ff4231436ea92348dc41860e557ec7458235be2 100644 GIT binary patch delta 23 fcmeyS{Y`trEs@D>qK1=ih^(1>LX>~~VWF diff --git a/app/styles/chats.scss b/app/styles/chats.scss index 7af2fb5f82..e15dd9e906 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -308,6 +308,7 @@ .chat-message .media-gallery { height: 120px !important; + margin: 4px 0 8px; .spoiler-button { display: none; From cf0baab6def88ca7efd123c7a0cbe76dfb555e09 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 6 Sep 2020 15:36:47 -0500 Subject: [PATCH 41/83] Chats: add upload progress --- .../features/chats/components/chat_box.js | Bin 4068 -> 4610 bytes app/styles/chats.scss | 19 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js index 7d9f03342c53f26f64a61da06860759ea43df57b..89f7008ea558887cf6dfdfaec786f1d6d3d00cf4 100644 GIT binary patch delta 467 zcmaDN-=wl(5|e0VZb5!gi9%>WPJUuaKv8~rQEGAVdeTHLWKr^W=&H&CJLw)W>qV&|syLi+lH?v8}!quX985%~Duk%#Nph)PThS=l)-rEjnL6DeSl3A8& aTaDy{S_N2q*jA(ZU(3+IV6!aWaYg{HZK$XK delta 78 zcmZotc_P1I64T}$U; diff --git a/app/styles/chats.scss b/app/styles/chats.scss index e15dd9e906..00c0e4b948 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -181,6 +181,25 @@ } .chat-box { + .upload-progress { + padding: 0 10px; + align-items: center; + + .fa { + font-size: 22px; + } + + &__message { + font-size: 13px; + flex: 1; + align-items: center; + } + + &__backdrop { + margin-top: 2px; + } + } + &__actions { background: var(--foreground-color); margin-top: auto; From ed41b13064693c96bedd6016c6db3b3717e3252f Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 6 Sep 2020 16:24:34 -0500 Subject: [PATCH 42/83] Chats: refactor ChatBox state yet again, display unsent attachment --- .../features/chats/components/chat_box.js | Bin 4610 -> 4784 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js index 89f7008ea558887cf6dfdfaec786f1d6d3d00cf4..a6befbfd2df1a5be3e85636c5b799efb2b03e1c9 100644 GIT binary patch delta 772 zcmZva&x_MQ6vt_Go0zpp7pY5Ei%-}e3DhWyu-LlAJ$MlO1>!*w%FvnJ47AxWnRX8) zEG+mJJUj?q1o6Dki+_cGintd&>SUTGK|H>h@B6;*`|!>-&$rHl>ilE1bIExniDa-3 zt_S;laPj-fdXq>=hQXMHvI~=tvO^v+ihH&DzGqngan>RO9{W7xl9Q3ParO6b#E8%} z{;sv*KPs=MT$0r4h)KMtHSy-Ec{)4}r5f3RVmu@&nKsZfdua=RU~(ctnCSvw*_V}L zMmZU9+AaHRZdfyVn&*rX?&BWVI6MvW{{=8~7 zvbXLs=)8Spqk^_!&L3HSswvVI<#9yhFeo@i;y8+X7FLWVzNlYET7SHvW8k;?Q+#bV zS_S>CA{|GH2JRdVUq HwRe93GDP(^ delta 781 zcmah{&uSDg7^hpD?pAkaDSA+-e1eh*Zlm>3aHI>02e()d)QgA`XVRU({9}^hVOR@& zgOV4hK0#q`eE=Uqd<4&e7crYmW)%v~VMxB@`~CZJcIWu^S<*o@?9&pcfJv4eO8OyX zi~S4^sv-l#U2*=dv$J~if>tyWunYA%=r1aA$#NM2LL*biSj_2r9*1z4$LxUTEM6SU z*7Z+FDp}iF8l>&U36+yreeyTG zMh0Jd_{1*Bl*s@!>7kL150jMTQ<=aR?pw>?WSYA!ScKKrwee*WR9O|JAZpY_w}>qE zUIrK&1B=O+3xAtPyAPZW9mhR$E?kO1y&UC53i13~_r{86^O*nYbyn4n-caog`fA+o zsb~GCeoNY@I_W>(*9P?%+JN=!E$!kVkcP(&p$2C#go=q$H!>1aNePdev8dB4S2t`^ txWpW($>63>A}XUK2r%sGCoofw{Ws3+7ysw{e5h8gU*yXquU>7u{R5(Z0k;4E From 5aef50b89ede5b82bcb5e482407a85b2af17503e Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 6 Sep 2020 16:44:19 -0500 Subject: [PATCH 43/83] Composer: refactor filename truncation --- app/soapbox/components/media_gallery.js | Bin 19681 -> 19345 bytes app/soapbox/utils/media.js | Bin 0 -> 270 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/soapbox/utils/media.js diff --git a/app/soapbox/components/media_gallery.js b/app/soapbox/components/media_gallery.js index 0fc7dcb6755bc828dbf8fc7eaf0797fb52cc56af..845b68db2b03f31f5bdb3ac9966d87995220146f 100644 GIT binary patch delta 127 zcmaDjlX2p7#tlh~desUgMWuPki6yCSnK`L>iMgo?wF+rP`MC<}#rcT^N%!==B1=oC}=Af!u4mSDZo|e0qspM$xyJdRq%C;hWflKN{jLoU?#)dlA2ST3Ri@t2Id+A9c*Un8)*VvrLL!^rw*iH=EC&A`B3+% h>f$g1;*eTvE|4oG*NH1m=H*uw#td1F%|-n3HUMbIdc6Pu diff --git a/app/soapbox/utils/media.js b/app/soapbox/utils/media.js new file mode 100644 index 0000000000000000000000000000000000000000..c8266c6461224c90922d1ed2c6cfa8a5da216d2d GIT binary patch literal 270 zcmZvWK@P$o5JmT#Vs=1Msc~ED(v>$bE^0#+LxI4MG%+Tg#)Ekhi2>V%+nM*@|8jEH zBlOk;1oYAL9m>7Z(sZMQ7FhJUg0Y(p(p>P$q20lqKn@Hum^cxfR>){gxp3Ao-jGD9 z0a)Qg@+J#x+ojS=jNU+jzNvgWCIS3DBE)k*&(@1Y^@dk}p`t6DtGO~~PU2>jVf6ic J(X{o^kPo%nSg`;A literal 0 HcmV?d00001 From 49d2121017f3495dee1d0af3155ff55984f3df45 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 6 Sep 2020 16:50:54 -0500 Subject: [PATCH 44/83] Chats: improve display of images, because we can --- app/styles/chats.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/styles/chats.scss b/app/styles/chats.scss index 00c0e4b948..62a9424ae5 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -326,13 +326,17 @@ } .chat-message .media-gallery { - height: 120px !important; + height: auto !important; margin: 4px 0 8px; .spoiler-button { display: none; } + &__preview { + background-color: transparent; + } + &__item-thumbnail img, &__item-thumbnail .still-image img { object-fit: contain; From a02155846dc74a07fe36f018da8e4e076e25f9aa Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 6 Sep 2020 17:09:06 -0500 Subject: [PATCH 45/83] Chats: allow files to be removed before sending --- .../features/chats/components/chat_box.js | Bin 4784 -> 5365 bytes app/styles/chats.scss | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js index a6befbfd2df1a5be3e85636c5b799efb2b03e1c9..bde2f9dbf605009d77043cce5f670d680968e183 100644 GIT binary patch delta 563 zcmaKo&q~8U5XNbxqNTRfWAQK^B#HE&9<}MAf>OkT-aLhEG9in}ZrN;VB^1F|$icI3 zP{`f)5TC)LN5xGowe7(#6+8ef zg)1Vxrt5Pqbba;~ggHD=pNG&MAGK8(>DNXfzXu>NM426{JWiI(bR+#P z;AX{BQXg+H;G-;4^1i*FeC(98h&kv|hEDw-3z($0rPqA2RjoZ{cVoU1J(HRI(jWz}Bp E2L-Xg{Qv*} delta 70 zcmV-M0J;D5DX=B5vjVdu15N?6vjhPGv(yG*2D73Kv;r7=VRUq1V`yz diff --git a/app/styles/chats.scss b/app/styles/chats.scss index 62a9424ae5..1f47cd57f3 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -184,6 +184,7 @@ .upload-progress { padding: 0 10px; align-items: center; + height: 25px; .fa { font-size: 22px; @@ -200,6 +201,23 @@ } } + &__attachment { + display: flex; + align-items: center; + font-size: 13px; + padding: 0 10px; + height: 25px; + + .chat-box__remove-attachment { + margin-left: auto; + + .icon-button > div { + display: flex; + align-items: center; + } + } + } + &__actions { background: var(--foreground-color); margin-top: auto; From 024e9209afa3086cab5f1660cac83edca873a5ba Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 6 Sep 2020 17:20:26 -0500 Subject: [PATCH 46/83] Chats: display of non-image attachments --- app/soapbox/components/media_gallery.js | Bin 19345 -> 19395 bytes app/styles/chats.scss | 6 ++++++ 2 files changed, 6 insertions(+) diff --git a/app/soapbox/components/media_gallery.js b/app/soapbox/components/media_gallery.js index 845b68db2b03f31f5bdb3ac9966d87995220146f..3eda5779571ef754c512054a7e13af404f5ba7b6 100644 GIT binary patch delta 31 ncmbO@o$>H=#tr|Z7!xL66cS<9RjHo*kxz`NHevH0si_74#wZLN delta 18 acmX>+opIuH#tr|ZChy~K-@IL##{d9QeFyab diff --git a/app/styles/chats.scss b/app/styles/chats.scss index 1f47cd57f3..0d882fa023 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -351,6 +351,12 @@ display: none; } + .media-gallery__item:not(.media-gallery__item--image) { + max-width: 100%; + width: 120px !important; + height: 70px !important; + } + &__preview { background-color: transparent; } From 60402a74029e0c4527d84f0648ff8618174fc53a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 6 Sep 2020 17:43:16 -0500 Subject: [PATCH 47/83] Chats: add submit button, fixes #356 --- .../features/chats/components/chat_box.js | Bin 5365 -> 5720 bytes app/styles/chats.scss | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/app/soapbox/features/chats/components/chat_box.js b/app/soapbox/features/chats/components/chat_box.js index bde2f9dbf605009d77043cce5f670d680968e183..ee2b7cd200875dcb98f3026910bad88d48df9b89 100644 GIT binary patch delta 346 zcmeyWc|&KzO?Hmt#Ju3rq}TEcGd{*$0!12v3t;2NMA-liCO(lOhO6CTV6MC?RQcRd8%?VPt7;XCNjf zAY*TCWOFWaZ*65LV<0^~AY&=BAPJxdlMWMZ4lE#YWpib8MrmwiOJ#Ypd=rBKldTd_ IvmX^X0rt=#h5!Hn diff --git a/app/styles/chats.scss b/app/styles/chats.scss index 0d882fa023..49719a6387 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -236,6 +236,10 @@ margin: 0; } + .chat-box__send .icon-button { + top: 12px; + } + textarea { width: 100%; height: 100%; From 458bdef63355effb7092feb964568ab2f5e58ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1rbara=20de=20Castro=20Fernandes?= Date: Mon, 7 Sep 2020 15:39:44 -0300 Subject: [PATCH 48/83] Enable empty poll removal by deleting one of its options Previously, the user had to click on the "poll" icon at the bottom of the compose form in order to remove a poll. This commit changes how poll options behave so as to enable an empty poll to be removed through the deletion of either one of its options. This closes #317. --- .../features/compose/components/poll_form.js | Bin 7089 -> 7275 bytes .../compose/containers/poll_form_container.js | Bin 1339 -> 1404 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/compose/components/poll_form.js b/app/soapbox/features/compose/components/poll_form.js index efbaa3e190ea988c50d1e7a086cf947436a93a87..f0db95f4471d96dfd6fd09deffc236e7be082c90 100644 GIT binary patch delta 153 zcmdmJ{@P;0EB46->?~YCsk!-OsR8*pIg={EEF>F*8j; zqa-7|_t+n2~kmDii hIaiV2#b^55)G392^R4ARv=43>33r3CRT;WNC9@Vr*q( kJ$q?xWMz0DJUt*WeIRscbZljl@C+WaO%E0avx^qs1rK~0C;$Ke diff --git a/app/soapbox/features/compose/containers/poll_form_container.js b/app/soapbox/features/compose/containers/poll_form_container.js index dfb3a1af2495f19f42eb013b20cdfe5ceb6aa015..9e3cb3c43bdb26491b06c8b15873d599cae6001e 100644 GIT binary patch delta 49 ycmdnZ^@nT1QXU Date: Mon, 7 Sep 2020 16:07:05 -0500 Subject: [PATCH 49/83] Chats: fix #399 scrolling in FireFox --- .../chats/components/chat_message_list.js | Bin 5622 -> 6194 bytes app/soapbox/reducers/chat_message_lists.js | Bin 2103 -> 2103 bytes app/styles/chats.scss | 8 +------- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index 2ff4231436ea92348dc41860e557ec7458235be2..826f23b6bc915306d9a6a2c561c8249cf92ea07e 100644 GIT binary patch delta 709 zcmZWn&r2IY7{#QvnoW>Ka`E&D{>awtCW-}{R0Z+iK}uVjqlc;cZ8EUVEHe`eYV_2< zV9vc(yotg8z<=y*Ij@n_lmedZbI%c`8hMsrSTWY_YC?=6;NuEc=5m+j`Y{KUCHG zmUCQnV3vBb+jbger2=125z10K@Qnxvxs00S48FIJK@jyzSrd5R!7fTknkY>X|66mD zFyi(5x=g2O0m;52k0t3dt2PFQhtRi4_?Sg)^iwj+?6?$wK+_sX)pBvwasdFq^h5vv diff --git a/app/soapbox/reducers/chat_message_lists.js b/app/soapbox/reducers/chat_message_lists.js index b584dca7242f6b114f3888823fb86574689b992a..3e2d1dbae51179f75bcca422f9e5f9ab76204758 100644 GIT binary patch delta 37 scmdlkuw7t752J*xp*5F+LS~wRMxuh9LXxIJQEEwPQJ%u)C5)5V0L=0W82|tP delta 18 acmdlkuw7t7598!sMsY^n%}W?3vjG4=4+bLu diff --git a/app/styles/chats.scss b/app/styles/chats.scss index 49719a6387..c11f122f9b 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -99,18 +99,12 @@ .chat-messages { overflow-y: scroll; flex: 1; - display: flex; - flex-direction: column-reverse; } .chat-message { - padding: 7px 10px; + margin: 14px 10px; display: flex; - &:last-child { - padding-top: 14px; - } - &__bubble { font-size: 15px; padding: 4px 10px; From 54a772190d1402482bd1aac37ea6db387cd2a759 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 7 Sep 2020 16:10:45 -0500 Subject: [PATCH 50/83] Chats: fix send icon on light theme --- app/styles/chats.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/chats.scss b/app/styles/chats.scss index c11f122f9b..e524de2ab5 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -219,6 +219,7 @@ position: relative; .icon-button { + color: var(--primary-text-color--faint); position: absolute; right: 10px; top: 8px; From fb35417fe226cd82edeb6d09809aa433bf808089 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 7 Sep 2020 18:42:59 -0500 Subject: [PATCH 51/83] Chats: prevent repeat API calls --- .../chats/components/chat_message_list.js | Bin 6194 -> 6584 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index 826f23b6bc915306d9a6a2c561c8249cf92ea07e..48937518d076103118e2c7c3c3d6de7ce7299539 100644 GIT binary patch delta 440 zcmdmFu)}!632yhI)Z&u-qSWBzqWqkkfc)ajlFa-(1zQD;Vz7u)eo0AwuBL*mokBI2 z0uYpBWESh?Bo>!A=jRrbmZYXYbWU#N)ta2gD=&m8wRu1H4n}3H_Mlp_c`dI7lXY@_ zUU7*+wF0I=3bjCYf$X;iy9A~%v)Cs;F(orEU1u^6k9vKz0>tGZ`2{)(`DtmzsU;q% znduoNaP4||`6;Q$W+bC{1!xHtyKQZ45e6e`&Pz=!0@?-C1-3UT2gI>KwOLES$eIi6 l=*%<)4VVr!H3dbu;}yWXJYeuA=79VI=A$}nvyy-S2LS6MS*(|rpOUIqoLrQjlM|9( zpkSkb5Y10ZD^4x(NX<;oC{fT-Fj7!cQ&0p;7ndZKr0QiB`{XC4Wag!BULh#J0RZRB BB*Xv! From fdaa9f24ce7f2a5898e80f8a4df24ba2d21ded1a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 7 Sep 2020 18:51:57 -0500 Subject: [PATCH 52/83] Chats: fix position of action icons --- app/styles/chats.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/styles/chats.scss b/app/styles/chats.scss index e524de2ab5..d5cb4b3617 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -222,7 +222,7 @@ color: var(--primary-text-color--faint); position: absolute; right: 10px; - top: 8px; + top: calc(50% - 13px); width: auto; height: auto; background: transparent !important; @@ -232,7 +232,7 @@ } .chat-box__send .icon-button { - top: 12px; + top: calc(50% - 9px); } textarea { From 255419a6e99eee42472e627658b08b7b6d0f0bda Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 7 Sep 2020 19:13:59 -0500 Subject: [PATCH 53/83] Chats: display attachments in a shitty letterbox to support FireFox --- .../chats/components/chat_message_list.js | Bin 6584 -> 6659 bytes app/styles/chats.scss | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index 48937518d076103118e2c7c3c3d6de7ce7299539..1cfc41442974acae3050c9f5f950b2d86cc7160f 100644 GIT binary patch delta 83 zcmdmC+-$PprO;$fF=?Lo_}tW#%tUoNE(L|jkAzGoiwet3))$tX>?Uk9xlCAka=)Aiq6!L{wLmoxV59F;nwOH3I(fFF^yVkRS6Bfh0~q80 delta 65 zcmZoR*Wc diff --git a/app/styles/chats.scss b/app/styles/chats.scss index d5cb4b3617..29c2f0c4fb 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -342,8 +342,12 @@ } } +.chat-message__media { + height: 120px; +} + .chat-message .media-gallery { - height: auto !important; + height: 100% !important; margin: 4px 0 8px; .spoiler-button { @@ -353,7 +357,7 @@ .media-gallery__item:not(.media-gallery__item--image) { max-width: 100%; width: 120px !important; - height: 70px !important; + height: 100% !important; } &__preview { From 3631d6d61dd7891b568ae291e81e870a621d839e Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Sep 2020 14:35:04 -0500 Subject: [PATCH 54/83] Don't hijack scrollbar when status is unmounted, fixes #404 --- app/soapbox/components/status.js | Bin 18334 -> 18430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index f8d46b043371cbb0aa9c6c414466ddb5ca783ca7..8acb4e7f5770654e19021caa66595bb9a0b654b0 100644 GIT binary patch delta 150 zcmbQ&&-kyOaf7>vm%hG&n`eZttCd1fX`Vt!MrN@>a(+sxLVjLOr9yc|YMw%(LUBoA zNolbHP%0@kGcR2sB{e6tBsE2kO92S<^`X>cHxV-?ef`PRA{HQOlZYFL`YxglqGUzA XWPnzIK&_@VR0oIyWp1t#RWSkpj_@ez delta 58 zcmey@&p5B2af7?a Date: Wed, 9 Sep 2020 14:52:27 -0500 Subject: [PATCH 55/83] Highlight home tab for public timelines, fixes #406 --- .../features/ui/components/tabs_bar.js | Bin 6041 -> 6216 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js index e85efa40a2539bdd0cdfafd5a46071f87b42fc64..1440e2ae6885e5a9d74c94e1e0935b194b735112 100644 GIT binary patch delta 186 zcmbQKf5Kpc16zG&u}6Mxs$+6VW?8C&t%62wVo7p_jzUg;a$-qlex9a+t(`(OmjVzZ z=jRodC{!yHB$j04CFZ6o)B@GR)LDa-6s4Aw7UdyS*xK4EsOzgM)YQPm^omOoi%N>a xGfOfw)b&faGILXNGV@aP)ipPpvoSHrDr6Qz9AjHul95@ghwQ%E&6XSq`~a>FJ{SN1 delta 21 dcmX?MFjIen1KZ|HY(E(%?`P-Q{D~us9{^?(2(bVF From fd971f053feaaa5aee4f04587140a4520ff0a9b4 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Sep 2020 15:03:26 -0500 Subject: [PATCH 56/83] Scroll detailed status into view, fixes #257 --- app/soapbox/features/status/index.js | Bin 16616 -> 16596 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js index d82f8c7a115962cca48353a23b91e3533e9800d3..4f1fe608478ed542063ff3157ddcb8368a51fe53 100644 GIT binary patch delta 35 qcmaFS$atlZal{l+=>M%$(E|-QtqOlG0*z&COEA=Xe4B_6=SD delta 24 gcmcc8$oQg>al Date: Wed, 9 Sep 2020 18:02:26 -0500 Subject: [PATCH 57/83] UserLists: use OrderedSets instead of Lists, fixes #230 --- app/soapbox/features/blocks/index.js | Bin 2153 -> 2159 bytes app/soapbox/features/favourites/index.js | Bin 1943 -> 1949 bytes app/soapbox/features/follow_requests/index.js | Bin 2321 -> 2327 bytes app/soapbox/features/followers/index.js | Bin 4137 -> 4143 bytes app/soapbox/features/following/index.js | Bin 4142 -> 4148 bytes app/soapbox/features/groups/members/index.js | Bin 2192 -> 2198 bytes .../features/groups/removed_accounts/index.js | Bin 2836 -> 2842 bytes app/soapbox/features/mutes/index.js | Bin 2145 -> 2151 bytes app/soapbox/features/reblogs/index.js | Bin 2531 -> 2537 bytes app/soapbox/reducers/user_lists.js | Bin 4419 -> 4467 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/blocks/index.js b/app/soapbox/features/blocks/index.js index ef406e3befbda79341810059cc7e44ccc073ad49..5b34287ddc93511a1b7c3f8f36770f25f2fdc66b 100644 GIT binary patch delta 22 dcmaDU@Lpg;7Yk>8QA%o2YD#eG=3bUN%m8b;2><{9 delta 16 XcmaDa@KRty7YlPvX7T39EO(dzJaPuB diff --git a/app/soapbox/features/favourites/index.js b/app/soapbox/features/favourites/index.js index 6715d312151dafdcde23f5acbb36d07f60c44a97..851a4059acea598bbac1745e6b1526c19a2ba227 100644 GIT binary patch delta 22 ecmbQvKbL>QR%XupqLkF4)Rf@V%{!RyGXnr&m delta 16 XcmbOxI6-hj7z=YwX7T2D7IPK=Ez1P& diff --git a/app/soapbox/features/groups/removed_accounts/index.js b/app/soapbox/features/groups/removed_accounts/index.js index e32637e7ca46336da59770f00c4fb868f7cd5e50..02f87630dd9f86a459ee072c423b1804d7dfe19c 100644 GIT binary patch delta 22 dcmbOtHcMdp2k8I+ delta 16 XcmbOwHbrbh5-W2~X7T21*7d9aFo6Y> diff --git a/app/soapbox/features/mutes/index.js b/app/soapbox/features/mutes/index.js index 8b7368845ee67fd7dba0d080f1823c0feda68e20..abcfe2ea70154d4d3cecbf6789dd70f1f0baaf2f 100644 GIT binary patch delta 22 ecmaDT@LXWSJQmLUqLkF4)Rf@V%?nu$FarQ<)(HFn delta 16 YcmaDZ@K9jGJQn7h%;L?QA%o2YD#cwi9%wrf@f}SX-Q&IPAXh@a|F|VCT=*lL}RibpWJ3E z)^cV}xZvcAoEnqwa3o@ga7|X{=AB&6>5q`ve38?b3Bd(wHQa2$qriwJ)Wf@-834ix BIobdK delta 111 zcmeyYbXaMF3zLXXW^su^VzGi}Zf^9CcDBE!IaZcgQmR#={K?0i%c>=)$dw91q0{}`OB(nej From 1ace723c3e9e7843682f45a5aff415705890348c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Sep 2020 19:21:27 -0500 Subject: [PATCH 58/83] Hovercard: add react-popper --- package.json | 2 ++ yarn.lock | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/package.json b/package.json index e79c4356c4..1c160f1f3b 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "@babel/preset-react": "^7.0.0", "@babel/runtime": "^7.3.4", "@clusterws/cws": "^0.16.0", + "@popperjs/core": "^2.4.4", "array-includes": "^3.0.3", "autoprefixer": "^9.5.1", "axios": "^0.19.0", @@ -114,6 +115,7 @@ "react-motion": "^0.5.2", "react-notification": "^6.8.4", "react-overlays": "^0.8.3", + "react-popper": "^2.2.3", "react-redux": "^6.0.1", "react-redux-loading-bar": "^4.5.0", "react-router-dom": "^4.1.1", diff --git a/yarn.lock b/yarn.lock index 561257434e..9c95574c04 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1482,6 +1482,11 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@popperjs/core@^2.4.4": + version "2.4.4" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.4.tgz#11d5db19bd178936ec89cd84519c4de439574398" + integrity sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg== + "@sinonjs/commons@^1.7.0": version "1.8.0" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d" @@ -9488,6 +9493,11 @@ react-fast-compare@^2.0.4: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-2.0.4.tgz#e84b4d455b0fec113e0402c329352715196f81f9" integrity sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw== +react-fast-compare@^3.0.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" + integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== + react-helmet@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-6.0.0.tgz#fcb93ebaca3ba562a686eb2f1f9d46093d83b5f8" @@ -9615,6 +9625,14 @@ react-overlays@^0.8.3: react-transition-group "^2.2.0" warning "^3.0.0" +react-popper@^2.2.3: + version "2.2.3" + resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.3.tgz#33d425fa6975d4bd54d9acd64897a89d904b9d97" + integrity sha512-mOEiMNT1249js0jJvkrOjyHsGvqcJd3aGW/agkiMoZk3bZ1fXN1wQszIQSjHIai48fE67+zwF8Cs+C4fWqlfjw== + dependencies: + react-fast-compare "^3.0.1" + warning "^4.0.2" + react-redux-loading-bar@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-4.5.0.tgz#96538d0ba041463d810e213fb54eadbce9628266" @@ -11874,6 +11892,13 @@ warning@^4.0.1: dependencies: loose-envify "^1.0.0" +warning@^4.0.2: + version "4.0.3" + resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" + integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== + dependencies: + loose-envify "^1.0.0" + watchpack@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00" From 8c9206be3ee610dc77fd6e2e67ddecaba0b0ddc2 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Sep 2020 22:00:11 -0500 Subject: [PATCH 59/83] Use a better poll icon --- .../compose/components/poll_button.js | Bin 1338 -> 1342 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/compose/components/poll_button.js b/app/soapbox/features/compose/components/poll_button.js index 02495e9ca15d23da0b1c9e7cae421437ecdcd884..d774118cc97851b05fd6c05004dfe94ae7aaf107 100644 GIT binary patch delta 22 dcmdnRwU2AVJ!a0N#3J3~jKrdn&5xPG83ASn2#f## delta 18 ZcmdnTwTo-RJ!aOD#NzDY&Ci*`839O&2R;A* From 98a71b3e09fab9057fbcddb351bfc6d3ca50786e Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 10 Sep 2020 18:27:09 -0500 Subject: [PATCH 60/83] Upgrade redux and react-redux to the latest versions --- package.json | 4 ++-- yarn.lock | 39 +++++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index e79c4356c4..952300a2b9 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "react-motion": "^0.5.2", "react-notification": "^6.8.4", "react-overlays": "^0.8.3", - "react-redux": "^6.0.1", + "react-redux": "^7.2.1", "react-redux-loading-bar": "^4.5.0", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", @@ -124,7 +124,7 @@ "react-textarea-autosize": "^7.1.0", "react-toggle": "^4.0.1", "redis": "^2.7.1", - "redux": "^4.0.1", + "redux": "^4.0.5", "redux-immutable": "^4.0.0", "redux-thunk": "^2.2.0", "rellax": "^1.7.1", diff --git a/yarn.lock b/yarn.lock index 561257434e..86d6c1cd42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -978,7 +978,7 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.2": version "7.4.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12" integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ== @@ -992,6 +992,13 @@ dependencies: regenerator-runtime "^0.13.2" +"@babel/runtime@^7.5.5": + version "7.11.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" + integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/runtime@^7.7.2": version "7.7.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.2.tgz#111a78002a5c25fc8e3361bedc9529c696b85a6a" @@ -9563,12 +9570,12 @@ react-intl@^4.6.6: intl-messageformat-parser "^5.1.1" shallow-equal "^1.2.1" -react-is@^16.12.0, react-is@^16.8.6: +react-is@^16.12.0, react-is@^16.8.6, react-is@^16.9.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^16.3.2, react-is@^16.6.1, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.2: +react-is@^16.3.2, react-is@^16.6.1, react-is@^16.7.0, react-is@^16.8.1: version "16.8.6" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== @@ -9623,17 +9630,16 @@ react-redux-loading-bar@^4.5.0: prop-types "^15.6.2" react-lifecycles-compat "^3.0.2" -react-redux@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-6.0.1.tgz#0d423e2c1cb10ada87293d47e7de7c329623ba4d" - integrity sha512-T52I52Kxhbqy/6TEfBv85rQSDz6+Y28V/pf52vDWs1YRXG19mcFOGfHnY2HsNFHyhP+ST34Aih98fvt6tqwVcQ== +react-redux@^7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.1.tgz#8dedf784901014db2feca1ab633864dee68ad985" + integrity sha512-T+VfD/bvgGTUA74iW9d2i5THrDQWbweXP0AVNI8tNd1Rk5ch1rnMiJkDD67ejw7YBKM4+REvcvqRuWJb7BLuEg== dependencies: - "@babel/runtime" "^7.3.1" + "@babel/runtime" "^7.5.5" hoist-non-react-statics "^3.3.0" - invariant "^2.2.4" loose-envify "^1.4.0" prop-types "^15.7.2" - react-is "^16.8.2" + react-is "^16.9.0" react-router-dom@^4.1.1: version "4.3.1" @@ -9931,10 +9937,10 @@ redux-thunk@^2.2.0: resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622" integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw== -redux@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5" - integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg== +redux@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" + integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w== dependencies: loose-envify "^1.4.0" symbol-observable "^1.2.0" @@ -9966,6 +9972,11 @@ regenerator-runtime@^0.13.2: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447" integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA== +regenerator-runtime@^0.13.4: + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + regenerator-transform@^0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb" From 3cff9538e22cc599ec7704ff8341dd33031b1dcd Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 10 Sep 2020 18:43:57 -0500 Subject: [PATCH 61/83] Upgrade uglifyjs-webpack-plugin to latest version --- package.json | 2 +- webpack/production.js | Bin 3366 -> 3329 bytes yarn.lock | 44 ++++++++++++++---------------------------- 3 files changed, 16 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 952300a2b9..af64d30375 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "substring-trie": "^1.0.2", "throng": "^4.0.0", "tiny-queue": "^0.2.1", - "uglifyjs-webpack-plugin": "^2.1.2", + "uglifyjs-webpack-plugin": "^2.2.0", "uuid": "^3.1.0", "webpack": "^4.41.2", "webpack-assets-manifest": "^3.1.1", diff --git a/webpack/production.js b/webpack/production.js index a788e78843db87c963e8082eea379179f4f3683b..9ed66b40071ec6e949bf8c76a2f62c64e579a9eb 100644 GIT binary patch delta 28 jcmZ1`)hM;0ot3{lu_!MyFTL1GAuTbdICb-G)@*hFmh%c) delta 35 rcmZpaS|+ujos};+KewPLwYb Date: Thu, 10 Sep 2020 19:09:27 -0500 Subject: [PATCH 62/83] Hovercard: basic Redux+Popper prototype --- app/soapbox/actions/profile_hover_card.js | Bin 0 -> 199 bytes app/soapbox/components/profile_hover_card.js | Bin 0 -> 3105 bytes app/soapbox/components/status.js | Bin 18430 -> 18292 bytes app/soapbox/containers/status_container.js | Bin 6306 -> 6477 bytes app/soapbox/features/ui/index.js | Bin 22169 -> 22270 bytes app/soapbox/reducers/index.js | Bin 2576 -> 2653 bytes app/soapbox/reducers/profile_hover_card.js | Bin 0 -> 422 bytes app/styles/components/profile_hover_card.scss | 9 +++------ 8 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 app/soapbox/actions/profile_hover_card.js create mode 100644 app/soapbox/components/profile_hover_card.js create mode 100644 app/soapbox/reducers/profile_hover_card.js diff --git a/app/soapbox/actions/profile_hover_card.js b/app/soapbox/actions/profile_hover_card.js new file mode 100644 index 0000000000000000000000000000000000000000..7014858aee46f4eec60d6323a470090efccb6a3d GIT binary patch literal 199 zcmYeTD9A4=QAp0uD=tw82=aIH^l^>%@DFnhig$Jla*6j3aP?ELRZzzvrEbl|l?pK; ztu!yWBr`uxA-^CsFQ6ztEi)(8Bfl)Q$T_hnMWZM+O-CUyIXS;Huf#J&Q=ytmL7^zM kq_ijx%v4Y)sVqpf!sP-TplXo%GzbH34v1T8%~i_<02skNqW}N^ literal 0 HcmV?d00001 diff --git a/app/soapbox/components/profile_hover_card.js b/app/soapbox/components/profile_hover_card.js new file mode 100644 index 0000000000000000000000000000000000000000..c6319d38b9ee10fb31a5550251d4fb2dc12e5500 GIT binary patch literal 3105 zcmbtWO>g5i5WVMDOfQiPSaQ!v>>}Cjb`3N|knEm8AO zz}_TsIP>Psn;}`<3aR0dlC_>f51pc)tBRT*{Cv_xQ`kc#MGc8GM#=RBb7vl;Xus`R zs{D3~|Cu%mgN=3gL^(PX(z^VUsg~&V_Rwo4Y1zGv&(-87{fp|`^;&d|j@C+$b|v0s z%KJQs#hM=&XxV5!g)c(ZL~B~!Q>Dn}D2t4t(GYG~*PSLSPLFf4DQ7HfXC}v^6u&Df zA4o&Fry(G$DAApyYSyvYS|DW&Z8ZL&dC?mCA^h!HGtu02T8rjmUa$~&qFC7@gQFgp zx-DzgO!4DhlvEPr{e-+uGp=UDQ9EMrj+980D|Sd@1bt<;hhS??l=_F%Q2=(KF$;rH z4;95~KT=K%Vzp(hI>F%!I4VytLb2t=FIvHEpBo)jd z^#n{{zJUG$fKv@NN3;92977Lwy2@cboX5ndWq! z*s3HjTOgL;HWuguuIo_D;C{5=LqvB6VSJJ~^0REx=LDNiiYA#t!W8Pz{=7`y&&iwk zq{5#M`QXlnv?N8vH=dsBi#^g#-|T#GHNx(y7^h#wE0v#!EKL!5cx8%V>%l%2!daJL zQq0XL3Uk926Tq1~I~9E9w8rL|f}+}q#jm_zgfPa^rsLcwAsqJ1EDa1}2tL6eC?<391e^!e;HS* z$5QM#Rk*LUWH|M3=Ik90uHI>6X9@?JaBfT+|K=l4z{}L=;iO`BOrYN$iejs4eice# zRFEc((6pen_`xbh%VYwm@KEtea4!C%<=qa@fsYl%BS-Vk$R=19s~y(EiqfM>(Idc3 z$zCB2*m)m6Rhr-(WV$G`Ld?7ndpNV6WxltPt5KKjk$`I6ANR`Mk&GLb>)g?}hd$5q zf%dSxurN=6o&ix5*by|zI3AEx-&t3HmTn_o3Bjkh zB6 Ub;taj?2R#4cr~ZTStA+$1BlolB>(^b literal 0 HcmV?d00001 diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index 8acb4e7f5770654e19021caa66595bb9a0b654b0..d0d182b7d2fb4ad8998ef8b413670691b1880c93 100644 GIT binary patch delta 211 zcmey@&-kT}al=FA&2B789D@0I!5R7G0Y&*~nK`M>iA5=sFK~-(&ftj_j!e$aD=tx} zR=`lAqflIuSW;T7P^)08P?C{ZtXEK!Ur=n#r2qsNsx@FLKsNa0r=;pkUZ^ZR+25IU z^IQ4fj2y+OC1C3(?^l%I02%~Vw)uu)vgGD0YZ+FFqSQ3oYOonFl{u+FscE&FTOHz< KHZO3FV*vo4!cM;c delta 330 zcmey;$M~vN0^PI5Q~+s6fG1p(G=-Sg*Jwu_SeKg|!Cj=A90)OhF0?Sk2A!{Q`)>_zaNB_++5c&D)tLiYO^4><1;`?>0008pA=>}| delta 16 XcmcaBGC^d66Z_^$_61Cn^||x_G<5}D diff --git a/app/soapbox/reducers/profile_hover_card.js b/app/soapbox/reducers/profile_hover_card.js new file mode 100644 index 0000000000000000000000000000000000000000..9071426569cb759089677c47e6d2973e2f7b349a GIT binary patch literal 422 zcmZ{g!D_=W5Jd0(ioL~wkla&xD5*;fZ5>?bRcvI52yDqnt2QP0-z!^ks1H4Ac4zjD zRM#6zaD!7_y_By7J64}X%??lXGpkO;I}9ML>0spy_Gfe5Atz8BS_=jg Date: Thu, 10 Sep 2020 20:18:04 -0500 Subject: [PATCH 63/83] Hovercard: mouseout clears the card --- app/soapbox/actions/profile_hover_card.js | Bin 199 -> 364 bytes app/soapbox/components/status.js | Bin 18292 -> 18364 bytes app/soapbox/containers/status_container.js | Bin 6477 -> 6585 bytes .../status/components/detailed_status.js | Bin 7883 -> 7898 bytes app/soapbox/reducers/profile_hover_card.js | Bin 422 -> 513 bytes app/styles/components/profile_hover_card.scss | 1 - 6 files changed, 1 deletion(-) diff --git a/app/soapbox/actions/profile_hover_card.js b/app/soapbox/actions/profile_hover_card.js index 7014858aee46f4eec60d6323a470090efccb6a3d..83b81d984267790279b916f72daea01588501a73 100644 GIT binary patch delta 103 zcmX@k_=ahM(*y-YXCGI`AO%|m^?)FMH%}kecn|+D*PwW3#~_z@u-ruZ4t1{7ih}&2 z5{0zVyyTM1{5*x^oYcgkfTH}g%$!t@{Ib*{=ft8EjfrJCd|*8~TnY-c)?Bq*0MsZU AP5=M^ delta 9 QcmaFEbewU5)5Nw`02KHHB>(^b diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index d0d182b7d2fb4ad8998ef8b413670691b1880c93..e81ed9ccbec3cdf6c3a056af4116ab3aa516b44b 100644 GIT binary patch delta 105 zcmey;$GE4TaRVn0t4DrWYSCs+o&;eCb8@DZ?gvKA^x$QBgk h7ZmH|=Q-!3CKd%0<)>xlq=F4}PAp2>A)VzSA{ItxRRFC|!)FS7^q7)sVcydl^ViBgq<{QkXL?&O9 ukevKhTwwAs30+5^5qZwo6l-WIR09oCP)NxvE=Vj%&d|VWrpDx#5-9*Gyfq#G delta 60 zcmdmKeAZ~gA!ad!{DRcHfTH}g%$!t@{Ib*{=ft8Eh0R}>Pl<4Vm>NZ?X_Nno%S>J% O#4`D{gy!UU$tVEZE*Dn- diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js index d58bd7e72a886d8eaffb05d5d63b345d92ef1c3d..ca3a90b88baa0de6a783597953815df1ff15af25 100644 GIT binary patch delta 38 kcmX?Yd&_piDlS%!{Ib-d$*Z_lL0KW(_7K+Q$=nvg04~}NT>t<8 delta 20 ccmca*d)juxDz3@vxmHb%-aVkzVRzUp<3Pq_UrA2uPp1HZDC5cHnslJH?8j~9s)c`6bAy5DS delta 27 icmZo Date: Thu, 10 Sep 2020 22:08:17 -0500 Subject: [PATCH 64/83] Hovercard: clear when card is unhovered --- app/soapbox/components/profile_hover_card.js | Bin 3105 -> 3438 bytes app/soapbox/components/status.js | Bin 18364 -> 18283 bytes app/styles/components/profile_hover_card.scss | 6 ++++++ 3 files changed, 6 insertions(+) diff --git a/app/soapbox/components/profile_hover_card.js b/app/soapbox/components/profile_hover_card.js index c6319d38b9ee10fb31a5550251d4fb2dc12e5500..c62a364227a820a8a232a220120c485af971c103 100644 GIT binary patch delta 366 zcmZvX%}T>S6opB(qJ08!bzCKpNaHq=Zrms+xD-XpIGK=vBsa`Vix6hxEBFL`10ib> zd=j6)XD~l41@W%#&vy>@tPX#U-oHjyvZzQI)Zn>b>Q+%Ib8$&ap)Qz8V38^+;A&#k zGrde1Hy74X!AK*Ih?mggN&6)E^cU{#kF8dff!yQb;S(Ne8e-<6F>>G zP$k;qFasOJ`}Y^m_s?6IZSHr+j)UfD{OaUEZv_;T$W#iYBRq8GU6rg55nM`BEsPti zw^a2BqP4IC2clJ;o`qq6@NvW1p|SnKHs5=9P5>&m!Q%RF)NM{Xo4g$#oHWV)$IdTE C3w5Oc delta 38 ucmaDSwNPTiA*RiI%<~v0i?aUTEXLNzxS5$Ff|1FNYjPmB*5-|zdzk?P@(euy diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index e81ed9ccbec3cdf6c3a056af4116ab3aa516b44b..275603bcc445c1ac56299d4f41a14cae5d167295 100644 GIT binary patch delta 19 bcmdnf&-l8Jaf1r~W@rBGf}3>|C#V4cPm2dF delta 79 zcmaFe$GE4Taf1rKw1PrGQGQxxPO5WaQA${5ab{9Zs+B@oVoq`DW(EG;f|Iw13Q6Ns MqENf}n!;2y0FJ61c>n+a diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss index ded79b5f52..47a5242a21 100644 --- a/app/styles/components/profile_hover_card.scss +++ b/app/styles/components/profile_hover_card.scss @@ -125,3 +125,9 @@ display: block; } } + +/* Hide the popper when the reference is hidden */ +#popper[data-popper-reference-hidden] { + visibility: hidden; + pointer-events: none; +} From 73dd125094950da59c1cf89548734c5c5c4589ca Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2020 09:30:48 -0500 Subject: [PATCH 65/83] Run yarn manage:translations --- app/soapbox/locales/ar.json | 6 +++ app/soapbox/locales/ast.json | 6 +++ app/soapbox/locales/bg.json | 6 +++ app/soapbox/locales/bn.json | 6 +++ app/soapbox/locales/br.json | 6 +++ app/soapbox/locales/ca.json | 6 +++ app/soapbox/locales/co.json | 6 +++ app/soapbox/locales/cs.json | 6 +++ app/soapbox/locales/cy.json | 6 +++ app/soapbox/locales/da.json | 6 +++ app/soapbox/locales/de.json | 6 +++ app/soapbox/locales/defaultMessages.json | 68 +++++++++++++++++++++--- app/soapbox/locales/el.json | 6 +++ app/soapbox/locales/en.json | 6 +++ app/soapbox/locales/eo.json | 6 +++ app/soapbox/locales/es-AR.json | 6 +++ app/soapbox/locales/es.json | 6 +++ app/soapbox/locales/et.json | 6 +++ app/soapbox/locales/eu.json | 6 +++ app/soapbox/locales/fa.json | 6 +++ app/soapbox/locales/fi.json | 6 +++ app/soapbox/locales/fr.json | 6 +++ app/soapbox/locales/ga.json | 6 +++ app/soapbox/locales/gl.json | 6 +++ app/soapbox/locales/he.json | 6 +++ app/soapbox/locales/hi.json | 6 +++ app/soapbox/locales/hr.json | 6 +++ app/soapbox/locales/hu.json | 6 +++ app/soapbox/locales/hy.json | 6 +++ app/soapbox/locales/id.json | 6 +++ app/soapbox/locales/io.json | 6 +++ app/soapbox/locales/it.json | 6 +++ app/soapbox/locales/ja.json | 6 +++ app/soapbox/locales/ka.json | 6 +++ app/soapbox/locales/kk.json | 6 +++ app/soapbox/locales/ko.json | 6 +++ app/soapbox/locales/lt.json | 6 +++ app/soapbox/locales/lv.json | 6 +++ app/soapbox/locales/mk.json | 6 +++ app/soapbox/locales/ms.json | 6 +++ app/soapbox/locales/nl.json | 6 +++ app/soapbox/locales/nn.json | 6 +++ app/soapbox/locales/no.json | 6 +++ app/soapbox/locales/oc.json | 6 +++ app/soapbox/locales/pl.json | 6 +++ app/soapbox/locales/pt-BR.json | 6 +++ app/soapbox/locales/pt.json | 6 +++ app/soapbox/locales/ro.json | 6 +++ app/soapbox/locales/ru.json | 6 +++ app/soapbox/locales/sk.json | 6 +++ app/soapbox/locales/sl.json | 6 +++ app/soapbox/locales/sq.json | 6 +++ app/soapbox/locales/sr-Latn.json | 6 +++ app/soapbox/locales/sr.json | 6 +++ app/soapbox/locales/sv.json | 6 +++ app/soapbox/locales/ta.json | 6 +++ app/soapbox/locales/te.json | 6 +++ app/soapbox/locales/th.json | 6 +++ app/soapbox/locales/tr.json | 6 +++ app/soapbox/locales/uk.json | 6 +++ app/soapbox/locales/zh-CN.json | 6 +++ app/soapbox/locales/zh-HK.json | 6 +++ app/soapbox/locales/zh-TW.json | 6 +++ 63 files changed, 432 insertions(+), 8 deletions(-) diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json index a9197b3e65..c85ec31608 100644 --- a/app/soapbox/locales/ar.json +++ b/app/soapbox/locales/ar.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "أغلق", "bundle_modal_error.message": "لقد وقع هناك خطأ أثناء عملية تحميل هذا العنصر.", "bundle_modal_error.retry": "إعادة المحاولة", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "الحسابات المحجوبة", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "الخيط العام المحلي", "column.direct": "الرسائل المباشرة", "column.domain_blocks": "النطاقات المخفية", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "الخيط العام الموحد", "navigation_bar.security": "الأمان", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "أُعجِب {name} بمنشورك", "notification.follow": "{name} يتابعك", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "إلغاء الاقتراح", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "الرئيسية", "tabs_bar.news": "News", "tabs_bar.notifications": "الإخطارات", diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json index f6bc1596f3..136587af99 100644 --- a/app/soapbox/locales/ast.json +++ b/app/soapbox/locales/ast.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Usuarios bloquiaos", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Llinia temporal llocal", "column.direct": "Mensaxes direutos", "column.domain_blocks": "Dominios anubríos", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Llinia temporal federada", "navigation_bar.security": "Seguranza", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} siguióte", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Aniciu", "tabs_bar.news": "News", "tabs_bar.notifications": "Avisos", diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json index ce6fe01393..0384c7b00e 100644 --- a/app/soapbox/locales/bg.json +++ b/app/soapbox/locales/bg.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blocked users", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Local timeline", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Публичен канал", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} хареса твоята публикация", "notification.follow": "{name} те последва", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Начало", "tabs_bar.news": "News", "tabs_bar.notifications": "Известия", diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json index aeb4b0ce0e..00f2fbec47 100644 --- a/app/soapbox/locales/bn.json +++ b/app/soapbox/locales/bn.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "বন্ধ করুন", "bundle_modal_error.message": "এই অংশটি দেখাতে যেয়ে কোনো সমস্যা হয়েছে।", "bundle_modal_error.retry": "আবার চেষ্টা করুন", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "যাদের বন্ধ করে রাখা হয়েছে", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "স্থানীয় সময়সারি", "column.direct": "সরাসরি লেখা", "column.domain_blocks": "সরিয়ে ফেলা ওয়েবসাইট", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "যুক্তবিশ্বের সময়রেখা", "navigation_bar.security": "নিরাপত্তা", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} আপনার কার্যক্রম পছন্দ করেছেন", "notification.follow": "{name} আপনাকে অনুসরণ করেছেন", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "সাহায্যের পরামর্শগুলো সরাতে", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "বাড়ি", "tabs_bar.news": "News", "tabs_bar.notifications": "প্রজ্ঞাপনগুলো", diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json index ab77116433..729a0ef8e8 100644 --- a/app/soapbox/locales/br.json +++ b/app/soapbox/locales/br.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Serriñ", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Klask endro", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Implijour·ezed·ion stanket", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Red-amzer lec'hel", "column.direct": "Kemennadoù prevez", "column.domain_blocks": "Domani kuzhet", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Home", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json index 04418cbda0..b4cee2c229 100644 --- a/app/soapbox/locales/ca.json +++ b/app/soapbox/locales/ca.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Tanca", "bundle_modal_error.message": "S'ha produït un error en carregar aquest component.", "bundle_modal_error.retry": "Torna-ho a provar", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Usuaris bloquejats", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Línia de temps local", "column.direct": "Missatges directes", "column.domain_blocks": "Dominis ocults", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Línia de temps federada", "navigation_bar.security": "Seguretat", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} ha afavorit el teu estat", "notification.follow": "{name} et segueix", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Descartar suggeriment", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Inici", "tabs_bar.news": "News", "tabs_bar.notifications": "Notificacions", diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json index 7964707b51..10ab6a6861 100644 --- a/app/soapbox/locales/co.json +++ b/app/soapbox/locales/co.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Chjudà", "bundle_modal_error.message": "C'hè statu un prublemu caricandu st'elementu.", "bundle_modal_error.retry": "Pruvà torna", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Utilizatori bluccati", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Linea pubblica lucale", "column.direct": "Missaghji diretti", "column.domain_blocks": "Duminii piattati", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Linea pubblica glubale", "navigation_bar.security": "Sicurità", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} hà aghjuntu u vostru statutu à i so favuriti", "notification.follow": "{name} v'hà seguitatu", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Righjittà a pruposta", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Accolta", "tabs_bar.news": "News", "tabs_bar.notifications": "Nutificazione", diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json index 7e2497e65c..b5bcbad8ee 100644 --- a/app/soapbox/locales/cs.json +++ b/app/soapbox/locales/cs.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Zavřít", "bundle_modal_error.message": "Při načítání tohoto komponentu se něco pokazilo.", "bundle_modal_error.retry": "Zkusit znovu", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokovaní uživatelé", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Místní zeď", "column.direct": "Přímé zprávy", "column.domain_blocks": "Skryté domény", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federovaná zeď", "navigation_bar.security": "Zabezpečení", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reagoval/a na Váš příspěvek", "notification.favourite": "{name} si oblíbil/a váš příspěvek", "notification.follow": "{name} vás začal/a sledovat", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Odmítnout návrh", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Domů", "tabs_bar.news": "Zprávy", "tabs_bar.notifications": "Oznámení", diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json index f4facc78fb..1fa6120451 100644 --- a/app/soapbox/locales/cy.json +++ b/app/soapbox/locales/cy.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Cau", "bundle_modal_error.message": "Aeth rhywbeth o'i le tra'n llwytho'r elfen hon.", "bundle_modal_error.retry": "Ceiswich eto", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Defnyddwyr a flociwyd", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Ffrwd lleol", "column.direct": "Negeseuon preifat", "column.domain_blocks": "Parthau cuddiedig", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Ffrwd y ffederasiwn", "navigation_bar.security": "Diogelwch", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "hoffodd {name} eich tŵt", "notification.follow": "dilynodd {name} chi", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Diswyddo", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Hafan", "tabs_bar.news": "News", "tabs_bar.notifications": "Hysbysiadau", diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json index d987da07c1..b6b45f71af 100644 --- a/app/soapbox/locales/da.json +++ b/app/soapbox/locales/da.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Luk", "bundle_modal_error.message": "Noget gik galt under indlæsningen af dette komponent.", "bundle_modal_error.retry": "Prøv igen", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokerede brugere", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokal tidslinje", "column.direct": "Direkte beskeder", "column.domain_blocks": "Skjulte domæner", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Fælles tidslinje", "navigation_bar.security": "Sikkerhed", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favoriserede din status", "notification.follow": "{name} fulgte dig", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Afvis foreslag", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Hjem", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifikationer", diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json index 3ba21b017d..d895ee5c1e 100644 --- a/app/soapbox/locales/de.json +++ b/app/soapbox/locales/de.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Schließen", "bundle_modal_error.message": "Etwas ist beim Laden schiefgelaufen.", "bundle_modal_error.retry": "Erneut versuchen", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blockierte Profile", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokale Zeitleiste", "column.direct": "Direktnachrichten", "column.domain_blocks": "Versteckte Domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Föderierte Zeitleiste", "navigation_bar.security": "Sicherheit", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} hat auf deinen Beitrag reagiert", "notification.favourite": "{name} hat deinen Beitrag favorisiert", "notification.follow": "{name} folgt dir", @@ -548,6 +553,7 @@ "status_list.queue_label": "{count, plural, one {Ein neuer Beitrag} other {# neue Beiträge}}. Hier klicken, um {count, plural, one {ihn} other {sie}} anzuzeigen.", "suggestions.dismiss": "Empfehlung ausblenden", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Startseite", "tabs_bar.news": "News", "tabs_bar.notifications": "Benachrichtigungen", diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json index 9e5729e589..5b313cd409 100644 --- a/app/soapbox/locales/defaultMessages.json +++ b/app/soapbox/locales/defaultMessages.json @@ -262,6 +262,15 @@ ], "path": "app/soapbox/components/poll.json" }, + { + "descriptors": [ + { + "defaultMessage": "Follows you", + "id": "account.follows_you" + } + ], + "path": "app/soapbox/components/profile_hover_card.json" + }, { "descriptors": [ { @@ -321,10 +330,6 @@ "defaultMessage": "Profile", "id": "account.profile" }, - { - "defaultMessage": "Messages", - "id": "navigation_bar.messages" - }, { "defaultMessage": "Preferences", "id": "navigation_bar.preferences" @@ -990,6 +995,41 @@ ], "path": "app/soapbox/features/bookmarks/index.json" }, + { + "descriptors": [ + { + "defaultMessage": "Send a message…", + "id": "chat_box.input.placeholder" + } + ], + "path": "app/soapbox/features/chats/components/chat_box.json" + }, + { + "descriptors": [ + { + "defaultMessage": "Chats", + "id": "chat_panels.main_window.title" + }, + { + "defaultMessage": "No chats found. To start a chat, visit a user's profile.", + "id": "chat_panels.main_window.empty" + } + ], + "path": "app/soapbox/features/chats/components/chat_panes.json" + }, + { + "descriptors": [ + { + "defaultMessage": "Chats", + "id": "column.chats" + }, + { + "defaultMessage": "No chats found. To start a chat, visit a user's profile.", + "id": "chat_panels.main_window.empty" + } + ], + "path": "app/soapbox/features/chats/index.json" + }, { "descriptors": [ { @@ -2343,6 +2383,10 @@ "defaultMessage": "{name} followed you", "id": "notification.follow" }, + { + "defaultMessage": "{name} sent you a message", + "id": "notification.chat_mention" + }, { "defaultMessage": "{name} reacted to your post", "id": "notification.emoji_react" @@ -2972,6 +3016,14 @@ { "defaultMessage": "Copy link to post", "id": "status.copy" + }, + { + "defaultMessage": "Bookmark", + "id": "status.bookmark" + }, + { + "defaultMessage": "Remove bookmark", + "id": "status.unbookmark" } ], "path": "app/soapbox/features/status/components/action_bar.json" @@ -3175,10 +3227,6 @@ "defaultMessage": "Edit Profile", "id": "account.edit_profile" }, - { - "defaultMessage": "Messages", - "id": "navigation_bar.messages" - }, { "defaultMessage": "Preferences", "id": "navigation_bar.preferences" @@ -3496,6 +3544,10 @@ "defaultMessage": "Notifications", "id": "tabs_bar.notifications" }, + { + "defaultMessage": "Chats", + "id": "tabs_bar.chats" + }, { "defaultMessage": "Reports", "id": "tabs_bar.reports" diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json index 02489b85bc..3fc83e00fc 100644 --- a/app/soapbox/locales/el.json +++ b/app/soapbox/locales/el.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Κλείσιμο", "bundle_modal_error.message": "Κάτι πήγε στραβά κατά τη φόρτωση του στοιχείου.", "bundle_modal_error.retry": "Δοκίμασε ξανά", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Αποκλεισμένοι χρήστες", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Τοπική ροή", "column.direct": "Προσωπικά μηνύματα", "column.domain_blocks": "Κρυμμένοι τομείς", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Ομοσπονδιακή ροή", "navigation_bar.security": "Ασφάλεια", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "Ο/Η {name} σημείωσε ως αγαπημένη την κατάστασή σου", "notification.follow": "Ο/Η {name} σε ακολούθησε", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Απόρριψη πρότασης", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Αρχική", "tabs_bar.news": "News", "tabs_bar.notifications": "Ειδοποιήσεις", diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 942946e24d..7003f9bfec 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blocked users", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Local timeline", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} liked your post", "notification.follow": "{name} followed you", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Home", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json index 38898e4918..7357fb6b9d 100644 --- a/app/soapbox/locales/eo.json +++ b/app/soapbox/locales/eo.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Fermi", "bundle_modal_error.message": "Io misfunkciis en la ŝargado de ĉi tiu elemento.", "bundle_modal_error.retry": "Bonvolu reprovi", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokitaj uzantoj", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Loka tempolinio", "column.direct": "Rektaj mesaĝoj", "column.domain_blocks": "Kaŝitaj domajnoj", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Fratara tempolinio", "navigation_bar.security": "Sekureco", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} stelumis vian mesaĝon", "notification.follow": "{name} eksekvis vin", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Forigi la proponon", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Hejmo", "tabs_bar.news": "News", "tabs_bar.notifications": "Sciigoj", diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json index 71f3ceae47..c0c832026c 100644 --- a/app/soapbox/locales/es-AR.json +++ b/app/soapbox/locales/es-AR.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Cerrar", "bundle_modal_error.message": "Algo salió mal al cargar este componente.", "bundle_modal_error.retry": "Intentá de nuevo", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Usuarios bloqueados", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Línea temporal local", "column.direct": "Mensajes directos", "column.domain_blocks": "Dominios ocultos", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Línea temporal federada", "navigation_bar.security": "Seguridad", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Descartar sugerencia", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Principal", "tabs_bar.news": "News", "tabs_bar.notifications": "Notificaciones", diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json index 66030293c5..15580f2ab5 100644 --- a/app/soapbox/locales/es.json +++ b/app/soapbox/locales/es.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Cerrar", "bundle_modal_error.message": "Algo salió mal al cargar este componente.", "bundle_modal_error.retry": "Inténtalo de nuevo", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Usuarios bloqueados", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Línea de tiempo local", "column.direct": "Mensajes directos", "column.domain_blocks": "Dominios ocultados", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Historia federada", "navigation_bar.security": "Seguridad", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Descartar sugerencia", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Inicio", "tabs_bar.news": "News", "tabs_bar.notifications": "Notificaciones", diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json index 4bae774a1c..507523b163 100644 --- a/app/soapbox/locales/et.json +++ b/app/soapbox/locales/et.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Sulge", "bundle_modal_error.message": "Selle komponendi laadimisel läks midagi viltu.", "bundle_modal_error.retry": "Proovi uuesti", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokeeritud kasutajad", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Kohalik ajajoon", "column.direct": "Otsesõnumid", "column.domain_blocks": "Peidetud domeenid", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Föderatiivne ajajoon", "navigation_bar.security": "Turvalisus", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} märkis su staatuse lemmikuks", "notification.follow": "{name} jälgib sind", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Eira soovitust", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Kodu", "tabs_bar.news": "News", "tabs_bar.notifications": "Teated", diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json index 6d6d140ad8..f0955c485c 100644 --- a/app/soapbox/locales/eu.json +++ b/app/soapbox/locales/eu.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Itxi", "bundle_modal_error.message": "Zerbait okerra gertatu da osagai hau kargatzean.", "bundle_modal_error.retry": "Saiatu berriro", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokeatutako erabiltzaileak", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Denbora-lerro lokala", "column.direct": "Mezu zuzenak", "column.domain_blocks": "Ezkutatutako domeinuak", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federatutako denbora-lerroa", "navigation_bar.security": "Segurtasuna", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name}(e)k zure mezua gogoko du", "notification.follow": "{name}(e)k jarraitzen zaitu", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Errefusatu proposamena", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Hasiera", "tabs_bar.news": "News", "tabs_bar.notifications": "Jakinarazpenak", diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json index 54adf472af..fdd256dc0e 100644 --- a/app/soapbox/locales/fa.json +++ b/app/soapbox/locales/fa.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "بستن", "bundle_modal_error.message": "هنگام بازکردن این بخش خطایی رخ داد.", "bundle_modal_error.retry": "تلاش دوباره", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "کاربران مسدودشده", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "نوشته‌های محلی", "column.direct": "پیغام‌های خصوصی", "column.domain_blocks": "دامین‌های پنهان‌شده", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "نوشته‌های همه‌جا", "navigation_bar.security": "امنیت", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "‫{name}‬ نوشتهٔ شما را پسندید", "notification.follow": "‫{name}‬ پیگیر شما شد", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "پیشنهاد را نادیده بگیر", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "خانه", "tabs_bar.news": "News", "tabs_bar.notifications": "اعلان‌ها", diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json index 35dbe109ee..2ddaebaaca 100644 --- a/app/soapbox/locales/fi.json +++ b/app/soapbox/locales/fi.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Sulje", "bundle_modal_error.message": "Jokin meni vikaan komponenttia ladattaessa.", "bundle_modal_error.retry": "Yritä uudestaan", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Estetyt käyttäjät", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Paikallinen aikajana", "column.direct": "Viestit", "column.domain_blocks": "Piilotetut verkkotunnukset", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Yleinen aikajana", "navigation_bar.security": "Tunnukset", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} tykkäsi tilastasi", "notification.follow": "{name} seurasi sinua", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Koti", "tabs_bar.news": "News", "tabs_bar.notifications": "Ilmoitukset", diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json index f895897624..667e783ad6 100644 --- a/app/soapbox/locales/fr.json +++ b/app/soapbox/locales/fr.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Fermer", "bundle_modal_error.message": "Une erreur s’est produite lors du chargement de ce composant.", "bundle_modal_error.retry": "Réessayer", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Comptes bloqués", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Fil public local", "column.direct": "Messages privés", "column.domain_blocks": "Domaines cachés", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Fil public global", "navigation_bar.security": "Sécurité", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} a ajouté à ses favoris :", "notification.follow": "{name} vous suit", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Rejeter la suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Accueil", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json index 0658beb2b1..ad44ad1b21 100644 --- a/app/soapbox/locales/ga.json +++ b/app/soapbox/locales/ga.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blocked users", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Local timeline", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Home", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json index 34f094347c..54ea946563 100644 --- a/app/soapbox/locales/gl.json +++ b/app/soapbox/locales/gl.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Pechar", "bundle_modal_error.message": "Algo fallou mentras se cargaba este compoñente.", "bundle_modal_error.retry": "Inténteo de novo", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Usuarias bloqueadas", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Liña temporal local", "column.direct": "Mensaxes directas", "column.domain_blocks": "Dominios agochados", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Liña temporal federada", "navigation_bar.security": "Seguridade", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} marcou como favorito o seu estado", "notification.follow": "{name} está a seguila", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Rexeitar suxestión", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Inicio", "tabs_bar.news": "News", "tabs_bar.notifications": "Notificacións", diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json index 35fa639351..53be2e329b 100644 --- a/app/soapbox/locales/he.json +++ b/app/soapbox/locales/he.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "לסגור", "bundle_modal_error.message": "משהו השתבש בעת טעינת הרכיב הזה.", "bundle_modal_error.retry": "לנסות שוב", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "חסימות", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "ציר זמן מקומי", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "ציר זמן בין-קהילתי", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "חצרוצך חובב על ידי {name}", "notification.follow": "{name} במעקב אחרייך", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "בבית", "tabs_bar.news": "News", "tabs_bar.notifications": "התראות", diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json index 6adeb0ca16..6f8664e23d 100644 --- a/app/soapbox/locales/hi.json +++ b/app/soapbox/locales/hi.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blocked users", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Local timeline", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Home", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json index 613df0464d..1e8098c47d 100644 --- a/app/soapbox/locales/hr.json +++ b/app/soapbox/locales/hr.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokirani korisnici", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokalni timeline", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federalni timeline", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} je lajkao tvoj status", "notification.follow": "{name} te sada slijedi", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Dom", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifikacije", diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json index af94f8ab0f..4eea27c3f3 100644 --- a/app/soapbox/locales/hu.json +++ b/app/soapbox/locales/hu.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Bezárás", "bundle_modal_error.message": "Hiba történt a komponens betöltésekor.", "bundle_modal_error.retry": "Próbáld újra", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Letiltott felhasználók", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Helyi idővonal", "column.direct": "Közvetlen üzenetek", "column.domain_blocks": "Rejtett domainek", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Föderációs idővonal", "navigation_bar.security": "Biztonság", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} kedvencnek jelölte egy tülködet", "notification.follow": "{name} követ téged", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Javaslat elvetése", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Saját", "tabs_bar.news": "News", "tabs_bar.notifications": "Értesítések", diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json index 6f48b6383a..858304ff58 100644 --- a/app/soapbox/locales/hy.json +++ b/app/soapbox/locales/hy.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Փակել", "bundle_modal_error.message": "Այս բաղադրիչը բեռնելու ընթացքում ինչ֊որ բան խափանվեց։", "bundle_modal_error.retry": "Կրկին փորձել", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Արգելափակված օգտատերեր", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Տեղական հոսք", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Դաշնային հոսք", "navigation_bar.security": "Անվտանգություն", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} հավանեց թութդ", "notification.follow": "{name} սկսեց հետեւել քեզ", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Հիմնական", "tabs_bar.news": "News", "tabs_bar.notifications": "Ծանուցումներ", diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json index f1ba626d17..947b2a1fda 100644 --- a/app/soapbox/locales/id.json +++ b/app/soapbox/locales/id.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Tutup", "bundle_modal_error.message": "Kesalahan terjadi saat memuat komponen ini.", "bundle_modal_error.retry": "Coba lagi", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Pengguna diblokir", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Linimasa Lokal", "column.direct": "Pesan langsung", "column.domain_blocks": "Topik tersembunyi", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Linimasa gabungan", "navigation_bar.security": "Keamanan", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} menyukai status anda", "notification.follow": "{name} mengikuti anda", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Beranda", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifikasi", diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json index 1e3844f330..be6a481fd1 100644 --- a/app/soapbox/locales/io.json +++ b/app/soapbox/locales/io.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokusita uzeri", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokala tempolineo", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federata tempolineo", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favorizis tua mesajo", "notification.follow": "{name} sequeskis tu", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Hemo", "tabs_bar.news": "News", "tabs_bar.notifications": "Savigi", diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json index 392270aabc..ed983f92f2 100644 --- a/app/soapbox/locales/it.json +++ b/app/soapbox/locales/it.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Chiudi", "bundle_modal_error.message": "C'è stato un errore mentre questo componente veniva caricato.", "bundle_modal_error.retry": "Riprova", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Utenti bloccati", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Timeline locale", "column.direct": "Messaggi diretti", "column.domain_blocks": "Domini nascosti", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Timeline federata", "navigation_bar.security": "Sicurezza", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} ha apprezzato il tuo post", "notification.follow": "{name} ha iniziato a seguirti", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Elimina suggerimento", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Home", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifiche", diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json index 0d404e7645..a81eae9bed 100644 --- a/app/soapbox/locales/ja.json +++ b/app/soapbox/locales/ja.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "閉じる", "bundle_modal_error.message": "コンポーネントの読み込み中に問題が発生しました。", "bundle_modal_error.retry": "再試行", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "ブロックしたユーザー", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "ローカルタイムライン", "column.direct": "ダイレクトメッセージ", "column.domain_blocks": "非表示にしたドメイン", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "連合タイムライン", "navigation_bar.security": "セキュリティ", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name}さんがあなたのトゥートをお気に入りに登録しました", "notification.follow": "{name}さんにフォローされました", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "隠す", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "ホーム", "tabs_bar.news": "News", "tabs_bar.notifications": "通知", diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json index c1acdba065..0f402aa18b 100644 --- a/app/soapbox/locales/ka.json +++ b/app/soapbox/locales/ka.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "დახურვა", "bundle_modal_error.message": "ამ კომპონენტის ჩატვირთვისას რაღაც აირია.", "bundle_modal_error.retry": "სცადეთ კიდევ ერთხელ", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "დაბლოკილი მომხმარებლები", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "ლოკალური თაიმლაინი", "column.direct": "პირდაპირი წერილები", "column.domain_blocks": "დამალული დომენები", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "ფედერალური თაიმლაინი", "navigation_bar.security": "უსაფრთხოება", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name}-მა თქვენი სტატუსი აქცია ფავორიტად", "notification.follow": "{name} გამოგყვათ", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "სახლი", "tabs_bar.news": "News", "tabs_bar.notifications": "შეტყობინებები", diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json index a5e4e73b10..0f13a01a29 100644 --- a/app/soapbox/locales/kk.json +++ b/app/soapbox/locales/kk.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Жабу", "bundle_modal_error.message": "Бұл компонентті жүктеген кезде бір қате пайда болды.", "bundle_modal_error.retry": "Қайтадан көріңіз", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Бұғатталғандар", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Жергілікті желі", "column.direct": "Жеке хаттар", "column.domain_blocks": "Жасырылған домендер", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Жаһандық желі", "navigation_bar.security": "Қауіпсіздік", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} жазбаңызды таңдаулыға қосты", "notification.follow": "{name} сізге жазылды", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Өткізіп жіберу", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Басты бет", "tabs_bar.news": "News", "tabs_bar.notifications": "Ескертпелер", diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json index a33bb9bf6a..05c42aef11 100644 --- a/app/soapbox/locales/ko.json +++ b/app/soapbox/locales/ko.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "닫기", "bundle_modal_error.message": "컴포넌트를 불러오는 과정에서 문제가 발생했습니다.", "bundle_modal_error.retry": "다시 시도", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "차단 중인 사용자", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "로컬 타임라인", "column.direct": "다이렉트 메시지", "column.domain_blocks": "숨겨진 도메인", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "연합 타임라인", "navigation_bar.security": "보안", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name}님이 즐겨찾기 했습니다", "notification.follow": "{name}님이 나를 팔로우 했습니다", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "추천 지우기", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "홈", "tabs_bar.news": "News", "tabs_bar.notifications": "알림", diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json index fda05193ac..5d11fc863a 100644 --- a/app/soapbox/locales/lt.json +++ b/app/soapbox/locales/lt.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blocked users", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Local timeline", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Home", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json index 2e09b2cc8b..3ec93b2b0d 100644 --- a/app/soapbox/locales/lv.json +++ b/app/soapbox/locales/lv.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Aizvērt", "bundle_modal_error.message": "Kaut kas nogāja greizi ielādējot šo komponenti.", "bundle_modal_error.retry": "Mēģini vēlreiz", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Bloķētie lietotāji", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokālā laika līnija", "column.direct": "Privātās ziņas", "column.domain_blocks": "Paslēptie domēni", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Home", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json index b87a648e9a..f7fabd82ee 100644 --- a/app/soapbox/locales/mk.json +++ b/app/soapbox/locales/mk.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Затвори", "bundle_modal_error.message": "Настана грешка при прикажувањето на оваа веб-страница.", "bundle_modal_error.retry": "Обидете се повторно", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Блокирани корисници", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Local timeline", "column.direct": "Директна порака", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Дома", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json index 1d2a357b03..665e3785e1 100644 --- a/app/soapbox/locales/ms.json +++ b/app/soapbox/locales/ms.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Close", "bundle_modal_error.message": "Something went wrong while loading this component.", "bundle_modal_error.retry": "Try again", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blocked users", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Local timeline", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favorited your post", "notification.follow": "{name} followed you", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Home", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json index f0dadd79cd..e42ba41552 100644 --- a/app/soapbox/locales/nl.json +++ b/app/soapbox/locales/nl.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Sluiten", "bundle_modal_error.message": "Tijdens het laden van dit onderdeel is er iets fout gegaan.", "bundle_modal_error.retry": "Opnieuw proberen", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Geblokkeerde gebruikers", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokale tijdlijn", "column.direct": "Directe berichten", "column.domain_blocks": "Genegeerde servers", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Globale tijdlijn", "navigation_bar.security": "Beveiliging", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} voegde jouw toot als favoriet toe", "notification.follow": "{name} volgt jou nu", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Voorstel verwerpen", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Start", "tabs_bar.news": "News", "tabs_bar.notifications": "Meldingen", diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json index 373886f748..501bd9f0ac 100644 --- a/app/soapbox/locales/nn.json +++ b/app/soapbox/locales/nn.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Lukk", "bundle_modal_error.message": "Noko gikk gale mens komponent var i ferd med å bli nedlasta.", "bundle_modal_error.retry": "Prøv igjen", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokka brukare", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokal samtid", "column.direct": "Direkte meldingar", "column.domain_blocks": "Gøymte domener", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federert tidslinje", "navigation_bar.security": "Sikkerheit", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} likte din status", "notification.follow": "{name} fulgte deg", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Heim", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json index 7e8b7f89d2..775f00bb21 100644 --- a/app/soapbox/locales/no.json +++ b/app/soapbox/locales/no.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Lukk", "bundle_modal_error.message": "Noe gikk galt da denne komponenten lastet.", "bundle_modal_error.retry": "Prøv igjen", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokkerte brukere", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokal tidslinje", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Felles tidslinje", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} likte din status", "notification.follow": "{name} fulgte deg", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Hjem", "tabs_bar.news": "News", "tabs_bar.notifications": "Varslinger", diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json index c2de76af71..8b7056395b 100644 --- a/app/soapbox/locales/oc.json +++ b/app/soapbox/locales/oc.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Tampar", "bundle_modal_error.message": "Quicòm a fach mèuca pendent lo cargament d’aqueste compausant.", "bundle_modal_error.retry": "Tornar ensajar", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Personas blocadas", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Flux public local", "column.direct": "Messatges dirèctes", "column.domain_blocks": "Domenis resconduts", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Flux public global", "navigation_bar.security": "Seguretat", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} a ajustat a sos favorits", "notification.follow": "{name} vos sèc", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Regetar la suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Acuèlh", "tabs_bar.news": "News", "tabs_bar.notifications": "Notificacions", diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index a1899bc8e1..9b09236df7 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Zamknij", "bundle_modal_error.message": "Coś poszło nie tak podczas ładowania tego składnika.", "bundle_modal_error.retry": "Spróbuj ponownie", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Zablokowani użytkownicy", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokalna oś czasu", "column.direct": "Wiadomości bezpośrednie", "column.domain_blocks": "Ukryte domeny", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Globalna oś czasu", "navigation_bar.security": "Bezpieczeństwo", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} dodał(a) Twój wpis do ulubionych", "notification.follow": "{name} zaczął(-ęła) Cię śledzić", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Odrzuć sugestię", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Strona główna", "tabs_bar.news": "News", "tabs_bar.notifications": "Powiadomienia", diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json index 1146ff8fc2..cdafe104f4 100644 --- a/app/soapbox/locales/pt-BR.json +++ b/app/soapbox/locales/pt-BR.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Fechar", "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.", "bundle_modal_error.retry": "Tente novamente", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Usuários bloqueados", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Local", "column.direct": "Mensagens diretas", "column.domain_blocks": "Domínios escondidos", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Global", "navigation_bar.security": "Segurança", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} adicionou a sua postagem aos favoritos", "notification.follow": "{name} te seguiu", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Ignorar a sugestão", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Página inicial", "tabs_bar.news": "News", "tabs_bar.notifications": "Notificações", diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json index f68d6e8128..461e962f69 100644 --- a/app/soapbox/locales/pt.json +++ b/app/soapbox/locales/pt.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Fechar", "bundle_modal_error.message": "Algo de errado aconteceu enquanto este componente era carregado.", "bundle_modal_error.retry": "Tente de novo", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Utilizadores Bloqueados", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Cronologia local", "column.direct": "Mensagens directas", "column.domain_blocks": "Domínios escondidos", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Cronologia federada", "navigation_bar.security": "Segurança", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} adicionou o teu estado aos favoritos", "notification.follow": "{name} começou a seguir-te", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dispensar a sugestão", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Início", "tabs_bar.news": "News", "tabs_bar.notifications": "Notificações", diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json index 4e4c42d983..44d0a648c3 100644 --- a/app/soapbox/locales/ro.json +++ b/app/soapbox/locales/ro.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Închide", "bundle_modal_error.message": "Ceva nu a funcționat în timupul încărcării acestui component.", "bundle_modal_error.retry": "Încearcă din nou", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Utilizatori blocați", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Fluxul Local", "column.direct": "Mesaje directe", "column.domain_blocks": "Domenii ascunse", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Flux global", "navigation_bar.security": "Securitate", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} a adăugat statusul tău la favorite", "notification.follow": "{name} te urmărește", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Omite sugestia", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Acasă", "tabs_bar.news": "News", "tabs_bar.notifications": "Notificări", diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json index b21d7c53ec..72e08f475d 100644 --- a/app/soapbox/locales/ru.json +++ b/app/soapbox/locales/ru.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Закрыть", "bundle_modal_error.message": "Что-то пошло не так при загрузке этого компонента.", "bundle_modal_error.retry": "Попробовать снова", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Список блокировки", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Локальная лента", "column.direct": "Личные сообщения", "column.domain_blocks": "Скрытые домены", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Глобальная лента", "navigation_bar.security": "Безопасность", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} понравился Ваш статус", "notification.follow": "{name} подписался (-лась) на вас", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Удалить предложение", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Главная", "tabs_bar.news": "News", "tabs_bar.notifications": "Уведомления", diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json index fada6510e9..0b89323534 100644 --- a/app/soapbox/locales/sk.json +++ b/app/soapbox/locales/sk.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Zatvor", "bundle_modal_error.message": "Nastala chyba pri načítaní tohto komponentu.", "bundle_modal_error.retry": "Skúsiť znova", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokovaní užívatelia", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Miestna časová os", "column.direct": "Súkromné správy", "column.domain_blocks": "Skryté domény", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federovaná časová os", "navigation_bar.security": "Zabezbečenie", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} si obľúbil/a tvoj príspevok", "notification.follow": "{name} ťa začal/a následovať", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Zavrhni návrh", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Domovská", "tabs_bar.news": "News", "tabs_bar.notifications": "Oboznámenia", diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json index 581ab2aa9f..b7f1e1c1f1 100644 --- a/app/soapbox/locales/sl.json +++ b/app/soapbox/locales/sl.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Zapri", "bundle_modal_error.message": "Med nalaganjem te komponente je prišlo do napake.", "bundle_modal_error.retry": "Poskusi ponovno", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokirani uporabniki", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokalna časovnica", "column.direct": "Neposredna sporočila", "column.domain_blocks": "Skrite domene", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Združena časovnica", "navigation_bar.security": "Varnost", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} je vzljubil/a vaš status", "notification.follow": "{name} vam sledi", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Zavrni predlog", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Domov", "tabs_bar.news": "News", "tabs_bar.notifications": "Obvestila", diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json index 076506d560..2843e032de 100644 --- a/app/soapbox/locales/sq.json +++ b/app/soapbox/locales/sq.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Mbylle", "bundle_modal_error.message": "Diç shkoi ters teksa ngarkohej ky përbërës.", "bundle_modal_error.retry": "Riprovoni", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Përdorues të bllokuar", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Rrjedhë kohore vendore", "column.direct": "Mesazhe të drejtpërdrejta", "column.domain_blocks": "Përkatësi të fshehura", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Rrjedhë kohore të federuarish", "navigation_bar.security": "Siguri", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} parapëlqeu gjendjen tuaj", "notification.follow": "{name} zuri t’ju ndjekë", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Mos e merr parasysh sugjerimin", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Kreu", "tabs_bar.news": "News", "tabs_bar.notifications": "Njoftime", diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json index 19c3822581..0f597a79f7 100644 --- a/app/soapbox/locales/sr-Latn.json +++ b/app/soapbox/locales/sr-Latn.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Zatvori", "bundle_modal_error.message": "Nešto nije bilo u redu pri učitavanju ove komponente.", "bundle_modal_error.retry": "Pokušajte ponovo", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blokirani korisnici", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokalna lajna", "column.direct": "Direct messages", "column.domain_blocks": "Hidden domains", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federisana lajna", "navigation_bar.security": "Security", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} je stavio Vaš status kao omiljeni", "notification.follow": "{name} Vas je zapratio", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Početna", "tabs_bar.news": "News", "tabs_bar.notifications": "Obaveštenja", diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json index 638352b209..a2a01a9ee8 100644 --- a/app/soapbox/locales/sr.json +++ b/app/soapbox/locales/sr.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Затвори", "bundle_modal_error.message": "Нешто није било у реду при учитавању ове компоненте.", "bundle_modal_error.retry": "Покушајте поново", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Блокирани корисници", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Локална временска линија", "column.direct": "Директне поруке", "column.domain_blocks": "Скривени домени", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Здружена временска линија", "navigation_bar.security": "Безбедност", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} је ставио/ла Ваш статус као омиљени", "notification.follow": "{name} Вас је запратио/ла", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Почетна", "tabs_bar.news": "News", "tabs_bar.notifications": "Обавештења", diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json index 88992aee8f..165e8c2f52 100644 --- a/app/soapbox/locales/sv.json +++ b/app/soapbox/locales/sv.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Stäng", "bundle_modal_error.message": "Något gick fel när denna komponent laddades.", "bundle_modal_error.retry": "Försök igen", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Blockerade användare", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Lokal tidslinje", "column.direct": "Direktmeddelanden", "column.domain_blocks": "Dolda domäner", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Förenad tidslinje", "navigation_bar.security": "Säkerhet", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} favoriserade din status", "notification.follow": "{name} följer dig", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Hem", "tabs_bar.news": "News", "tabs_bar.notifications": "Meddelanden", diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json index fbdadedda0..eecb76d69d 100644 --- a/app/soapbox/locales/ta.json +++ b/app/soapbox/locales/ta.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "நெருக்கமாக", "bundle_modal_error.message": "இந்த கூறுகளை ஏற்றும்போது ஏதோ தவறு ஏற்பட்டது.", "bundle_modal_error.retry": "மீண்டும் முயற்சி செய்", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "தடுக்கப்பட்ட பயனர்கள்", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "உள்ளூர் காலக்கெடு", "column.direct": "நேரடி செய்திகள்", "column.domain_blocks": "மறைந்த களங்கள்", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "கூட்டாட்சி காலக்கெடு", "navigation_bar.security": "பத்திரம்", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} ஆர்வம் கொண்டவர், உங்கள் நிலை", "notification.follow": "{name} நீங்கள் தொடர்ந்து வந்தீர்கள்", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "பரிந்துரை விலக்க", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Home", "tabs_bar.news": "News", "tabs_bar.notifications": "Notifications", diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json index 6c175dbd27..ba2a3c7904 100644 --- a/app/soapbox/locales/te.json +++ b/app/soapbox/locales/te.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "మూసివేయు", "bundle_modal_error.message": "ఈ భాగం లోడ్ అవుతున్నప్పుడు ఏదో తప్పు జరిగింది.", "bundle_modal_error.retry": "మళ్ళీ ప్రయత్నించండి", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "బ్లాక్ చేయబడిన వినియోగదారులు", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "స్థానిక కాలక్రమం", "column.direct": "ప్రత్యక్ష సందేశాలు", "column.domain_blocks": "దాచిన డొమైన్లు", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "సమాఖ్య కాలక్రమం", "navigation_bar.security": "భద్రత", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} మీ స్టేటస్ ను ఇష్టపడ్డారు", "notification.follow": "{name} మిమ్మల్ని అనుసరిస్తున్నారు", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "సూచనను రద్దు చేయి", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "హోమ్", "tabs_bar.news": "News", "tabs_bar.notifications": "ప్రకటనలు", diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json index 9bb15172f7..183d954ac6 100644 --- a/app/soapbox/locales/th.json +++ b/app/soapbox/locales/th.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "ปิด", "bundle_modal_error.message": "มีบางอย่างผิดพลาดขณะโหลดส่วนประกอบนี้", "bundle_modal_error.retry": "ลองอีกครั้ง", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "ผู้ใช้ที่ปิดกั้นอยู่", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "เส้นเวลาในเว็บ", "column.direct": "ข้อความโดยตรง", "column.domain_blocks": "โดเมนที่ซ่อนอยู่", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "เส้นเวลาที่ติดต่อกับภายนอก", "navigation_bar.security": "ความปลอดภัย", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} ได้ชื่นชอบสถานะของคุณ", "notification.follow": "{name} ได้ติดตามคุณ", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "ยกเลิกข้อเสนอแนะ", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "หน้าแรก", "tabs_bar.news": "News", "tabs_bar.notifications": "การแจ้งเตือน", diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json index 992a7852f5..0a45724b4a 100644 --- a/app/soapbox/locales/tr.json +++ b/app/soapbox/locales/tr.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Kapat", "bundle_modal_error.message": "Bu bileşen yüklenirken bir şeyler ters gitti.", "bundle_modal_error.retry": "Tekrar deneyin", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Engellenen kullanıcılar", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Yerel zaman tüneli", "column.direct": "Doğrudan mesajlar", "column.domain_blocks": "Gizli alan adları", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Federe zaman tüneli", "navigation_bar.security": "Güvenlik", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} senin durumunu favorilere ekledi", "notification.follow": "{name} seni takip ediyor", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Öneriyi görmezden gel", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Ana sayfa", "tabs_bar.news": "News", "tabs_bar.notifications": "Bildirimler", diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json index 38807b37cd..63d8cc17bf 100644 --- a/app/soapbox/locales/uk.json +++ b/app/soapbox/locales/uk.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "Закрити", "bundle_modal_error.message": "Щось пішло не так під час завантаження компоненту.", "bundle_modal_error.retry": "Спробувати ще раз", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "Заблоковані користувачі", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "Локальна стрічка", "column.direct": "Прямі повідомлення", "column.domain_blocks": "Приховані домени", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "Глобальна стрічка", "navigation_bar.security": "Безпека", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} вподобав(-ла) ваш допис", "notification.follow": "{name} підписався(-лась) на Вас", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Відхилити пропозицію", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "Головна", "tabs_bar.news": "News", "tabs_bar.notifications": "Сповіщення", diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json index 42c00054e4..ef6dbd06b0 100644 --- a/app/soapbox/locales/zh-CN.json +++ b/app/soapbox/locales/zh-CN.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "关闭", "bundle_modal_error.message": "载入这个组件时发生了错误。", "bundle_modal_error.retry": "重试", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "已屏蔽的用户", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "本站时间轴", "column.direct": "私信", "column.domain_blocks": "已屏蔽的网站", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "跨站公共时间轴", "navigation_bar.security": "安全", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} 收藏了你的嘟文", "notification.follow": "{name} 开始关注你", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "关闭建议", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "主页", "tabs_bar.news": "News", "tabs_bar.notifications": "通知", diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json index 4d38dde107..cb7e54d308 100644 --- a/app/soapbox/locales/zh-HK.json +++ b/app/soapbox/locales/zh-HK.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "關閉", "bundle_modal_error.message": "加載本組件出錯。", "bundle_modal_error.retry": "重試", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "封鎖用戶", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "本站時間軸", "column.direct": "個人訊息", "column.domain_blocks": "隱藏的服務站", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "跨站時間軸", "navigation_bar.security": "安全", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} 收藏了你的文章", "notification.follow": "{name} 開始關注你", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "Dismiss suggestion", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "主頁", "tabs_bar.news": "News", "tabs_bar.notifications": "通知", diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json index c9dc9b50a5..8a345beaa4 100644 --- a/app/soapbox/locales/zh-TW.json +++ b/app/soapbox/locales/zh-TW.json @@ -60,8 +60,12 @@ "bundle_modal_error.close": "關閉", "bundle_modal_error.message": "載入此元件時發生錯誤。", "bundle_modal_error.retry": "重試", + "chat_box.input.placeholder": "Send a message…", + "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", + "chat_panels.main_window.title": "Chats", "column.blocks": "封鎖的使用者", "column.bookmarks": "Bookmarks", + "column.chats": "Chats", "column.community": "本機時間軸", "column.direct": "私訊", "column.domain_blocks": "隱藏的網域", @@ -343,6 +347,7 @@ "navigation_bar.public_timeline": "聯邦時間軸", "navigation_bar.security": "安全性", "navigation_bar.soapbox_config": "Soapbox config", + "notification.chat_mention": "{name} sent you a message", "notification.emoji_react": "{name} reacted to your post", "notification.favourite": "{name} 把你的嘟文加入了最愛", "notification.follow": "{name} 關注了你", @@ -548,6 +553,7 @@ "status_list.queue_label": "Click to see {count} new {count, plural, one {post} other {posts}}", "suggestions.dismiss": "關閉建議", "tabs_bar.apps": "Apps", + "tabs_bar.chats": "Chats", "tabs_bar.home": "主頁", "tabs_bar.news": "News", "tabs_bar.notifications": "通知", From 9692c7539a9492538544a552612b35549c01a137 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2020 10:05:52 -0500 Subject: [PATCH 66/83] Hovercard: appear and disappear properly --- app/soapbox/actions/profile_hover_card.js | Bin 364 -> 557 bytes app/soapbox/components/profile_hover_card.js | Bin 3438 -> 3619 bytes app/soapbox/containers/status_container.js | Bin 6585 -> 6608 bytes app/soapbox/reducers/profile_hover_card.js | Bin 513 -> 702 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/actions/profile_hover_card.js b/app/soapbox/actions/profile_hover_card.js index 83b81d984267790279b916f72daea01588501a73..90543148d9d60f00f9703ce07cc43842b079bf16 100644 GIT binary patch delta 171 zcmaFEw3cN;l5%K(i(`nZf~|sjK#;$ir;lsAhkuxBP`tBakV`y7a-zK|yMHiP%|w4u zW*~E7^GvqVf|SIP)X9pBw$2b`I$R10wbop@`hf}t;3C{NmJrqWrYXoK%neveY8y#G(`(phRgwN@58XnavNG?l7{t z=9Q!tO+Lh8zy?t_`8$i;YHC$oC+4v TNXaZNNGwUt(A*rwDZ&B(UfDV_ delta 71 zcmZ21^G<5RDJF4+u6c40La!6K`%c`|D> K%Vr5KZWaLG%o*hX diff --git a/app/soapbox/containers/status_container.js b/app/soapbox/containers/status_container.js index 015256169d472fe7c058fcb5839690378474c898..fb976a82d040ec79caecdcfa8dd7b94bc79b8a43 100644 GIT binary patch delta 76 zcmdmKe8G6beP-tT;?&KLm_tO(i&INNGILY&OG`8~G!<;^6jCya3ld9`Gc=NOfQkZ& f^3yVNQa$p^Qj44ui&8W+HFXq>4GboSNhSjTR$?0l delta 53 zcmca$ywiBYeP-s=#G=iQm_tMrQZkDR5=)XZG?H_GVgW_@X_+~x9{FXdMb3#uDH@uS Hb0w1jL2nd! diff --git a/app/soapbox/reducers/profile_hover_card.js b/app/soapbox/reducers/profile_hover_card.js index 09e3a92fc5c5d2c6b9a62a0a9d10c9da2c93f5c5..5776a3e87a0d998b72de9d0cfbef849f27c3df8a 100644 GIT binary patch delta 189 zcmZo<*~dD;TERcqRfkJKAt1=#&C|y<-oro4H7MTMF~}u8G{D6%#C4-x9it9}X$4fL zpiq=rQd*R!P+XE&lB!pnTB4zzkzbZtl$xThqfk;*nmTztqkIg|REX-#GzATa(sX2{ vnhLhIwqWH7YHA9KiOD6I`FVP2`9;a8nqXT{?Xd=nrREf;0vVGJGui4&n%UJcXk&C8BdfCykTp4xQEKuGCN%(j+z3bj From 1d90950e59c51ffc06067daca18c81ca1848e6f0 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2020 11:37:05 -0500 Subject: [PATCH 67/83] Hovercard: refactor with HoverRefWrapper --- app/soapbox/components/hover_ref_wrapper.js | Bin 0 -> 1244 bytes app/soapbox/components/profile_hover_card.js | Bin 3619 -> 3630 bytes app/soapbox/components/status.js | Bin 18283 -> 17813 bytes app/soapbox/containers/status_container.js | Bin 6608 -> 6306 bytes app/styles/components/profile_hover_card.scss | 1 - 5 files changed, 1 deletion(-) create mode 100644 app/soapbox/components/hover_ref_wrapper.js diff --git a/app/soapbox/components/hover_ref_wrapper.js b/app/soapbox/components/hover_ref_wrapper.js new file mode 100644 index 0000000000000000000000000000000000000000..64d62ba5c754a96cc030abb87cc60227971f1d42 GIT binary patch literal 1244 zcmah}O>f&U487-9aHq(ClXTl{se9Q5Y`{7UMS&gzMWSZ`j$}x3(!t1oAN64;O;a?7 zz$PF09>1)1ov|JskPBbJ0KLNptl?y{&}DZ=?+YIcC(JMd zFdb^b)~dxHW{>tOx3VO=XpO_yj*-n7-fhkEia3?gZbj)sicJ%8Yy>4aqX|;KDc5l? znwNSP7G?i@4wbkyy%sp(S|hn@&LPU(n=O$|kWq|sn_ct}dL~Gg2iKUxWff4t$ikS+ zx=OHEm%xP}djC@vP~Aaj&j!6iuLSR!pBcHH}sSxG+fIT?+rEKyY^^_{(V-9 zzPB21Q~{uBU?0ZP*+FS(4ojsq+9xG_Qxv2%{H|5}Hs6|}jwJe;+F!``B;cfW>d9+$ z*I1W=(;!<$t%$_5!8pC|wT literal 0 HcmV?d00001 diff --git a/app/soapbox/components/profile_hover_card.js b/app/soapbox/components/profile_hover_card.js index ae3f8bc3a285ce41f039b8717b4cb2d891dbf128..b545b87bcde1c71a463155bb40bdec8354f52d7e 100644 GIT binary patch delta 23 ecmZ21vrcA%DLa>rf_idkQBi7M$z~Jw_iO-L6$jY> delta 12 TcmZ1{vsh+>Df?yz_IGRm9#sTn diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index 275603bcc445c1ac56299d4f41a14cae5d167295..e52dfdc5cb0c21bc5a582c55c90f2c741063ac7b 100644 GIT binary patch delta 199 zcmaFe$2hf{al>Qg$&M`ABAK}b`9&oP9{FXdMM0@);YEoB1(O?@g(t@|a|&jFMB|H6 z)8flP;;BWOGg)p+ZGNC2z_?jM$zM(iMO$i-LSk}qeraBbXNv7)Lu+aF%oO!l&04$3 z_v|$%_c?G(=64XCEZ}G~*}-wraZ%FL7r0Q-x^OAeWw}5?8u+DTsSFPLrwuGt6RU?m73Id*)yvq)x*q1(b&IEe8{SmgQ z*eAjT`)`9%h+2r?p3OKO)kL_U*NC@_@en3_#7qUjNCsDFws zEvnoB^vxluSA?zY%}ssQ7oTu9plPF8g#KA$9vCY>IT;HLopO-$g4FmH^8J7kk+wd}cu*)T#&b@ke3d-J_Rb?ksw`+OTudb-a>ZSUsF2wKl-o)U1_h9@RZRP61 diff --git a/app/soapbox/containers/status_container.js b/app/soapbox/containers/status_container.js index fb976a82d040ec79caecdcfa8dd7b94bc79b8a43..02dc76c21e6badea6002ff3f314af8cf78a67a31 100644 GIT binary patch delta 16 Xcmca$yvT6FF6PaOEPW!A%Os-!J0k`< delta 272 zcmZ2vc)@tXF6NZX+=Bd~5`}6m1%>>A)VzSA{ItxRRFC|!)FS7^q7)sVcydmDaVn-n ztwLH+ey)OgaeiV!QhtSgVsc4leqOPD0mO*-43HV|$v{IkZ)ct;q7JkmFE}H=9Ni?1 zqSQ1Ug~a6K{L;J<&y>maLZTwr)J#4nE*a{albTqBA*%^?zk)(>YDq|DZfbsMiH3%z gf~}oGN@j6EVo7p_239|4Xlm*x7#kQ&wwFi-0E+-&m;e9( diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss index 47a5242a21..e899989012 100644 --- a/app/styles/components/profile_hover_card.scss +++ b/app/styles/components/profile_hover_card.scss @@ -17,7 +17,6 @@ z-index: 200; top: 0; left: 0; - margin-bottom: 10px; &--visible { opacity: 1; From 24bf880e0b5d952dda5613dc70fd22bf050539c2 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2020 11:42:02 -0500 Subject: [PATCH 68/83] Hovercard: refactor detailed status --- .../status/components/detailed_status.js | Bin 7898 -> 7218 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js index ca3a90b88baa0de6a783597953815df1ff15af25..e323873a313e30bbf5537b95aa0c339cb7b29667 100644 GIT binary patch delta 190 zcmca*yUAihCG%tx7G1H-+=Bd~5(SU^vecrW)U@!T#Dap=c2a~o;KG6+=+5%m+>i%pUU~1eRYK?= znB86ZA7&wT@5X=O!nNohaO1~I($?w(@vZXSxjE_QkBhW0TJd?(48#U&@#Gbql!*GEb0AF_&4Z6fOMb=&ncD z7&4P&RB-)YuX&7+($6d3ZkDBChUhI_XNfJoTCPQJc7alRy9XlfiHX9~Sflik+}OpC z(p6dBOIcYCP|t4BLuZ@b+cxc2@6uK08XY)~2%S?pcWnCL?9wNvW3V$iukM+*>zz`| zwOT&vY}~~;*_>InMcra=3GBv8m=-JLCI1>7)M_QWl0vidhgQ0AJ8AlSy7*DObLki3 C4=-^5 From 72659f27c14b422e1351bc326055dd169bab8fcb Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2020 12:17:32 -0500 Subject: [PATCH 69/83] Hovercard: attach to each element for better positioning --- app/soapbox/components/display_name.js | Bin 1575 -> 1735 bytes app/soapbox/components/hover_ref_wrapper.js | Bin 1244 -> 1374 bytes app/soapbox/components/profile_hover_card.js | Bin 3630 -> 3522 bytes app/soapbox/components/status.js | Bin 17813 -> 17812 bytes .../status/components/detailed_status.js | Bin 7218 -> 7301 bytes app/styles/components/profile_hover_card.scss | 12 ------------ 6 files changed, 12 deletions(-) diff --git a/app/soapbox/components/display_name.js b/app/soapbox/components/display_name.js index 7ab8b9e6072f12a1d7325bc66186128269b1a336..7d848a90284bb00b73c53ac1b0956f5e84b3685f 100644 GIT binary patch delta 163 zcmZ3^bDVdB5Tj#eZb5!giGoLdS!z*GYFc?fVSG_)T6{S~>1KY$Q!JJ?=msPvC+C;um3XGuRzsP3>8T|e>X|9(nzag< cc{!PRsdiin3X?Cg$_d%%qiMIB{EXER0EC-73;+NC delta 20 ccmX@kyPRi(5aZ@B#^WrL#@1v7_^LS|l0W?t%K3ub3q1%>4Nyy6lC*PPT`1zV_$g1v%zaY169x`LI0 zdP-)Qx-}PiFu9-k5DSu?TCA6p zpP!?{RSVSbkzbZt6qK44UX)l+kXoddlA4xSno|N&S`4(f8fYrSSyl>Zi8;lSx3Z`M E09PbAJOBUy delta 48 zcmcb|b%%3<1@mMFW@iyD1%;y2lG36)1q~omLBS>^vuyGK=0nUNx{W1evK6Ze0Bv** A_5c6? diff --git a/app/soapbox/components/profile_hover_card.js b/app/soapbox/components/profile_hover_card.js index b545b87bcde1c71a463155bb40bdec8354f52d7e..8d234aa4ba6cd9e02f443dde45761dda1c989646 100644 GIT binary patch delta 12 TcmZ1{b4YrFF30AX98*~VAOr+^ delta 140 zcmX>ky-sF>E=RqNLN%8H5ai~kWTs`N78P45L_tQ>_%#^V8CbQ%lr!!0Hqf z@(W5b^Yeh}V9J0(U==`}x`qY@Itm7{FtxQ1MlD#NR@0gbXhvq5f`(#Za&mrYUWw*r I2aYCI0A)8M8vpCUe;vPwueun`~{LGWm#|(B#wh>XSd%vrPW$APJ^* u9c3ry+Hp;mapa$DYo9l{N10=Cy@TT9MGoPUe*@LnItc?Y`{qDL7Zw1j>msNC delta 99 zcmV-p0G$7nivg930kDZalkPrElaE0dlb}8tlm9&$lhQsLlP^GS5N2#|VRUJ3XDw`L zZfhqXFOwlY6qB_-Ba=Kr6O%7K2a`ZQUz3qQHIu|ZS(6(<83j6r>hS-Y6zAd7YT>xu1*N8i7bO-Hq!w)slrUid0Di(O?EnA( diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss index e899989012..b3fb4fc312 100644 --- a/app/styles/components/profile_hover_card.scss +++ b/app/styles/components/profile_hover_card.scss @@ -113,18 +113,6 @@ } } -/* Prevent floating avatars from intercepting with current card */ -.status, -.detailed-status { - .floating-link { - display: none; - } - - &:hover .floating-link { - display: block; - } -} - /* Hide the popper when the reference is hidden */ #popper[data-popper-reference-hidden] { visibility: hidden; From 9ac6f3aaabe05df9654c51e12553a5d18d65675d Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2020 12:24:43 -0500 Subject: [PATCH 70/83] Restore old border-radius behavior, fixes #266 --- app/styles/application.scss | 1 - app/styles/chats.scss | 1 - app/styles/components/columns.scss | 1 - app/styles/components/detailed-status.scss | 1 - app/styles/components/drawer.scss | 2 +- app/styles/loading.scss | 1 - app/styles/overflow_hacks.scss | 37 ---------------------- 7 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 app/styles/overflow_hacks.scss diff --git a/app/styles/application.scss b/app/styles/application.scss index 96eb4dcf4a..fdce329ad3 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -27,7 +27,6 @@ @import 'dyslexic'; @import 'demetricator'; @import 'pro'; -@import 'overflow_hacks'; @import 'chats'; // COMPONENTS diff --git a/app/styles/chats.scss b/app/styles/chats.scss index 29c2f0c4fb..3e2fc2e244 100644 --- a/app/styles/chats.scss +++ b/app/styles/chats.scss @@ -322,7 +322,6 @@ display: flex; align-items: center; background: var(--accent-color--faint); - border-radius: 10px 10px 0 0; .column-back-button { background: transparent; diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss index d8034e4974..10e46e441d 100644 --- a/app/styles/components/columns.scss +++ b/app/styles/components/columns.scss @@ -212,7 +212,6 @@ font-size: 16px; line-height: inherit; border: 0; - border-radius: 10px 10px 0 0; text-align: unset; padding: 15px; margin: 0; diff --git a/app/styles/components/detailed-status.scss b/app/styles/components/detailed-status.scss index d53b426ee3..ceab5899c1 100644 --- a/app/styles/components/detailed-status.scss +++ b/app/styles/components/detailed-status.scss @@ -62,7 +62,6 @@ border-bottom: 1px solid var(--brand-color--faint); display: flex; flex-direction: row; - border-radius: 0 0 10px 10px; } .detailed-status__link { diff --git a/app/styles/components/drawer.scss b/app/styles/components/drawer.scss index 39e936158b..7dc5a1a10c 100644 --- a/app/styles/components/drawer.scss +++ b/app/styles/components/drawer.scss @@ -20,7 +20,7 @@ .column, .drawer { flex: 1 1 100%; - overflow: visible; + overflow: hidden; } .drawer__pager { diff --git a/app/styles/loading.scss b/app/styles/loading.scss index 88705782ee..42a3a0c1f4 100644 --- a/app/styles/loading.scss +++ b/app/styles/loading.scss @@ -188,7 +188,6 @@ align-items: center; justify-content: center; padding: 20px; - border-radius: 0 0 10px 10px; & > div { width: 100%; diff --git a/app/styles/overflow_hacks.scss b/app/styles/overflow_hacks.scss deleted file mode 100644 index ef72b6863a..0000000000 --- a/app/styles/overflow_hacks.scss +++ /dev/null @@ -1,37 +0,0 @@ -// This is a file dedicated to fixing the css we broke by introducing the hover -// card and `overflow:visible` on drawer.scss line 23. If we ever figure out how -// to pop the hover card out while keeping `overflow:hidden`, feel free to delete -// this entire file. - -button.column-header__button.active { - border-radius: 0 10px 0 0; -} - -.column-back-button.column-back-button--slim-button { - border-radius: 0 10px 0 0; -} - -.detailed-status__wrapper .detailed-status__action-bar { - border-radius: 0 0 10px 10px; -} - -.slist .item-list .column-link { - background-color: transparent; - border-top: 1px solid var(--brand-color--med); -} - -.focusable { - &:focus { - border-radius: 0 0 10px 10px; - } -} - -.load-more:hover { - border-radius: 0 0 10px 10px; -} - -// this still looks like shit but at least it's better than it overflowing - -.empty-column-indicator { - border-radius: 0 0 10px 10px; -} From 7494a0fd00b66062dc78e21bf5185e0e5f2046bb Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2020 12:30:16 -0500 Subject: [PATCH 71/83] Hovercard: delete legacy code --- .../profile_hover_card_container.js | Bin 2854 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/soapbox/features/profile_hover_card/profile_hover_card_container.js diff --git a/app/soapbox/features/profile_hover_card/profile_hover_card_container.js b/app/soapbox/features/profile_hover_card/profile_hover_card_container.js deleted file mode 100644 index d4f706212af75534914315ef93cd190b334f98b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2854 zcmbtWOK;;g5Wf3YOfM@Lu zC{RELKIZ*>GZbs~QW^L{No8Q8WCNM9>+E*K{MD0^`{%=+>TtcsePQguAk#r5g`jBS zm>MY*t=sohtRdg&@6_B?m2AZzJ)O?*)0CqLsZITO}6yR z8$+SN*|KR`L)M(0C*blcSbtsEgwFCAbX!FqBo;zY3^%Dys*f^7)e8*){H3XSB7*Xu zhZ(kP76tXJMS<1cN(@SOm0?ocx5h~EGd+X{Wman^G^lpK^j+OBF~P;7tf?Yc%vd8W z$$l;0XRTpe&xl7LDfK<6v7$c3UN#AKZLbGs6(?H%Nt#FtcOdM+Ak@Kznrioja$+Oa zJGR#s@%U^`A{rr^w1MqFloC#vlaFslL8>A9uZ9@b0Zpc!FBT+Yx>v`tI7LrW?|710MtJ^RpnvqmKh`N3Jx0(QO!~ zpXD1>4@A`uQW(MnRY2bj6}5(+u&x`Sf147kz;e|$V;M4dW11n!Z>)WPHC;=|ZOk#f zWu0DYqnOy92;3yTqZ!P}3)#L(4al`^$tlxc=-(~F9`|B3(|dw&r=puyRA++6B%M&l z9ykjRK+MRfmRi$J1IgeR>Hv;lf*m|al?XM`s|2%SdTL9hZ=FR>4LJT<<(F4~$TpCN zhRFlg<8ct1?pwXf=e{Mr(?gjN+gKTB-frW@FvDq?xt_~lwm?qW_`TuSfd9dG(>H7H zAUOz5qPa6iA@V7fXDRZR3=vRLWE04k#@XUFum6%)5DAI(yWsT6>kp}g-to1x**a+A zl=zL+k9Mx-<3P>Zj$a_*t?hJ(aClSr2iR;!(9umO@%=b4a(u4p5_u??ejHns!8g6}PCB`AsV!)%yD># zBzXJ{8D5RTknM>fr*ZK+z-sJG|FBKHC%rnzHiIx{!f!*FeRB9{aF??*LJVYPBUv1i z=+5eTHDUjZ72#1{%ugQj5LDTP#SwHvILF4C&k(aTfcfy-5aBDYdbGa}Sx>HI9gQ#R zBN|S^?>vpBoQkd4!2*80DE=vNuDbI^E>H-@({kAw+N{#EKJz%Jv}{#HE&XjPWv{r% t#{V}&CJ}2Qwp7Vh^TSs=6!C@q{QUSwEDyG|t Date: Fri, 11 Sep 2020 12:38:42 -0500 Subject: [PATCH 72/83] Hovercard: update DisplayName snapshot --- .../__snapshots__/display_name-test.js.snap | 24 +++++++++++------- .../components/__tests__/display_name-test.js | Bin 525 -> 537 bytes 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap index 59789099f1..d26a406a20 100644 --- a/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap +++ b/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap @@ -4,16 +4,22 @@ exports[` renders display name + account name 1`] = ` - - Foo

", + + + Foo

", + } } - } - /> - + /> + + diff --git a/app/soapbox/components/__tests__/display_name-test.js b/app/soapbox/components/__tests__/display_name-test.js index 0d040c4cd8cc04661fd4ebcb02b04d1c746647b9..f626f94cabfd12063d41f5a083c005febd25dc33 100644 GIT binary patch delta 86 zcmeBWnaMIiX`-K}X=ZLgeo=`+wL)@HYGO&Mb3Txtmzr0iP^*wul%K1hUYws;kd$Ac bUy@o}5}%QpQ;=FzJaNh!el+!y`x)y1eTE^J delta 67 zcmbQq(#tYINvS9`FD11owMZeYC_h(0y(l#?xkR@lwYWqVCNohYc;e!h{4lOwGEhxP J>g3ssbpS|h8N&bo From d6a39b3e0959dc40b21ebd0bf5775d172914b073 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2020 13:04:31 -0500 Subject: [PATCH 73/83] Hovercard: put hovercard on chat window --- .../features/chats/components/chat_window.js | Bin 2966 -> 3209 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/components/chat_window.js b/app/soapbox/features/chats/components/chat_window.js index acc5c2e8e29b1618a62517b8663eca4b520ffa71..bb1a6346b8717faae649dea113a166fccbdcae94 100644 GIT binary patch delta 304 zcmbOx-YL1Ej7cmrw;;c$M8PA!EVU>oH7&d-v7jKeX!2S{DZvboSbR}xT6{S~baOG& zdRD3A{Ji24h0?sD)Wj4|AV7_3TaTDjee#bn5k*a1*Rc} zB$g$XBo-kIP_RLBheBd-~+|9|&1ORd0R`UP= delta 89 zcmeB_oF=}ZjA`>OrZudSk8m#G<5EBZ_LCbp)F*G?P!O`w&$L64vYKqhsXjS_Q%%rD Q-zPIK8%cI^9Tztf02PQ7 Date: Fri, 11 Sep 2020 13:04:45 -0500 Subject: [PATCH 74/83] UserPanel: only show stats when they're available --- .../features/ui/components/user_panel.js | Bin 4205 -> 4312 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/ui/components/user_panel.js b/app/soapbox/features/ui/components/user_panel.js index 1ba4e3efcab7d9546ad5e3d54532f327094d42d6..411b9b70b7320e686bbcb298013b219257686887 100644 GIT binary patch delta 115 zcmaE>a6@s!BM!#u$rm_fnHAL3Hb3O}!YEYB#if7(swdy$mIKL8e#jBC*@3$mtC};s ga5a-1xY;+G@-Ad#2AVZ_BahtVRcr#A+4$2L0ZU{amjD0& delta 86 zcmcbi_*P-VBaX>$*rX=&^KnlO;5M5az{WLs7PtK5|C~aT&v2&#=^v9fu<=ZO!6pY% avpIl!CnK@|P?PQE`Me9kf}4H$yBPt1=pMQN From 40937b9fdc2890d1f28632d1a62de09b03820057 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2020 13:09:39 -0500 Subject: [PATCH 75/83] Chats: allow clicking recipient in chatroom --- app/soapbox/features/chats/chat_room.js | Bin 2451 -> 2526 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/features/chats/chat_room.js b/app/soapbox/features/chats/chat_room.js index f3e81cc12035b2b8cae692973bcc6e6e1caed401..a9f0ccd5dc75c58d4d5fd943296f15e4d762e01b 100644 GIT binary patch delta 92 zcmbO%d{217CHZOvpUk{$g<6HQqWoM1^`g|oIwP*j2zPO7d;1 q6Z9QasuPow^Gowe^wLvHG}M8d5_Qemgxbl*9EVsy3Mc>Im<<3o;UY!= delta 26 icmca7JXv_crH#Mi*eBoNkeoc3V-0gkX4zzC&e;H?)C)BL From 35fe2fa4fa9e905d8e39ab37026b2994ebda779f Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 11 Sep 2020 15:30:37 -0500 Subject: [PATCH 76/83] Hovercard: hide on click ref --- .../__snapshots__/display_name-test.js.snap | 1 + app/soapbox/components/hover_ref_wrapper.js | Bin 1374 -> 1551 bytes app/styles/components/profile_hover_card.scss | 9 +-------- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap b/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap index d26a406a20..6d04016b56 100644 --- a/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap +++ b/app/soapbox/components/__tests__/__snapshots__/display_name-test.js.snap @@ -6,6 +6,7 @@ exports[` renders display name + account name 1`] = ` > diff --git a/app/soapbox/components/hover_ref_wrapper.js b/app/soapbox/components/hover_ref_wrapper.js index fe6ac2bed896b3ad28bf95ffc15a75d6dfc6e7e1..652e4a387a27a33fe5382d9ec16d2caacee0ce8d 100644 GIT binary patch delta 72 zcmcb|)z7nmnOQJ7Kd-n%AtNy_B`4K6Co?&Fav77?