mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 10:27:06 +03:00
Code Issues Projects Releases Packages Wiki Activity
20727 commits 217 branches 561 tags 443 MiB
Commit graph

20727 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
4cc58c78dd Merge branch 'origin/develop' into Weblate. 2020-01-18 02:13:44 +00:00
Michael Telatynski
a984f9acf3
Merge pull request #3870 from matrix-org/t3chguy/deps 
Remove unused deps and dev-deps
 2020-01-18 02:13:39 +00:00
Michael Telatynski
f228f70987 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/deps 2020-01-18 02:02:51 +00:00
Michael Telatynski
c97de43f69 Remove unused fetch polyfills, querystring, require-json. Move glob to dev-dep 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-18 02:01:45 +00:00
Weblate
dce73503bb Merge branch 'origin/develop' into Weblate. 2020-01-18 01:52:40 +00:00
Jeff Huang
2eaafa71a2 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2035 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-18 01:52:40 +00:00
Michael Telatynski
dd56e56043
Merge pull request #3869 from matrix-org/t3chguy/fix_tests 
Tidy Jest test stuff and dependencies
 2020-01-18 01:52:32 +00:00
Michael Telatynski
9365a9cb30 Remove lolex where its not needed and move to dev-deps. Remove unused optimist 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-18 01:39:14 +00:00
Michael Telatynski
8ba54f5f7d Don't use expect and jest-mock anymore as they're implicit from jest 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-18 01:38:22 +00:00
Travis Ralston
21f8130ebe Prevent the invite dialog from jumping around when elements change 
Part of https://github.com/vector-im/riot-web/issues/11201
 2020-01-17 17:12:35 -07:00
Travis Ralston
df3fe5139d Fix error about MessagePanel not being available for read markers 
Stacktrace:
```
TimelinePanel.js?b9ae:1139 Uncaught (in promise) TypeError: Cannot read property 'getBoundingClientRect' of null
    at Object._getLastDisplayedEventIndex (TimelinePanel.js?b9ae:1139)
    at Object.updateReadMarker (TimelinePanel.js?b9ae:751)
    at Object._callee$ (TimelinePanel.js?b9ae:613)
    at tryCatch (runtime.js?4422:45)
    at Generator.invoke [as _invoke] (runtime.js?4422:271)
    at Generator.prototype.<computed> [as next] (runtime.js?4422:97)
    at asyncGeneratorStep (asyncToGenerator.js?56ef:3)
    at _next (asyncToGenerator.js?56ef:25)
```
 2020-01-17 17:07:37 -07:00
Travis Ralston
3850377e27 Appease the linter 2020-01-17 14:40:33 -07:00
Travis Ralston
2faa4254ba Score users who have recently spoken higher in invite suggestions 
Fixes https://github.com/vector-im/riot-web/issues/11769

The algorithm should be documented in the diff as comments.
 2020-01-17 14:36:23 -07:00
Weblate
06edb1ae1a Merge branch 'origin/develop' into Weblate. 2020-01-17 20:38:49 +00:00
David Baker
5584068c5b
Merge pull request #3865 from matrix-org/dbkr/new_session_toast_feature_flag 
Move feature flag check for new session toast
 2020-01-17 20:38:44 +00:00
David Baker
c7ddba786b Move feature flag check for new session toast 
Forgot the path where it checks on startup. Just put it in recheck which covers everything.

Fixes https://github.com/vector-im/riot-web/issues/11921
 2020-01-17 20:06:44 +00:00
J. Ryan Stinnett
4a82e86859 Adjust secret storage to work before sync 
This adjusts to changed JS SDK APIs that allow secret storage to optionally ask
the server for any account data needed at login.

Fixes https://github.com/vector-im/riot-web/issues/11901
 2020-01-17 17:59:12 +00:00
Weblate
958818d49e Merge branch 'origin/develop' into Weblate. 2020-01-17 16:55:46 +00:00
David Baker
158bf3d1fa
Merge pull request #3863 from matrix-org/dbkr/catch_exception_checkterms 
Catch exception in checkTerms if no ID server
 2020-01-17 16:55:41 +00:00
David Baker
03cb76861f Catch exception in checkTerms if no ID server 
This line will throw if it can't get to the ID server, so move it
inside the catch block too.
 2020-01-17 16:26:47 +00:00
