mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 08:02:10 +03:00
Code Issues Projects Releases Packages Wiki Activity
29373 commits 219 branches 562 tags 474 MiB
Commit graph

23376 commits

Author SHA1 Message Date
David Baker
db343b522b Two more easy files to remove from eslintignore 
Just missing params/returns on jsdoc
 2020-10-30 18:40:19 +00:00
Weblate
f1e68956c0 Merge branch 'origin/develop' into Weblate. 2020-10-30 18:39:17 +00:00
Michael Telatynski
0c6e597f4e
Merge pull request #5376 from matrix-org/t3chguy/countly 
Fix countly method bindings and errors
 2020-10-30 18:39:11 +00:00
Weblate
3741ce949e Merge branch 'origin/develop' into Weblate. 2020-10-30 18:31:24 +00:00
David Baker
7ec1d5a881 Fix a bunch of silly lint errors 
At some point the script to generate .eslintignore.errorfiles had
been run and added all these files to the ignore list, often because
they lacked a space before a brace or something equally mundane.

These are the easiest bunch.
 2020-10-30 18:18:17 +00:00
Weblate
e59b499198 Merge branch 'origin/develop' into Weblate. 2020-10-30 18:06:35 +00:00
David Baker
f38a8dc2de
Merge pull request #5374 from matrix-org/dbkr/imageutils_typescript 
Typescript: ImageUtils
 2020-10-30 18:06:28 +00:00
Michael Telatynski
7b625dbe0d sanitize error reports 2020-10-30 18:04:19 +00:00
David Baker
8b7ed7ad1a Typescript: ImageUtils 2020-10-30 17:50:37 +00:00
Michael Telatynski
577e9ee0a3 Fix method bindings 2020-10-30 17:45:52 +00:00
Weblate
2a606c4214 Merge branch 'origin/develop' into Weblate. 2020-10-30 17:45:10 +00:00
Priit Jõerüüt
df2c64f21d Translated using Weblate (Estonian) 
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-10-30 17:45:10 +00:00
David Baker
f920c1fb3f
There's a type for everything! 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-30 17:35:16 +00:00
David Baker
85fb923398 Convert AuxPanel to TypeScript 
so the healing can begin
 2020-10-30 17:29:32 +00:00
