OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
21,828 Commits
222 Branches
563 Tags
472 MiB
Commit Graph

21828 Commits (91b85cd0605e3e685ed16e387f778ada3b4a7065)

Author SHA1 Message Date
Michael Telatynski d585dbab02 Merge branches 'develop' and 't3chguy/s1' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/s1 2020-02-04 15:48:04 +00:00
Michael Telatynski e23a3e98be Only enumerate settings handlers which are supported currently 2020-02-04 15:27:38 +00:00
Zoe d822104159
Merge pull request #4010 from matrix-org/foldleft/11968-verify-verification 
double-check user verification
 2020-02-04 13:47:32 +00:00
Michael Telatynski fff35fd2c9
Merge pull request #4031 from matrix-org/t3chguy/missing_dep 
Use minimist instead of optimist as it is deprecated
 2020-02-04 11:32:32 +00:00
Michael Telatynski 3a2cf87791
Merge pull request #4032 from matrix-org/t3chguy/watcher_id 
SettingsStore, use a counter instead of wall clock for watcher ids
 2020-02-04 11:32:12 +00:00
Zoe 544479a6ee test code cleaned up slightly 2020-02-04 11:31:16 +00:00
Zoe 150fe7a45a Tests for MKeyVerificationConclusion 2020-02-04 11:25:19 +00:00
Michael Telatynski f6c7df8c69 Keep date in Watcher IDs 2020-02-04 11:14:49 +00:00
Michael Telatynski e65404b631 Explicitly (not transitively) depend on minimist as bin script uses it 2020-02-04 11:13:18 +00:00
Michael Telatynski 2d8a2c5210 Merge branches 'develop' and 't3chguy/watcher_id' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/watcher_id 2020-02-04 10:47:53 +00:00
Michael Telatynski 3dd5986656 Merge branches 'develop' and 't3chguy/missing_dep' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/missing_dep 2020-02-04 10:47:27 +00:00
Michael Telatynski a8f7e381eb SettingsStore, use a counter instead of wall clock for watcher ids 2020-02-04 10:41:48 +00:00
Michael Telatynski b099c983d6 Use minimist instead of optimist as it is deprecated 2020-02-04 10:16:39 +00:00
Travis Ralston bf9d5b7f01
Merge pull request #4027 from matrix-org/travis/fix-room-list 
Don't crash immediately if the room directory chunk is null/empty
 2020-02-04 09:36:12 +00:00
Zoe fab54ab936
Merge pull request #3998 from matrix-org/zip/12038-toast-timeouts 
Fix verification toast to close at 0s
 2020-02-04 09:30:47 +00:00
BobVul 1df6837649 Missing semicolon 2020-02-04 10:38:43 +11:00
Zoe 41f4b38fe8 Do not show alarming red shields on large encrypted rooms for your own device 
Fixes: https://github.com/vector-im/riot-web/issues/12214
 2020-02-03 16:53:32 +00:00
Travis Ralston aa6eabcf57 Don't crash immediately if the room directory chunk is null/empty 
Fixes https://github.com/vector-im/riot-web/issues/12197
 2020-02-03 15:49:18 +00:00
David Baker 9bfed510b1
Merge pull request #4026 from matrix-org/dbkr/tagorderstore_leak 
Fix listener leak in TagPanel
 2020-02-03 15:39:12 +00:00
