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

25757 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Weblate
08fd9cda4f Merge branch 'origin/develop' into Weblate. 2020-06-18 13:48:51 +00:00
Travis Ralston
c26513b1e3
Merge pull request #4783 from matrix-org/travis/room-list/sticky-headers-reliability 
Clear `top` when not sticking headers to the top
 2020-06-18 07:48:46 -06:00
Travis Ralston
8f3a6fc30e
Consistent quotes 2020-06-18 07:48:36 -06:00
Weblate
9a05f5bc03 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:46:37 +00:00
Travis Ralston
4a5cc8557c
Merge pull request #4785 from matrix-org/travis/room-list/show-less-is-more 
Don't show a 'show less' button when it's impossible to collapse
 2020-06-18 07:46:32 -06:00
Weblate
c6eaac8b80 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:46:18 +00:00
Travis Ralston
b857c9d199
Merge pull request #4786 from matrix-org/travis/room-list/show-n-reliability 
Fix show less/more button occluding the list automatically
 2020-06-18 07:46:13 -06:00
Weblate
385d784036 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:46:08 +00:00
Travis Ralston
87aece9997
Merge pull request #4787 from matrix-org/travis/room-list/performance-2 
Improve room switching in the new room list
 2020-06-18 07:46:03 -06:00
Weblate
a1db9dd352 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:35:07 +00:00
Szimszon
45a6bf3a6d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-18 13:35:07 +00:00
XoseM
f1365a8d30 Translated using Weblate (Galician) 
Currently translated at 76.1% (1740 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-18 13:35:07 +00:00
Kévin C
5ceae3085c Translated using Weblate (French) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-18 13:35:04 +00:00
Jeff Huang
9b90dcd1a8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-18 13:35:04 +00:00
David Baker
27a9a7b4c1
Merge pull request #4789 from matrix-org/dbkr/remove_ssss_secret_cache_option 
Remove labs option to cache 'passphrase'
 2020-06-18 14:34:59 +01:00
Jorik Schellekens
05d0309081 Lint a few semicolons 2020-06-18 14:32:43 +01:00
Jorik Schellekens
9760f94ff5 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 14:04:31 +01:00
Jorik Schellekens
69969dfee8 Respond to review 
- remove all refs to getsdk
- i18n
- some lints
 2020-06-18 13:58:35 +01:00