ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-11 02:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,531 Commits 208 Branches 566 Tags
t3chguy/react18/createRoot
Commit Graph

62531 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate d03d228411 Merge branch 'origin/develop' into Weblate. 2020-10-02 17:29:23 +00:00
Michael Telatynski 489c5b9b0a Merge pull request #5276 from michel-zimmer/room-directory-clipped-uris 
Fix room directory clipping links in the room's topic
 2020-10-02 18:29:19 +01:00
Weblate aeba605816 Merge branch 'origin/develop' into Weblate. 2020-10-02 17:19:10 +00:00
Michael Telatynski a6246a7e9f Merge pull request #5278 from matrix-org/t3chguy/fix/15362 
Decorate failed e2ee downgrade attempts better
 2020-10-02 18:19:05 +01:00
Weblate 5ca3b8648e Merge branch 'origin/develop' into Weblate. 2020-10-02 17:18:40 +00:00
Michael Telatynski 6caf53bd1e Merge pull request #5262 from matrix-org/t3chguy/fix/15286 
MELS use latest avatar rather than the first avatar
 2020-10-02 18:18:36 +01:00
Weblate 4e095fb57b Merge branch 'origin/develop' into Weblate. 2020-10-02 17:18:25 +00:00
Michael Telatynski f01ea32397 Merge pull request #5261 from matrix-org/t3chguy/fix/15279 
Fix Encryption Panel close button clashing with Base Card
 2020-10-02 18:18:20 +01:00
Michel Zimmer 58bbbf31b9 Fix room directory clipping links in the room's topic 
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
 2020-10-02 18:00:58 +02:00
Michael Telatynski cc43de6ebf add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 16:46:27 +01:00
Michael Telatynski 7d11c3092d Decorate failed e2ee downgrade attempts better 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 16:38:02 +01:00
Michael Telatynski d3cbb51ecb Use Own Profile Store for the Profile Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 15:39:34 +01:00
Tulir Asokan 2bb7b6535f Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-10-02 17:28:45 +03:00
Weblate d7d3003366 Merge branch 'origin/develop' into Weblate. 2020-10-02 13:30:30 +00:00
@a2sc:matrix.org 62a62b0289 Translated using Weblate (German) 
Currently translated at 100.0% (2370 of 2370 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-10-02 13:30:30 +00:00
FeralMeow b50fcd98f6 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.3% (2307 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hans/
 2020-10-02 13:30:30 +00:00
Travis Ralston fd441f7bba Merge pull request #5275 from matrix-org/travis/e2e/skip-if-not-possible 
Wrap canEncryptToAllUsers in a try/catch to handle server errors
 2020-10-02 07:30:23 -06:00
Hubert Chathi bd9cebe35d oh right, I need to run the i18n script too 2020-10-01 21:52:28 -04:00
Hubert Chathi dd57e94c68 Merge remote-tracking branch 'upstream/develop' into dehydration 2020-10-01 21:42:28 -04:00
Hubert Chathi 0db81e4093 add a feature flag for dehydration 2020-10-01 21:41:03 -04:00
Hubert Chathi 503f32948c try to unlock secret storage with dehydration key 2020-10-01 21:40:49 -04:00
Travis Ralston 60d5e732d9 Wrap canEncryptToAllUsers in a try/catch to handle server errors 
Fixes https://github.com/vector-im/element-web/issues/12266
 2020-10-01 18:58:13 -06:00
Weblate ee230cfbdb Merge branch 'origin/develop' into Weblate. 2020-10-01 20:02:11 +00:00
Travis Ralston c6834fd428 Merge pull request #5274 from matrix-org/travis/fix-community-join 
Fix conditional on communities prototype room creation dialog
 2020-10-01 14:02:06 -06:00
Travis Ralston 153e63b6aa Fix conditional on communities prototype room creation dialog 2020-10-01 13:44:16 -06:00
Weblate f30ae8af12 Merge branch 'origin/develop' into Weblate. 2020-10-01 16:59:32 +00:00
Michael Telatynski e52e33f5a1 Merge pull request #5271 from matrix-org/t3chguy/fix/14851 
Fix ensureDmExists for encryption detection
 2020-10-01 17:59:27 +01:00
Weblate 910ab3583f Merge branch 'origin/develop' into Weblate. 2020-10-01 16:16:17 +00:00
Travis Ralston 5f353c4907 Merge pull request #15102 from vector-im/travis/widget-api 
Switch to using the Widget API SDK for Jitsi widgets
 2020-10-01 10:16:11 -06:00
Weblate 36ea650717 Merge branch 'origin/develop' into Weblate. 2020-10-01 16:16:07 +00:00
Travis Ralston cca9b91aca Merge pull request #5171 from matrix-org/travis/widget-api 
Switch to using the Widget API SDK for widget messaging
 2020-10-01 10:16:01 -06:00
Travis Ralston d640490595 Fix iframe reference 2020-10-01 10:03:52 -06:00
Travis Ralston 0570deffa2 Fix iterableUnion types 2020-10-01 10:01:13 -06:00
Travis Ralston 9cb823b210 Fix join button 2020-10-01 09:59:13 -06:00
Michael Telatynski c73ef57887 Update copy for redact permission 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 15:51:35 +01:00
Michael Telatynski 4bd7ae5131 Show server errors from saving profile settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 15:49:22 +01:00
Michael Telatynski 245ead48b8 Fix ensureDmExists for encryption detection 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 15:11:01 +01:00
Weblate 947c6b2365 Merge branch 'origin/develop' into Weblate. 2020-10-01 13:40:32 +00:00
Michael Telatynski 7b71db94e0 Merge pull request #15352 from vector-im/t3chguy/remove-workbox 
Remove workbox
 2020-10-01 14:40:26 +01:00
Weblate ad5490e7e8 Merge branch 'origin/develop' into Weblate. 2020-10-01 13:29:56 +00:00
J. Ryan Stinnett 0f2c08f532 Merge pull request #5269 from matrix-org/jryans/auto-link-release 
Ensure package links exist when releasing
 2020-10-01 14:29:51 +01:00
Michael Telatynski af383c5a80 null-guard defaultAvatarUrlForString 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:25:20 +01:00
J. Ryan Stinnett 93daacde88 Ensure package links exist when releasing 2020-10-01 14:13:45 +01:00
Michael Telatynski ad95d1fa64 Update yarn.lock 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:06:28 +01:00
Michael Telatynski cfee4c925a Revert "Attempt to fix tests some more" 
This reverts commit c76a5f2c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:05:07 +01:00
Michael Telatynski 1edbe36547 Revert "Tidy up Service Worker, only run Workbox in production" 
This reverts commit c47532fe

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:04:32 +01:00
Michael Telatynski 87c42934ea Revert "Disable workbox when running in webpack dev server, not in dev mode" 
This reverts commit 11e676ce

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:04:21 +01:00
Michael Telatynski daa755017e Revert "consolidate" 
This reverts commit aa2f3918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 14:04:11 +01:00
Michael Telatynski a9cee7cf70 Fix right panel for peeking rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 12:30:41 +01:00
Weblate 54addd0f4d Merge branch 'origin/develop' into Weblate. 2020-10-01 10:44:47 +00:00