Commit graph

23435 commits

Author SHA1 Message Date
Jeff Huang
08d56e55d4 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-04-15 13:07:28 +00:00
J. Ryan Stinnett
fafe57624c
Merge pull request #4412 from matrix-org/jryans/hide-e2e-info-opt
Remove end-to-end message info option when cross-signing is used
2020-04-15 14:07:22 +01:00
Michael Telatynski
8b25223026 fix onLoggedIn getting called twice
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 13:45:12 +01:00
Michael Telatynski
76ce4081cb i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:31:27 +01:00
Michael Telatynski
346b2e8588 Login block on initialSync with spinners
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:21:49 +01:00
J. Ryan Stinnett
e9c755e73f Remove end-to-end message info option when cross-signing is used
This end-to-end info dialog repeats info available elsewhere and has not been
updated to make sense for cross-signing, triggers old verification methods, etc.
For now, this hides the option to present a more consistent UI.

Relates to https://github.com/vector-im/riot-web/issues/11752
2020-04-15 10:25:05 +01:00
Michael Telatynski
9c1939b756 match all, not just first instance of tokens to escape
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 02:31:30 +01:00
Michael Telatynski
4454db30d6 Escape opening square bracket too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 01:02:08 +01:00
Michael Telatynski
cb10640eaf detslint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:53:35 +01:00
Michael Telatynski
f1def8b0de delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:50:28 +01:00
Michael Telatynski
c72139fc3f Convert serialize and deserialize to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:49:08 +01:00
Michael Telatynski
95eaf94cd8 Fix pills being broken by unescaped characters
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:40:38 +01:00
Michael Telatynski
276b5b874c Convert ShareDialog to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:22:19 +01:00
Michael Telatynski
89bc3bdd5b consolidate and extract copyPlaintext, copyNode and selectText
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:16:11 +01:00
Weblate
6e83255b66 Merge branch 'origin/develop' into Weblate. 2020-04-14 18:56:15 +00:00
Travis Ralston
36fea4d487
Merge pull request #4378 from matrix-org/travis/expanding-widgets
Minimize widgets by default
2020-04-14 12:56:10 -06:00
Weblate
d252d7ac6f Merge branch 'origin/develop' into Weblate. 2020-04-14 18:55:54 +00:00
Travis Ralston
f0a2f5dd4f
Merge pull request #4380 from matrix-org/travis/widget-complaints
Add comments to highlight where we'll need m.widget support
2020-04-14 12:55:49 -06:00
Michael Telatynski
769cf1c987 Allow network dropdown to be scrollable and fix context menu window padding calc
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 17:34:39 +01:00
Weblate
15c64002c1 Merge branch 'origin/develop' into Weblate. 2020-04-14 16:12:21 +00:00
Bruno Windels
69e680da3c
Merge pull request #4407 from matrix-org/bwindels/checkifxsignisdisabledforlegacyverif
Fix: dont try to enable 4S if cross-signing is disabled
2020-04-14 16:12:16 +00:00
Weblate
5a7b976ff5 Merge branch 'origin/develop' into Weblate. 2020-04-14 15:54:49 +00:00
Bruno Windels
aef6687931
Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner
Fix: don't confuse user with spinner during complete security step
2020-04-14 15:54:44 +00:00
Bruno Windels
24fe125cb6 dont try to enable 4S if cross-signing is disabled 2020-04-14 17:53:33 +02:00
Bruno Windels
368737cfd9 fix copyright 2020-04-14 17:41:06 +02:00
Weblate
27c4404e23 Merge branch 'origin/develop' into Weblate. 2020-04-14 15:21:55 +00:00
Bruno Windels
861c449055
Merge pull request #4405 from matrix-org/bwindels/qrcodefix
Fix: avoid potential crash during certain verification paths
2020-04-14 15:21:47 +00:00
Bruno Windels
db09cadb66 remove spinner, change copy, add button placeholder 2020-04-14 17:19:15 +02:00
Weblate
b84e7a875f Merge branch 'origin/develop' into Weblate. 2020-04-14 15:03:30 +00:00
Michael Telatynski
4c7bc61174
Merge pull request #4392 from matrix-org/t3chguy/electron-forward-back
Add riot-desktop shortcuts for forward/back matching browsers&slack
2020-04-14 16:03:24 +01:00
Michael Telatynski
7fa38933cb Merge branches 'develop' and 't3chguy/electron-forward-back' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron-forward-back
 Conflicts:
	src/components/structures/LoggedInView.tsx
2020-04-14 15:54:58 +01:00
Bruno Windels
7b3c34bd12 use js-sdk qr code generation 2020-04-14 16:46:02 +02:00
Weblate
3c7eada6d1 Merge branch 'origin/develop' into Weblate. 2020-04-14 14:08:09 +00:00
Michael Telatynski
fc67d1d775
Merge pull request #4398 from matrix-org/t3chguy/liv
Convert LoggedInView to an ES6 PureComponent Class & TypeScript
2020-04-14 15:08:04 +01:00
Weblate
98026b0ac6 Merge branch 'origin/develop' into Weblate. 2020-04-14 14:02:33 +00:00
Michael Telatynski
8d3119ddb4
Merge pull request #4396 from matrix-org/t3chguy/fix_MVideoBody_FilePanel
Fix width of MVideoBody in FilePanel
2020-04-14 15:02:28 +01:00
Michael Telatynski
26569dea06 Revert "@replaceableComponent"
This reverts commit 50d6551c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:59:20 +01:00
Weblate
4c7c1d1132 Merge branch 'origin/develop' into Weblate. 2020-04-14 13:54:28 +00:00
Michael Telatynski
f8d3073690
Merge pull request #4397 from matrix-org/t3chguy/deps1
Remove unused react-addons-css-transition-group
2020-04-14 14:54:24 +01:00
Michael Telatynski
50d6551c86 @replaceableComponent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:50:09 +01:00
Michael Telatynski
a7d95d396e fix copyright
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:46:04 +01:00
Weblate
fc814293da Merge branch 'origin/develop' into Weblate. 2020-04-14 13:28:34 +00:00
Michael Telatynski
f84c59dea7
Merge pull request #4395 from matrix-org/t3chguy/fix_emoji_tooltip_flicker
Fix emoji tooltip flickering
2020-04-14 14:28:29 +01:00
Weblate
9f4f145869 Merge branch 'origin/develop' into Weblate. 2020-04-14 13:08:32 +00:00
J. Ryan Stinnett
34e2fd42ec
Merge pull request #4374 from matrix-org/jryans/backup-dialog-hellscape
Pass along key backup for bootstrap
2020-04-14 14:08:27 +01:00
Weblate
2d0953604e Merge branch 'origin/develop' into Weblate. 2020-04-14 12:17:36 +00:00
Weblate
b969c4fd2e Merge branch 'origin/develop' into Weblate. 2020-04-14 12:17:32 +00:00
Besnik Bleta
8a1b8b9998 Translated using Weblate (Albanian)
Currently translated at 99.7% (2281 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-04-14 12:17:32 +00:00
Michael Telatynski
6416f404c6
Merge pull request #4403 from matrix-org/t3chguy/fix_e2ee_toggle
Fix create room dialog e2ee private room setting
2020-04-14 13:17:31 +01:00
Michael Telatynski
3aa338f3a2
Merge pull request #4391 from matrix-org/t3chguy/sort_emoji_by_shortcodes
Sort emoji by shortcodes for autocomplete primarily for :-1 and :+1
2020-04-14 13:17:26 +01:00