Bruno Windels
716c8ba68f pr feedback 2020-01-17 17:02:31 +01:00
Weblate
09e18be9f7 Merge branch 'origin/develop' into Weblate. 2020-01-17 15:43:28 +00:00
Szimszon
942b391d8e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2035 of 2035 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-17 15:43:28 +00:00
David Baker
6beae0ed39
Merge pull request #3862 from matrix-org/dbkr/catch_exception_cancel_passphrase 
Catch exception if passphrase dialog cancelled
 2020-01-17 15:43:21 +00:00
Bruno Windels
a73b7229a7 fix lint 2020-01-17 16:31:38 +01:00
Bruno Windels
5556cb5749 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-17 16:02:51 +01:00
Bruno Windels
d20db3560a fix import paths after build system refactor 2020-01-17 15:50:27 +01:00
David Baker
d69c5f6a1b Catch exception if passphrase dialog cancelled 
As hopefully explained by comment
 2020-01-17 14:46:20 +00:00
Weblate
bba11c2862 Merge branch 'origin/develop' into Weblate. 2020-01-17 14:24:29 +00:00
J. Ryan Stinnett
1a6be3addd
Merge pull request #3860 from matrix-org/jryans/disable-key-request 
Disable key request dialogs with cross-signing
 2020-01-17 14:24:23 +00:00
Weblate
4ef116b3ce Merge branch 'origin/develop' into Weblate. 2020-01-17 14:17:28 +00:00
David Baker
a525ba57c7
Merge pull request #3859 from matrix-org/dbkr/new_session_toast 
Toasts for new, unverified sessions
 2020-01-17 14:17:22 +00:00
Weblate
0cbb71894b Merge branch 'origin/develop' into Weblate. 2020-01-17 14:09:11 +00:00
David Baker
3a29a5e66c
Merge pull request #3861 from matrix-org/dbkr/suppress_integrationmanagers_error 
Check for a matrixclient before trying to use it
 2020-01-17 14:09:05 +00:00
David Baker
42fe69aec9 Don't check devices if crypto is disabled 2020-01-17 14:08:37 +00:00
J. Ryan Stinnett
9b64686041 Add missing import 2020-01-17 13:50:24 +00:00
Weblate
0de10a6b30 Merge branch 'origin/develop' into Weblate. 2020-01-17 13:50:05 +00:00
Szimszon
5e4dab1f15 Translated using Weblate (Hungarian) 
Currently translated at 99.7% (2026 of 2032 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-17 13:50:05 +00:00
Zoe
264ca1ecba
Merge pull request #3850 from matrix-org/zip/11225-shields-distinguish-encrypt-from-verify 
Room header & message box shields now reflect cross-signing state
 2020-01-17 13:49:59 +00:00
David Baker
066a01ae94 Check for a matrixclient before trying to use it 
Was being caught by the try block but still logging an error to the
console unnecessarily: we should not expect there to necessarily
be a matrix client since we run this from the constructor and
there's a shared instance which could be constructed at any point.
 2020-01-17 13:35:51 +00:00
J. Ryan Stinnett
fb9962b08e Disable key request dialogs with cross-signing 
Cross-signing verification is meant to replace the old key share between devices
flow. This disables it when the cross-signing lab is enabled.

Fixes https://github.com/vector-im/riot-web/issues/11904
 2020-01-17 13:09:10 +00:00
David Baker
9e43abaf3a Toasts for new, unverified sessions 
Fixes https://github.com/vector-im/riot-web/issues/11218
 2020-01-17 11:43:35 +00:00
Zoe
908630c0d9 *rude grumbling noises about @dbkr* 2020-01-17 11:30:45 +00:00
Zoe
d02185e4af whoops, the number of unverified users matters to the logic 2020-01-17 10:22:53 +00:00
Zoe
510b08c88b changed logic to reflect the task 2020-01-17 10:18:50 +00:00
Weblate
154cb372c1 Merge branch 'origin/develop' into Weblate. 2020-01-17 10:16:52 +00:00
Kévin C
8e11389820 Translated using Weblate (French) 
Currently translated at 100.0% (2032 of 2032 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-01-17 10:16:52 +00:00
Jeff Huang
15e5552507 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2028 of 2028 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-01-17 10:16:50 +00:00
Michael Telatynski
e88f062f01
Merge pull request #3857 from matrix-org/t3chguy/Array.concat 
Fix Array.concat undefined
 2020-01-17 10:16:43 +00:00
Michael Telatynski
9877fd9e85
Fix Array.concat undefined 2020-01-17 10:04:38 +00:00