David Baker 11cb3a60b2 Fix listener leak in TagPanel 2020-02-03 13:33:44 +00:00
David Baker f0d306b07c
Merge pull request #4025 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-02-03 10:02:57 +00:00
catborise fb6bb2fd6b Translated using Weblate (Turkish) 
Currently translated at 70.7% (1486 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-02-03 09:43:38 +00:00
random f0bd75fcfb Translated using Weblate (Italian) 
Currently translated at 94.5% (1986 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-02-03 09:43:36 +00:00
Szimszon c879d4c0ab Translated using Weblate (Hungarian) 
Currently translated at 94.4% (1984 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-02-03 09:43:34 +00:00
Kévin C ee9f3c9e18 Translated using Weblate (French) 
Currently translated at 100.0% (2101 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-02-03 09:43:31 +00:00
J. A. Durieux a71c368994 Translated using Weblate (Dutch) 
Currently translated at 79.3% (1667 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-03 09:43:31 +00:00
Jeff Huang a31be025cf Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2101 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-03 09:43:29 +00:00
unknown 20fc8514a5 I have added spacing, as devices are very hard to read otherwise 2020-02-02 18:47:16 +01:00
unknown aa52118fa1 the width was not properly set to other languages than english, a min-width will keep the proper size of the button while leaving some room for more word expensive languages such as french 2020-02-02 17:31:06 +01:00
Bob 9cf53aa9d8 Only return formatted text when necessary (for escaped chars) 
Signed-off-by: Bob Rao <bob+git@vulpin.com>
 2020-02-02 16:34:19 +11:00
Weblate 5dfabb9f18 Merge branch 'origin/develop' into Weblate. 2020-02-01 12:49:20 +00:00
J. Ryan Stinnett ffc3cdf7b5 Tweak emoji sizes 2020-02-01 13:49:11 +01:00
Weblate 949eb73c9f Merge branch 'origin/develop' into Weblate. 2020-02-01 12:28:35 +00:00
Osoitz bc2fa4d31b Translated using Weblate (Basque) 
Currently translated at 97.7% (2053 of 2101 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-01 12:28:35 +00:00
David Baker 8b0e8571be
Merge pull request #4023 from matrix-org/dbkr/honor_islogin_system_theme 
Honour the isLogin flag in theme.js
 2020-02-01 12:28:23 +00:00
David Baker a3ef0aa6e8 Honour the isLogin flag in theme.js 
Horrendous hack to fix the fact that if 'match system theme' was
set, the isLogin flag in the controller would do nothing because
theme.js would have decided to use the system theme before even
asking what the theme setting was.
 2020-02-01 12:09:41 +00:00
Weblate 1db608e713 Merge branch 'origin/develop' into Weblate. 2020-02-01 11:18:54 +00:00
lissitz e946f5f4b8 Translated using Weblate (Spanish) 
Currently translated at 67.6% (1420 of 2100 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-02-01 11:18:54 +00:00
Jeff Huang 455b4f9a40 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2100 of 2100 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-02-01 11:18:53 +00:00
Osoitz dad44d0b1f Translated using Weblate (Basque) 
Currently translated at 93.5% (1964 of 2100 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-01 11:18:52 +00:00
Matthew Hodgson 4c426faedc
Merge pull request #4022 from matrix-org/poljar/eventindex-roomcount 
ManageEventIndexDialog: Show how many rooms are being currently crawled.
 2020-02-01 12:18:44 +01:00
Damir Jelić d8576f23de ManageEventINdexDialog: Fix a line length issue. 2020-02-01 12:11:49 +01:00
Damir Jelić 75fe3c2219 ManageEventIndexDialog: Show how many rooms are being currently crawled. 2020-02-01 12:01:53 +01:00
Weblate 00ca4458f6 Merge branch 'origin/develop' into Weblate. 2020-02-01 00:22:25 +00:00
lissitz 6e33d35e87 Translated using Weblate (Spanish) 
Currently translated at 66.5% (1396 of 2100 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-02-01 00:22:25 +00:00
lissitz 8c9af0dec6 Translated using Weblate (Czech) 
Currently translated at 87.8% (1844 of 2100 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-02-01 00:22:16 +00:00
Travis Ralston 98c8986ead
Merge pull request #4021 from matrix-org/travis/fix-scan-temp 
Advertise that we can scan QR codes even though we can't
 2020-02-01 00:22:10 +00:00
Weblate 26e41ec97c Merge branch 'origin/develop' into Weblate. 2020-01-31 19:13:21 +00:00
catborise 3f706c0eda Translated using Weblate (Turkish) 
Currently translated at 70.0% (1469 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-31 19:13:21 +00:00
Matthew Hodgson ade8015b2a
Merge pull request #4020 from matrix-org/poljar/eventindex-er 
Checkpoint addition fixes and return of the crawler sleep time setting.
 2020-01-31 20:13:15 +01:00