Weblate
d589dac124 Merge branch 'origin/develop' into Weblate. 2020-10-30 16:24:45 +00:00
Besnik Bleta
3021ca05bd Translated using Weblate (Albanian) 
Currently translated at 99.7% (2370 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2020-10-30 16:24:45 +00:00
Michael Telatynski
517e3b5ea4
Merge pull request #5372 from matrix-org/t3chguy/countly 
Only pass metrics if they exist otherwise Countly will be unhappy!
 2020-10-30 16:24:28 +00:00
Michael Telatynski
067886f5e8 Only pass metrics if they exist otherwise Countly will be unhappy! 2020-10-30 16:09:06 +00:00
Resynth
a74f4fa25e Change "Password" to "New Password" 
Doesn't solve most issues in the Forgot Password menu, but clears up the
UI a little. "New Password" makes more sense here, as "Password" may
suggest to the user that they have to enter the password they forgot.

Signed-off-by: Resynth <resynth1943@tutanota.com>
 2020-10-30 16:05:35 +00:00
Weblate
7951a54854 Merge branch 'origin/develop' into Weblate. 2020-10-30 14:28:58 +00:00
XoseM
ac4f9bbcc0 Translated using Weblate (Galician) 
Currently translated at 99.9% (2374 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-10-30 14:28:58 +00:00
Michael Telatynski
f80ee391bc
Merge pull request #5370 from matrix-org/t3chguy/countly 
Fix CountlyAnalytics NPE on MatrixClientPeg
 2020-10-30 14:28:48 +00:00
Michael Telatynski
171b3ede76 improve comments 2020-10-30 14:27:14 +00:00
Michael Telatynski
70fe26d163 Fix CountlyAnaltics NPE on MatrixClientPeg 2020-10-30 14:14:17 +00:00
Weblate
9b794198e9 Merge branch 'origin/develop' into Weblate. 2020-10-30 13:47:47 +00:00
XoseM
97b7863354 Translated using Weblate (Galician) 
Currently translated at 99.6% (2366 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-10-30 13:47:46 +00:00
Michael Telatynski
b6532f9b80
Merge pull request #5369 from matrix-org/t3chguy/countly 
fix CountlyAnalytics canEnable on wrong target
 2020-10-30 13:47:35 +00:00
Michael Telatynski
3f11259fa8 fix CountlyAnalytics canEnable on wrong target 2020-10-30 13:42:35 +00:00
Weblate
c0ce913fe0 Merge branch 'origin/develop' into Weblate. 2020-10-30 13:08:05 +00:00
Michael Telatynski
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly 
Initial Countly work
 2020-10-30 13:07:58 +00:00
Michael Telatynski
50a937c523 add comments 2020-10-30 12:44:46 +00:00
Weblate
7b40aa6d1f Merge branch 'origin/develop' into Weblate. 2020-10-30 12:00:13 +00:00
random
214ba7ab1d Translated using Weblate (Italian) 
Currently translated at 99.9% (2366 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2020-10-30 12:00:13 +00:00
Valex
213fcb3ad8 Translated using Weblate (Russian) 
Currently translated at 99.8% (2363 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2020-10-30 12:00:11 +00:00
progserega
7133464977 Translated using Weblate (Russian) 
Currently translated at 99.8% (2363 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2020-10-30 12:00:11 +00:00
Will Hunt
c8485419c1 Fix bug that would cause failed to decrypt messages in non-encrypted rooms 2020-10-30 11:29:32 +00:00
Michael Telatynski
db38d737a4 fix ts global 2020-10-30 10:43:52 +00:00
Michael Telatynski
72f6aa61dd flush requests queue 2020-10-30 10:31:32 +00:00
Michael Telatynski
b01055f962 Tidy up and fix some edge cases 2020-10-30 10:26:15 +00:00
Nikolai Zahariev
3ef0bb5888 Translated using Weblate (Bulgarian) 
Currently translated at 92.3% (2186 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/bg/
 2020-10-29 22:07:27 +00:00
notramo
397f2386d3 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2020-10-29 22:07:25 +00:00
Max Harmathy
1bab68333e Translated using Weblate (German) 
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2020-10-29 22:07:23 +00:00
Michael Telatynski
c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Weblate
0b7ec2d734 Merge branch 'origin/develop' into Weblate. 2020-10-29 11:54:57 +00:00
Michael Telatynski
3c9cc636c4
Merge pull request #5360 from matrix-org/t3chguy/fix/15586 
Watch replyToEvent at RoomView to prevent races
 2020-10-29 11:54:49 +00:00
Weblate
8269ca74de Merge branch 'origin/develop' into Weblate. 2020-10-29 03:18:29 +00:00
MamasLT
c4e8b4221f Translated using Weblate (Lithuanian) 
Currently translated at 81.3% (1926 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2020-10-29 03:18:29 +00:00
Travis Ralston
ac3414b231
Merge pull request #5362 from matrix-org/travis/ui-feat/history 
Add a UI Feature flag for room history settings
 2020-10-28 21:18:19 -06:00
Travis Ralston
09b02d0120 Fix i18n 2020-10-28 10:50:38 -06:00
Travis Ralston
a501d698aa Add a UI Feature flag for room history settings 2020-10-28 09:00:36 -06:00
Weblate
35a28a3f46 Merge branch 'origin/develop' into Weblate. 2020-10-28 14:17:06 +00:00
J. Ryan Stinnett
5f840da38a Fix typo 2020-10-28 13:12:12 +00:00
J. Ryan Stinnett
ac7991c494 Add comment 2020-10-28 13:11:35 +00:00
J. Ryan Stinnett
9c8bc583e0 Hide inline images when preference disabled 
As a first attempt, this drops inline images (as if they were not present at
all) when the "show images" preference is disabled. Future work might expose
some UI to reveal them like standalone image events have.

Fixes https://github.com/vector-im/element-web/issues/15573
 2020-10-28 13:03:48 +00:00
Michael Telatynski
e06550b748 Watch replyToEvent at RoomView to prevent races 2020-10-28 12:47:59 +00:00
Weblate
c964c38406 Merge branch 'origin/develop' into Weblate. 2020-10-28 11:27:16 +00:00
J. Ryan Stinnett
557d9ad90c
Merge pull request #5359 from matrix-org/jryans/react-key-checkboxes 
Fix React warning by moving handler to each button
 2020-10-28 11:27:07 +00:00
Weblate
f5480efea7 Merge branch 'origin/develop' into Weblate. 2020-10-28 00:56:38 +00:00
Tirifto
89fbd33abf Translated using Weblate (Esperanto) 
Currently translated at 99.6% (2359 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2020-10-28 00:56:38 +00:00
Travis Ralston
0adb920448
Merge pull request #5352 from matrix-org/hs/mvideobody 
Do not preload encrypted videos|images unless autoplay or thumbnailing is on
 2020-10-27 18:56:29 -06:00
J. Ryan Stinnett
bb18e44042 Fix React warning by moving handler to each button 
React is disturbed that the buttons don't have their own event handlers, so
let's just move it there.
 2020-10-27 17:11:09 +00:00
Weblate
9e3f3415bb Merge branch 'origin/develop' into Weblate. 2020-10-27 11:39:07 +00:00
MamasLT
da00ab53ad Translated using Weblate (Lithuanian) 
Currently translated at 81.2% (1923 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2020-10-27 11:39:07 +00:00
LinAGKar
fdb491d4e8 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2020-10-27 11:38:47 +00:00
notramo
1214052e53 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2020-10-27 11:38:44 +00:00
Corentin Noël
432deb665d Translated using Weblate (French) 
Currently translated at 94.8% (2245 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2020-10-27 11:38:42 +00:00
Michael Telatynski
914699259b
Merge pull request #5357 from matrix-org/t3chguy/fix/jitsi 
Fix theme variable passed to Jitsi
 2020-10-27 11:38:30 +00:00
Michael Telatynski
17717e27c6 Fix theme variable passed to Jitsi 2020-10-27 11:26:16 +00:00
MamasLT
40881a7359 Translated using Weblate (Lithuanian) 
Currently translated at 74.0% (1752 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2020-10-26 16:56:56 +00:00
Weblate
734916ad98 Merge branch 'origin/develop' into Weblate. 2020-10-26 14:49:10 +00:00
Priit Jõerüüt
2beeb493b7 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-10-26 14:49:10 +00:00
MamasLT
5555931afa Translated using Weblate (Lithuanian) 
Currently translated at 72.4% (1714 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2020-10-26 14:49:08 +00:00
XoseM
159d4ac973 Translated using Weblate (Galician) 
Currently translated at 99.9% (2366 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-10-26 14:49:05 +00:00
Dominik George
72d7760ed2 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 57.7% (1366 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nb_NO/
 2020-10-26 14:49:03 +00:00
Tirifto
7cab8a37b9 Translated using Weblate (Esperanto) 
Currently translated at 99.6% (2359 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2020-10-26 14:49:02 +00:00
Jeff Huang
0ff396e9ec Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-10-26 14:49:01 +00:00
Nikita Epifanov
ed250b0abf Translated using Weblate (Russian) 
Currently translated at 99.8% (2363 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2020-10-26 14:49:00 +00:00
progserega
5ab899fda6 Translated using Weblate (Russian) 
Currently translated at 99.8% (2363 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2020-10-26 14:48:57 +00:00
Marcelo Filho
d3840438a9 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2020-10-26 14:48:55 +00:00
Szimszon
4e3e752287 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2020-10-26 14:48:53 +00:00
aWeinzierl
7460e4cd66 Translated using Weblate (German) 
Currently translated at 100.0% (2367 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2020-10-26 14:48:50 +00:00
Travis Ralston
b10a6a5720
Merge pull request #5349 from RinkiyaKeDad/comments 
docs: added comment explanation
 2020-10-26 08:48:39 -06:00
Tirifto
84421efd46 Translated using Weblate (Esperanto) 
Currently translated at 99.6% (2359 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2020-10-25 20:56:46 +00:00
Madison Scott-Clary
e87071cc83 Translated using Weblate (Esperanto) 
Currently translated at 99.6% (2359 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2020-10-25 20:56:46 +00:00
Madison Scott-Clary
98af38d76d Translated using Weblate (Esperanto) 
Currently translated at 99.6% (2359 of 2367 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2020-10-25 20:56:07 +00:00
Will Hunt
7eb54cc83c Also only download images after clicking on them 2020-10-23 17:16:09 +01:00
Will Hunt
e5228e2795 alt is not valid on video element 2020-10-23 16:42:23 +01:00
Will Hunt
7164284bb6 Do not download encrypted video if autoplay is not on 2020-10-23 16:33:40 +01:00
Will Hunt
bbb4c7f801 Convert MVideoBody to typescript 2020-10-23 16:32:04 +01:00
Weblate
55b9e8357a Merge branch 'origin/develop' into Weblate. 2020-10-23 13:30:11 +00:00
Priit Jõerüüt
acbb054121 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2365 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-10-23 13:30:11 +00:00
Besnik Bleta
c676a0131e Translated using Weblate (Albanian) 
Currently translated at 99.7% (2360 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2020-10-23 13:30:09 +00:00
MamasLT
82f1d9850e Translated using Weblate (Lithuanian) 
Currently translated at 71.5% (1692 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2020-10-23 13:30:07 +00:00
XoseM
e55d463c24 Translated using Weblate (Galician) 
Currently translated at 99.9% (2364 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-10-23 13:29:49 +00:00
Samu Voutilainen
e85a60495e Translated using Weblate (Finnish) 
Currently translated at 89.5% (2119 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fi/
 2020-10-23 13:29:46 +00:00
random
94c814e527 Translated using Weblate (Italian) 
Currently translated at 100.0% (2365 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2020-10-23 13:29:43 +00:00
Tirifto
1c66a9981f Translated using Weblate (Esperanto) 
Currently translated at 99.7% (2359 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
 2020-10-23 13:29:41 +00:00
Jeff Huang
0639be3d00 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2365 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-10-23 13:29:28 +00:00
Marcelo Filho
94aa324b03 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2365 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2020-10-23 13:29:25 +00:00
@a2sc:matrix.org
5c49777e08 Translated using Weblate (German) 
Currently translated at 99.9% (2364 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2020-10-23 13:29:23 +00:00
ProfP30
d17d2e8af4 Translated using Weblate (German) 
Currently translated at 99.9% (2364 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2020-10-23 13:29:21 +00:00
random
5cd1a28d13 Translated using Weblate (Italian) 
Currently translated at 100.0% (2365 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2020-10-23 09:51:47 +00:00
Francesco
bfaab7591d Translated using Weblate (Italian) 
Currently translated at 100.0% (2365 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
 2020-10-23 09:51:45 +00:00
Michael Telatynski
cf93f75d09 fix sandbox flags 2020-10-22 22:09:16 +01:00
Michael Telatynski
0004dd4475 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 2020-10-22 21:40:05 +01:00
Michael Telatynski
12bc3ea9dc remove stale comments 2020-10-22 21:34:48 +01:00
aethralis
c5c0617aee Translated using Weblate (Estonian) 
Currently translated at 100.0% (2365 of 2365 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-10-21 21:24:12 +00:00
Michael Telatynski
ca4e7202ae
Merge pull request #5350 from matrix-org/t3chguy/fix/widgets 
Widgets fixes
 2020-10-21 16:30:24 +01:00
Michael Telatynski
5f2058a6a0 Fix WidgetStore wrongly hanging onto old Widget definitions during removal 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 16:06:22 +01:00
Michael Telatynski
a16a6d2b54 Remove redundant event listener 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 16:05:44 +01:00
Michael Telatynski
6196c03c0a Fix stickerpicker not having correct contexts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 16:05:20 +01:00
Arsh Sharma
e57f4fbd54 docs: fixed whitespace 2020-10-21 20:13:50 +05:30
Arsh Sharma
312d46917c docs: added comment explanation 2020-10-21 20:10:35 +05:30
Michael Telatynski
0170fa608e Fix User Menu avatar colouring being based on wrong string 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 14:11:39 +01:00
David Baker
fa1a956733
Merge pull request #5345 from matrix-org/dbkr/select_answer 
Support 'answered elsewhere'
 2020-10-21 13:42:23 +01:00
Weblate
3be11d8785 Merge branch 'origin/develop' into Weblate. 2020-10-21 11:59:48 +00:00
Michael Telatynski
4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
 2020-10-21 12:48:51 +01:00
Michael Telatynski
568e147053 Merge copyrights 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 12:44:16 +01:00
Weblate
810f579e56 Merge branch 'origin/develop' into Weblate. 2020-10-21 11:41:32 +00:00
call_xz
2ba1805f74 Translated using Weblate (Japanese) 
Currently translated at 57.1% (1354 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
 2020-10-21 11:41:31 +00:00
David Baker
765fdf93e6 Support 'answered elsewhere' 
Show a dialog for now, telling the user someone beat them to it.

Only useful with https://github.com/matrix-org/matrix-js-sdk/pull/1522
(but can be merged safely without).
 2020-10-21 11:54:48 +01:00
Michael Telatynski
a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/resizer/distributors/collapse.ts
	src/resizer/distributors/fixed.ts
	src/resizer/index.ts
	src/resizer/item.ts
	src/resizer/resizer.ts
	src/resizer/sizer.ts
 2020-10-21 09:56:22 +01:00
Michael Telatynski
5a9bac68c6 iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 09:48:02 +01:00
Michael Telatynski
9cd146aa33 remove debug lines 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 09:46:37 +01:00
Weblate
356a1916a9 Merge branch 'origin/develop' into Weblate. 2020-10-20 22:54:29 +00:00
Nikolay Boyadzhiev
6d0dc00d4a Translated using Weblate (Bulgarian) 
Currently translated at 92.5% (2191 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/bg/
 2020-10-20 22:54:29 +00:00
Michael Telatynski
42228719b9
Merge pull request #5343 from matrix-org/t3chguy/ts/resizer 
Convert resizer to Typescript
 2020-10-20 23:54:17 +01:00
Michael Telatynski
01498653d8 update copyrights 2020-10-20 23:42:12 +01:00
Michael Telatynski
9348c8a23b Fix some widget auto tiling issues 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 16:07:47 +01:00
Michael Telatynski
2b9c2daaf4 Fix auto-pinned widget ordering 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 16:07:21 +01:00
Weblate
637982d12c Merge branch 'origin/develop' into Weblate. 2020-10-20 14:21:51 +00:00
Michael Telatynski
9181e3e89a
Merge pull request #5338 from matrix-org/t3chguy/fix/15166 
Hide filtering microcopy when left panel is minimized
 2020-10-20 15:21:43 +01:00
Michael Telatynski
b6fd2a0691 Iterate the Modal Widget Dialog paddings and phishing warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 15:05:22 +01:00
Weblate
9bf6281a53 Merge branch 'origin/develop' into Weblate. 2020-10-20 10:36:44 +00:00
Michael Telatynski
5caad82f9f
Merge pull request #5337 from matrix-org/t3chguy/fix/15484 
Spec compliance, /search doesn't have to return results
 2020-10-20 11:36:37 +01:00
Weblate
baa2db227f Merge branch 'origin/develop' into Weblate. 2020-10-20 10:29:23 +00:00
Michael Telatynski
7752f92533
Merge pull request #5336 from matrix-org/t3chguy/fix/15488 
Fix excessive hosting link padding
 2020-10-20 11:29:13 +01:00
Priit Jõerüüt
ab6cee3fba Translated using Weblate (Estonian) 
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-10-20 10:28:38 +00:00
XoseM
6217978378 Translated using Weblate (Galician) 
Currently translated at 99.9% (2367 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-10-20 10:28:35 +00:00
LinAGKar
d0610c3a1b Translated using Weblate (Swedish) 
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sv/
 2020-10-20 10:28:33 +00:00
Marcelo Filho
76951ce1be Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2368 of 2368 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2020-10-20 10:28:31 +00:00
Michael Telatynski
329ded92c1 Convert resizer to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 11:03:03 +01:00
Michael Telatynski
b0acae6e77 fix remaining type mismatches 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 21:13:31 +01:00
Michael Telatynski
4dd8b8d8c6 fix WidgetUtils setRoomWidget signature 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 21:02:48 +01:00
Michael Telatynski
5ee0262da2 Post-merge tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 20:56:41 +01:00
Michael Telatynski
bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
 2020-10-19 20:50:16 +01:00
Michael Telatynski
16362440b3 Iterate Modal Widgets 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 20:39:43 +01:00
Michael Telatynski
00b1a03a3e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 
 Conflicts:
	src/@types/global.d.ts
	src/FromWidgetPostMessageApi.js
	src/WidgetMessaging.js
	src/widgets/WidgetApi.ts
 2020-10-19 19:46:07 +01:00
Michael Telatynski
5fcdaf66cc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 18:50:02 +01:00
Michael Telatynski
1fe2eea43f Pass theme to Jitsi 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 18:47:27 +01:00