Commit graph

25443 commits

Author SHA1 Message Date
Michael Telatynski
b27ab6663e
Merge branch 'develop' into t3chguy/fix_upload_abort 2020-05-26 12:04:36 +01:00
Weblate
7f3eafea99 Merge branch 'origin/develop' into Weblate. 2020-05-26 11:03:57 +00:00
Michael Telatynski
a64de63f00
Merge pull request #4633 from matrix-org/t3chguy/group-view-guest
fix viewGroup to actually show the group if possible
2020-05-26 12:03:52 +01:00
Weblate
406c79d06d Merge branch 'origin/develop' into Weblate. 2020-05-26 11:02:31 +00:00
Michael Telatynski
8062e5a6e8
Merge pull request #4634 from matrix-org/t3chguy/passphrase-copy
Update confirm passphrase copy
2020-05-26 12:02:27 +01:00
Weblate
1fb6d41bf4 Merge branch 'origin/develop' into Weblate. 2020-05-26 11:02:12 +00:00
Michael Telatynski
e049ead25f
Merge pull request #4636 from matrix-org/t3chguy/emojipickera11y
Improve accessibility of the emoji picker
2020-05-26 12:02:07 +01:00
Weblate
04f251628f Merge branch 'origin/develop' into Weblate. 2020-05-26 11:00:56 +00:00
Michael Telatynski
1f4aac9544
Merge pull request #4631 from matrix-org/t3chguy/emoji-picker-footer-height
Fix Emoji Picker footer being too small if text overflows
2020-05-26 12:00:51 +01:00
Weblate
30dc76713a Merge branch 'origin/develop' into Weblate. 2020-05-26 11:00:06 +00:00
MamasLT
d7f8fdec52 Translated using Weblate (Lithuanian)
Currently translated at 64.3% (1492 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-05-26 11:00:06 +00:00
Michael Telatynski
c00fd326c5
Merge pull request #4613 from matrix-org/t3chguy/toasts1
Improve style of toasts to match Figma
2020-05-26 11:59:58 +01:00
Michael Telatynski
1e9fc4ed8a
Merge pull request #4620 from matrix-org/t3chguy/toasts3_1
Iterate toast count indicator more logically
2020-05-26 11:59:27 +01:00
Weblate
b9dc466b26 Merge branch 'origin/develop' into Weblate. 2020-05-26 10:58:59 +00:00
Michael Telatynski
f4d69a9844
Merge pull request #4626 from matrix-org/t3chguy/redact_react
Fix reacting to redactions
2020-05-26 11:58:54 +01:00
Weblate
a8d9076dde Merge branch 'origin/develop' into Weblate. 2020-05-26 10:58:19 +00:00
Michael Telatynski
47af85b7b9
Merge pull request #4628 from matrix-org/t3chguy/message_sent
Fix sentMessageAndIsAlone by dispatching `message_sent` more consistently
2020-05-26 11:58:14 +01:00
Weblate
d3cdcc7f0f Merge branch 'origin/develop' into Weblate. 2020-05-26 09:04:18 +00:00
David Baker
7b646d5d39
Merge pull request #4640 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2020-05-26 10:04:11 +01:00
Weblate
803287f057 Merge branch 'origin/develop' into Weblate. 2020-05-26 08:37:04 +00:00
Michael Telatynski
707e22ad09
Merge pull request #4402 from matrix-org/t3chguy/alias
Replace `alias` with `address` in copy for consistency
2020-05-26 09:36:58 +01:00
MamasLT
9f4691cb77 Translated using Weblate (Lithuanian)
Currently translated at 64.3% (1494 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-05-26 08:36:48 +00:00
Weblate
94d3e4f045 Merge branch 'origin/develop' into Weblate. 2020-05-25 22:24:18 +00:00
Travis Ralston
3f2ab5a3a9
Merge pull request #4638 from matrix-org/travis/matrix-client-peg-ts
Convert MatrixClientPeg to TypeScript
2020-05-25 16:24:12 -06:00
Travis Ralston
1c9b5eb42d Appease the tests 2020-05-25 16:14:51 -06:00
Travis Ralston
e5c2d17015 Move the instance definition to the Window 2020-05-25 16:06:05 -06:00
Travis Ralston
0cec74cc2b Appease the linter (and the project)
Also export the interface that the project expects to be able to import :|
2020-05-25 15:59:15 -06:00
Travis Ralston
bd2d13edd2 Convert the MatrixClientPeg to TypeScript 2020-05-25 15:52:05 -06:00
Travis Ralston
982e81f9a3 Rename MatrixClientPeg to ts 2020-05-25 15:43:21 -06:00
Weblate
20ae161f00 Merge branch 'origin/develop' into Weblate. 2020-05-25 21:29:32 +00:00
toastbroot
3a4c65553c Translated using Weblate (German)
Currently translated at 100.0% (2322 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-05-25 21:29:31 +00:00
Kim Brose
f15e111e9a Translated using Weblate (German)
Currently translated at 100.0% (2322 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-05-25 21:29:31 +00:00
T. Küchel
01cf6cacb3 Translated using Weblate (German)
Currently translated at 100.0% (2322 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-05-25 21:29:31 +00:00
Michael Telatynski
ddcfe881c4
Merge pull request #4629 from matrix-org/t3chguy/fix-baseavatar-hooks
Fix BaseAvatar wrongly retrying urls
2020-05-25 22:29:22 +01:00
Weblate
d6644cf950 Merge branch 'origin/develop' into Weblate. 2020-05-25 18:05:57 +00:00
MamasLT
c8329a1acf Translated using Weblate (Lithuanian)
Currently translated at 62.0% (1439 of 2322 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-05-25 18:05:57 +00:00
Michael Telatynski
608a1feb03
Merge pull request #4637 from matrix-org/t3chguy/edit_highlights
Fix event highlights not being updated to reflect edits
2020-05-25 19:05:50 +01:00
Michael Telatynski
0861b1fbec remove redundant props
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-25 19:05:02 +01:00
Michael Telatynski
148f215d4e clean up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-25 19:02:44 +01:00
Jorik Schellekens
dfc73626fa Fix import 2020-05-25 18:18:47 +01:00
Jorik Schellekens
035c4fae50 Refactor Payloads 2020-05-25 18:12:15 +01:00
Jorik Schellekens
fc1f14f5aa Appease the types 2020-05-25 17:53:09 +01:00
Jorik Schellekens
303691eb72 Missing export 2020-05-25 17:37:07 +01:00
Jorik Schellekens
b4624baf2f
Merge branch 'develop' into joriks/field-ts 2020-05-25 17:29:25 +01:00
Jorik Schellekens
f34413c6ce update yarn lock 2020-05-25 17:24:15 +01:00
Jorik Schellekens
30e2b01022 unlock react types 2020-05-25 17:08:37 +01:00
Jorik Schellekens
d10d887996 Explain unsafe coerce 2020-05-25 16:53:09 +01:00
Jorik Schellekens
5c9398a6b1 Types exiliary files 2020-05-25 16:47:57 +01:00
Michael Telatynski
1a47ceb322 Fix event highlight with edits
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-25 16:17:46 +01:00
Michael Telatynski
6677a3f20e Implement Tabs with Automatic Activation pattern for EmojiPicker header
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-25 15:46:44 +01:00