OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
23,669 Commits
218 Branches
563 Tags
476 MiB
Commit Graph

23669 Commits (4adbfce92db9df8221c9ce142909feeb2d20e2a6)

Author SHA1 Message Date
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
Michael Telatynski e114effcfa make code more readable as per pr suggestion 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-14 13:07:44 +01:00
Weblate 1483173193 Merge branch 'origin/develop' into Weblate. 2020-04-14 12:06:18 +00:00
Besnik Bleta 408dad0f8b Translated using Weblate (Albanian) 
Currently translated at 99.3% (2273 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:06:17 +00:00
Besnik Bleta bf8478fd36 Translated using Weblate (Albanian) 
Currently translated at 99.3% (2273 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:06:17 +00:00
Michael Telatynski 17a893adc5
Merge pull request #4390 from matrix-org/t3chguy/fix_cmd_no_typing 
Fix invalid commands when figuring out whether to set isTyping
 2020-04-14 13:06:10 +01:00
Michael Telatynski 09d56e7bbc Fix create room dialog e2ee private room setting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-14 13:05:23 +01:00
Weblate ca6baf85c5 Merge branch 'origin/develop' into Weblate. 2020-04-14 11:17:57 +00:00
rkfg 36587d98ea Translated using Weblate (Russian) 
Currently translated at 90.2% (2062 of 2285 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-14 11:17:57 +00:00
Nils J. Haugen 24e81687b3 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 58.9% (1346 of 2285 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2020-04-14 11:17:57 +00:00
random a049a602f2 Translated using Weblate (Italian) 
Currently translated at 100.0% (2285 of 2285 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-04-14 11:17:56 +00:00
Maik Wagner 30b473bf6b Translated using Weblate (German) 
Currently translated at 76.0% (1737 of 2285 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-14 11:17:55 +00:00
Osoitz 882aefb94c Translated using Weblate (Basque) 
Currently translated at 100.0% (2285 of 2285 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-04-14 11:17:54 +00:00
Michael Telatynski e5d4ab9fdb
Merge pull request #4389 from matrix-org/t3chguy/deop_fail 
op/deop return error if trying to affect an unknown user
 2020-04-14 12:17:45 +01:00
Michael Telatynski 46f7fadf3f delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-13 14:33:45 +01:00
Michael Telatynski 96c067a6c4 prefer protected over private so that the class can be extended 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-13 14:30:52 +01:00
Michael Telatynski 368e3f9e85 Convert LoggedInView to TypeScript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-13 14:29:00 +01:00
Michael Telatynski 379aeb667c Convert LoggedInView to a PureComponent class 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-13 14:13:27 +01:00
Michael Telatynski 4fc88d69a3 Remove unused react-addons-css-transition-group 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-12 01:04:54 +01:00
Michael Telatynski 3e057070fd Fix width of MVideoBody in FilePanel 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-12 00:56:21 +01:00
Michael Telatynski 71b4aab5dc Fix emoji tooltip flickering because onMouseOut&onMouseOver fired when moving between children 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-12 00:12:58 +01:00
Michael Telatynski 7e996cb91c Add riot-desktop shortcuts for forward/back matching browsers&slack 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-11 18:57:59 +01:00