239197a3cb
Merge pull request #4394 from matrix-org/t3chguy/qrcode
...
wrap node-qrcode in a React FC and use it for ShareDialog
2020-05-14 17:31:26 +01:00
dd747a9a09
Merge pull request #4585 from matrix-org/t3chguy/sso_hash
...
Pass screenAfterLogin through SSO in the callback url
2020-05-14 17:30:31 +01:00
6cdfe869be
Merge pull request #4598 from matrix-org/travis/fix-emails-release
...
Remove debugging that causes email addresses to load forever (to release)
2020-05-14 10:01:56 -06:00
14662fbf4d
Merge pull request #4597 from matrix-org/travis/fix-emails
...
Remove debugging that causes email addresses to load forever
2020-05-14 09:53:37 -06:00
67822f9e69
Remove debugging that causes email addresses to load forever
...
This was left in by accident for https://github.com/matrix-org/matrix-react-sdk/pull/4557
2020-05-14 09:53:23 -06:00
cae28b48d6
Remove debugging that causes email addresses to load forever
...
This was left in by accident for https://github.com/matrix-org/matrix-react-sdk/pull/4557
2020-05-14 09:43:34 -06:00
81174b5f55
v2.6.0-rc.1
2020-05-14 16:30:17 +01:00
4a7487aa20
Prepare changelog for v2.6.0-rc.1
2020-05-14 16:30:17 +01:00
d8003df24c
Upgrade matrix-js-sdk to 6.1.0-rc.1
2020-05-14 16:22:30 +01:00
8a9502a8cb
Merge pull request #4596 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2020-05-14 15:59:50 +01:00
5ac6794f62
Merge branch 'origin/develop' into Weblate.
2020-05-14 14:48:25 +00:00
087d514c4c
Merge pull request #4595 from matrix-org/t3chguy/edit_crash
...
Fix message edits dialog being wrong and sometimes crashing
2020-05-14 15:48:19 +01:00
e241da3af0
Fix diff wrong route offsets because of skipping a node insert
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 15:35:38 +01:00
691d3924fa
Merge branch 'origin/develop' into Weblate.
2020-05-14 13:52:24 +00:00
91134601f6
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2308 of 2308 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-05-14 13:52:24 +00:00
72e5e2e4b9
Translated using Weblate (Estonian)
...
Currently translated at 46.8% (1079 of 2308 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-14 13:52:23 +00:00
822b4b4fff
Translated using Weblate (Czech)
...
Currently translated at 95.2% (2198 of 2308 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-05-14 13:52:23 +00:00
acc17e6026
Merge pull request #4584 from matrix-org/travis/deactivate-fix
...
Acquire a new session before enacting deactivation
2020-05-14 07:52:17 -06:00
edba204408
accept and linkify local domains like those from mDNS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 13:04:30 +01:00
4c7d703275
Reuse QRCode for VerificationQRCode and specify widths
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 11:20:27 +01:00
d1c6f3099c
move styling to QRCode scss
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 11:20:06 +01:00
1ba19e78f8
Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode
...
Conflicts:
package.json
2020-05-14 10:50:42 +01:00
0872c0a23d
Merge branch 'origin/develop' into Weblate.
2020-05-14 08:10:50 +00:00
9869ae4672
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 57.6% (1332 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-05-14 08:10:49 +00:00
1af2bdbc0e
Translated using Weblate (French)
...
Currently translated at 100.0% (2312 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-05-14 08:10:49 +00:00
5672ff577b
Translated using Weblate (Estonian)
...
Currently translated at 46.7% (1080 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-05-14 08:10:49 +00:00
62fee73242
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2312 of 2312 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-05-14 08:10:46 +00:00
4a8e642400
Merge pull request #4581 from matrix-org/bwindels/remove-asym-4s
...
Remove UI for upgrading 4S to symmetric encryption
2020-05-14 08:10:39 +00:00
e4835c4b03
Demonstrate dis.fire() with view_user_settings
...
Like a5f3318f3b
2020-05-13 21:08:08 -06:00
a5f3318f3b
Convert view_user dispatch to prove the conversion works
...
This is a relatively obvious dispatch action that doesn't require a lot of complicated type definitions, so should be a good candidate to prove the thing works. If for some reason the thing stops working, we've done something wrong.
This also adds a bit of generic types to the dispatch call so we don't confuse the tsx parser by using `dis.dispatch(<ViewUserPayload>{...})` as it thinks that's supposed to be a component. We still get type safety, and the thing remains happy with the generics approach.
2020-05-13 21:07:50 -06:00
a3b4c2dfa0
Convert more async actions to AsyncActionPayload
2020-05-13 21:07:50 -06:00
8c72c27da9
Break out actions and payloads to their own files
...
The definitions take up a lot of space which makes it hard to see the dispatcher class, so break them out.
2020-05-13 21:07:50 -06:00
90a898d03f
Move dispatcher into a subdirectory
...
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
2020-05-13 21:07:50 -06:00
fa83df4bde
Convert dispatcher to TypeScript and replace async usage with new class
...
Due to TypeScript and flux's types being annoying and highly typesafe, we need an AsyncActionPayload which intentionally doesn't use the 'action' property. This looks a bit awkward, though for the rare cases we do actually fire async actions it should be fine enough.
The call signature changes slightly for async events, therefore this commit also updates its usages for async events.
The `fire()` function is to be used in a future commit.
Remove biased comment
2020-05-13 21:07:50 -06:00
03e090f4e6
fix chevron
2020-05-13 22:55:14 +01:00
39ccbd07cb
Merge branch 'origin/develop' into Weblate.
2020-05-13 21:33:16 +00:00
226e4b297a
Translated using Weblate (Czech)
...
Currently translated at 95.4% (2201 of 2307 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-05-13 21:33:16 +00:00
9dd93f14ba
Merge pull request #4555 from matrix-org/travis/sso-xsigning
...
Add copy to SSO prompts during cross-signing setup
2020-05-13 15:33:09 -06:00
fc6e5227ac
FIx roomsublist heights.
...
- also fiddles the font size numbers
2020-05-13 22:24:22 +01:00
5c2abcf1a4
Show username on continuations
2020-05-13 17:05:37 +01:00
bed6c0b94c
Merge branch 'origin/develop' into Weblate.
2020-05-13 16:02:50 +00:00
8e31040c1a
Merge pull request #4592 from matrix-org/dbkr/fix_persistent_widgets_desktop_2
...
Re-fix OpenID requests from widgets
2020-05-13 17:02:44 +01:00
50107ebe47
Re-fix OpenID requests from widgets
...
https://github.com/matrix-org/matrix-react-sdk/pull/4591 reverted
https://github.com/matrix-org/matrix-react-sdk/pull/4459 . We need
to pass both URLs as we need both the wURL (for the widget's 'identity'
ie. OpenID) and the URL that's actually in the iframe (for the
messaging).
2020-05-13 16:10:40 +01:00
20ec900405
Set font range
2020-05-13 15:36:53 +01:00
fea219915f
fix code regeression
2020-05-13 15:26:11 +01:00
328bb7bcaf
Remove all animations
2020-05-13 15:24:08 +01:00
312b616d77
fix i18n
2020-05-13 14:11:16 +01:00
3f04f5163a
Implement more nitpicks
...
- fix avatar inital aligment
- right align names
- set flair height to avatar's
- fix conditions for resizing to be more stable
2020-05-13 14:04:46 +01:00
90afd5ef9a
Merge branch 'origin/develop' into Weblate.
2020-05-13 11:47:59 +00:00
ef2678db93
Merge pull request #4591 from matrix-org/dbkr/fix_persistent_widgets_desktop
...
Fix persistent widgets on desktop / http
2020-05-13 12:47:54 +01:00
Michael Telatynski