Bruno Windels
6bb6885578
adjust sas copy to use device -> session
2020-04-02 18:28:01 +02:00
Bruno Windels
cc9c5cabb3
adapt encryption info to self-verification
...
- hide text when shown in a dialog
- adapt "waiting for ... to accept" text to self-verif
2020-04-02 17:51:25 +02:00
Bruno Windels
081baa2359
set dialog title for self-verification
...
use request.isSelfVerification helper
2020-04-02 17:51:06 +02:00
Bruno Windels
009941a6ac
Merge branch 'bwindels/qr-reciprocate' into bwindels/selfverifux
2020-04-02 16:57:44 +02:00
Bruno Windels
fffd5a4a5e
fix stylelint
2020-04-02 16:46:29 +02:00
Bruno Windels
1baaafe7b9
some comments to explain the mess
2020-04-02 16:44:42 +02:00
Bruno Windels
0307361fa2
more polish for self-verification
2020-04-02 16:42:39 +02:00
Weblate
2f0d409708
Merge branch 'origin/develop' into Weblate.
2020-04-02 14:30:06 +00:00
Nils J. Haugen
63ed6c3dac
Translated using Weblate (Norwegian Nynorsk)
...
Currently translated at 59.6% (1345 of 2256 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-04-02 14:30:06 +00:00
call_xz
2b7bbe7013
Translated using Weblate (Japanese)
...
Currently translated at 55.1% (1244 of 2256 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-04-02 14:30:01 +00:00
David Baker
9944ce71b6
Merge pull request #4337 from matrix-org/dbkr/fix_inhibit_login_case
...
Fix spurious extra devices on registration
2020-04-02 15:29:55 +01:00
Michael Telatynski
1ae370b97e
Pull feature_presence_in_room_list out of labs.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 15:20:35 +01:00
Michael Telatynski
a28aa4c0b4
Tweak user online dot in room tile, make it occupy same space and inverse behaviour of the context menu button
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 15:13:19 +01:00
Michael Telatynski
3612073852
Nuke the icon_person.svg DM Indicator as it causes more confusion than it solves.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 15:12:19 +01:00
David Baker
705fd57a4b
Fix spurious extra devices on registration
...
We send a parameter to prevent being immediately logged in after
registration, but we regressed it from snake case to camelcase
during the course of cross-signing dev.
Fixes https://github.com/vector-im/riot-web/issues/12865
2020-04-02 15:09:33 +01:00
Bruno Windels
ee61a3aff6
dismiss setup encryption toast if cross-signing is ready
2020-04-02 16:07:55 +02:00
Jorik Schellekens
202ad9f98a
Remove sort and include new scss file in components
2020-04-02 13:42:59 +01:00
Jorik Schellekens
df1a8b288b
Change copyright
2020-04-02 13:35:12 +01:00
Bruno Windels
31ca52dede
fix stylelint
2020-04-02 13:44:19 +02:00
Bruno Windels
1f65cfb7f6
polish design and disable buttons after click
2020-04-02 13:44:19 +02:00
Bruno Windels
ccf6c9efdc
fixup: more i18n
2020-04-02 13:44:19 +02:00
Bruno Windels
a4f448d4ca
update i18n
2020-04-02 13:44:19 +02:00
Bruno Windels
119fd2f519
fixup: these are actually on the verifier
2020-04-02 13:44:19 +02:00
Bruno Windels
fd04f248c4
fix proptype typo
2020-04-02 13:44:19 +02:00
Bruno Windels
00b1afe0fa
first go at reciprocate UX
2020-04-02 13:44:19 +02:00
Bruno Windels
1353ddaa96
move qr code data generation to js-sdk
2020-04-02 13:41:19 +02:00
Weblate
ed3642f9b2
Merge branch 'origin/develop' into Weblate.
2020-04-02 10:59:59 +00:00
call_xz
a327cf9d60
Translated using Weblate (Japanese)
...
Currently translated at 55.1% (1244 of 2256 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-04-02 10:59:59 +00:00
random
43bfa3127e
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2256 of 2256 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-04-02 10:59:57 +00:00
David Baker
5cce31b39e
Merge pull request #4333 from matrix-org/dbkr/fix_edit_composer
...
Fix the edit messager composer
2020-04-02 11:59:51 +01:00
David Baker
74186740ee
Fix the edit messager composer
...
Broken in https://github.com/matrix-org/matrix-react-sdk/pull/4313
Fixes https://github.com/vector-im/riot-web/issues/13001
2020-04-02 11:30:43 +01:00
Weblate
90b749b02c
Merge branch 'origin/develop' into Weblate.
2020-04-02 08:51:07 +00:00
Nils J. Haugen
0f1ebb0107
Translated using Weblate (Norwegian Nynorsk)
...
Currently translated at 57.0% (1287 of 2256 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-04-02 08:51:07 +00:00
Jeff Huang
87ba5f4c8a
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2256 of 2256 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-02 08:51:04 +00:00
Michael Telatynski
6db51cf9aa
Merge pull request #4321 from matrix-org/t3chguy/room_settings_notif_icon
...
Fix Room Settings Dialog Notifications tab icon
2020-04-02 09:50:57 +01:00
Weblate
1f8bb54a2b
Merge branch 'origin/develop' into Weblate.
2020-04-02 00:56:47 +00:00
Nils J. Haugen
d19ef7cddd
Translated using Weblate (Norwegian Nynorsk)
...
Currently translated at 55.4% (1250 of 2256 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-04-02 00:56:47 +00:00
Travis Ralston
f7fa86f3ac
Merge pull request #4331 from matrix-org/travis/react-warnings/5-misc-cases
...
Fix various cases of React warnings by silencing them
2020-04-01 18:56:38 -06:00
Weblate
9754947147
Merge branch 'origin/develop' into Weblate.
2020-04-01 23:51:06 +00:00
Nils J. Haugen
ec49dccadc
Translated using Weblate (Norwegian Nynorsk)
...
Currently translated at 52.9% (1194 of 2256 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-04-01 23:51:05 +00:00
Nils J. Haugen
9d33d16104
Translated using Weblate (Norwegian Nynorsk)
...
Currently translated at 52.9% (1194 of 2256 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-04-01 23:51:05 +00:00
J. A. Durieux
4402398d90
Translated using Weblate (Dutch)
...
Currently translated at 94.1% (2123 of 2256 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2020-04-01 23:50:56 +00:00
Michael Telatynski
9ff587520c
Merge pull request #4332 from matrix-org/t3chguy/userinfo_regression
...
Only apply padding to standard textual buttons (kind buttons)
2020-04-02 00:50:51 +01:00
Michael Telatynski
faa4f54c97
Only apply padding to standard textual buttons (kind buttons)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-02 00:12:48 +01:00
Travis Ralston
c5cf04f6d2
More appeasing of the linter
2020-04-01 16:25:59 -06:00
Travis Ralston
8e405dda2e
Fix soft crash when editing message
...
Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2504
2020-04-01 16:22:42 -06:00
Travis Ralston
31ec984c86
Actually appease the linter
2020-04-01 14:49:39 -06:00
Travis Ralston
5c2841323e
Appease the linter by turning it off
2020-04-01 14:45:54 -06:00
Travis Ralston
f2c41a5da7
Silence another console.warn that should have been a log
2020-04-01 14:40:51 -06:00
Travis Ralston
47e5cfecf2
Silence usages of componentWillReceiveProps
...
For https://github.com/vector-im/riot-web/issues/12877
2020-04-01 14:35:39 -06:00