PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
25780 commits 1 branch 0 tags 338 MiB
Commit graph

25780 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
ee6af6ae9e Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 17:17:18 +01:00
David Baker
a1592704a2 Unused code & import 2020-06-19 17:17:04 +01:00
Weblate
3b75eb173c Merge branch 'origin/develop' into Weblate. 2020-06-19 16:06:15 +00:00
random
a1cb070c60 Translated using Weblate (Italian) 
Currently translated at 99.9% (2281 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-19 16:06:15 +00:00
Szimszon
e4521a4d81 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-19 16:06:15 +00:00
XoseM
db14729489 Translated using Weblate (Galician) 
Currently translated at 79.8% (1822 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-19 16:06:14 +00:00
Kévin C
4948e49f76 Translated using Weblate (French) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-19 16:06:09 +00:00
David Baker
87ab0f9830
Merge pull request #4762 from matrix-org/dbkr/fix_verification_race 
Look for existing verification requests after login
 2020-06-19 17:06:02 +01:00
David Baker
3f936a1fe4 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 16:50:29 +01:00
Weblate
4e92472f73 Merge branch 'origin/develop' into Weblate. 2020-06-19 08:48:50 +00:00
Victor Grousset
c7f72f0d00 Translated using Weblate (Esperanto) 
Currently translated at 98.7% (2252 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-06-19 08:48:49 +00:00
Jeff Huang
95dadca8e8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-19 08:48:49 +00:00
Damir Jelić
e3ae05b6b9 Merge branch 'poljar/eventindex-user-version' into develop 2020-06-19 09:50:40 +02:00
Damir Jelić
253212d8c8 Merge remote-tracking branch 'origin/poljar/eventindex-new-encrypted-rooom' into develop 2020-06-19 09:50:22 +02:00
Damir Jelić
ec4b350a82 Merge remote-tracking branch 'origin/poljar/seshat-search-pagination' into develop 2020-06-19 09:50:03 +02:00
Hubert Chathi
c690cfc6c5 mark messages with a black shield if the megolm session isn't trusted 2020-06-18 21:57:33 -04:00
Weblate
8b0bc522da Merge branch 'origin/develop' into Weblate. 2020-06-18 22:53:47 +00:00
Travis Ralston
f136ba4a98
Merge pull request #4796 from matrix-org/travis/room-list/bug/crash-filter 
Fix crash when filtering new room list too fast
 2020-06-18 16:53:42 -06:00
Weblate
ff7d1a0034 Merge branch 'origin/develop' into Weblate. 2020-06-18 22:20:18 +00:00
Michael Telatynski
e723d6115c
Merge pull request #4795 from matrix-org/t3chguy/hide_unknown_rooms_search 
hide search results from unknown rooms
 2020-06-18 23:20:12 +01:00
Weblate
6112018401 Merge branch 'origin/develop' into Weblate. 2020-06-18 21:59:47 +00:00
Travis Ralston
47fd7ab06c
Merge pull request #4794 from matrix-org/travis/room-list/mvp 
Mark the new room list as ready for general testing
 2020-06-18 15:59:42 -06:00
Travis Ralston
7191c01265 Fix crash when filtering new room list too fast 
Fixes https://github.com/vector-im/riot-web/issues/14092

We were simply assuming we had a reference to a notification state, which might not be the case if we're between renders.
 2020-06-18 15:52:55 -06:00
Michael Telatynski
3ac028565b i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:50:10 +01:00
Michael Telatynski
eec42cff49 tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:49:39 +01:00
Travis Ralston
847f12c289 Update i18n 2020-06-18 15:47:30 -06:00
Travis Ralston
0e9ef8804d Mark the new room list as ready for general testing 2020-06-18 15:46:37 -06:00
Michael Telatynski
045def4566 hide search results from unknown rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:45:42 +01:00
Weblate
712f10c76d Merge branch 'origin/develop' into Weblate. 2020-06-18 18:36:48 +00:00
vicdorke
a09779063c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 60.5% (1382 of 2283 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2020-06-18 18:36:48 +00:00
Michael Telatynski
69c5aecfc7
Merge pull request #4784 from bocoup/extend-querymatcher-heuristic 
Extend QueryMatcher's sorting heuristic
 2020-06-18 19:36:42 +01:00
Mike Pennisi
2e0cb4746a fixup! Extend QueryMatcher's sorting heuristic 2020-06-18 14:20:40 -04:00
Mike Pennisi
4ffc54d143 fixup! Extend QueryMatcher's sorting heuristic 2020-06-18 13:24:02 -04:00
Jorik Schellekens
37b299412f Fix merge conflicts 2020-06-18 15:47:26 +01:00
Jorik Schellekens
f2440388b1 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 15:37:01 +01:00
Jorik Schellekens
b9fb9aae4a Rename MessagePreview to EventTilePreview 2020-06-18 15:36:23 +01:00
Jorik Schellekens
0d3ea6c9d4 Merge branch 'joriks/font-scaling-message-preview' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-message-preview 2020-06-18 15:34:03 +01:00
Jorik Schellekens
997c7ffc96 Add missing semicolons 2020-06-18 15:26:53 +01:00
Jorik Schellekens
15881fc7d0
Merge branch 'develop' into joriks/font-scaling-message-preview 2020-06-18 15:19:28 +01:00
Jorik Schellekens
adfe1ac9bf Remove stray debug 2020-06-18 15:13:28 +01:00
David Baker
5a310cfd85
Merge pull request #4793 from matrix-org/revert-4686-rel-2 
Revert "Use recovery keys over passphrases"
 2020-06-18 15:12:56 +01:00
David Baker
9b9e6e04e3 Merge remote-tracking branch 'origin/develop' into dbkr/fix_verification_race 2020-06-18 15:12:06 +01:00
Weblate
f6e55345a1 Merge branch 'origin/develop' into Weblate. 2020-06-18 14:08:30 +00:00
Jorik Schellekens
29d0cfc0b0
Merge pull request #4791 from matrix-org/joriks/semicolon 
Lint ts semicolons (aka. The great semicolon migration)
 2020-06-18 15:08:25 +01:00
David Baker
e4d824839a Revert "Use recovery keys over passphrases" 2020-06-18 15:02:03 +01:00
Jorik Schellekens
ba0bc8f29c Resolve "The Great Conflict" 2020-06-18 14:55:24 +01:00
Jorik Schellekens
291997421b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/semicolon 2020-06-18 14:54:20 +01:00
Jorik Schellekens
74174041bb Remove semicolon in style 2020-06-18 14:53:12 +01:00
Weblate
199f776e58 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:51:27 +00:00
David Baker
5b27a570a8
Merge pull request #4790 from matrix-org/revert-4686-dbkr/recovery_keys_over_passphrases 
Revert "Use recovery keys over passphrases"
 2020-06-18 14:51:22 +01:00