Zoe
df1fd4db72
suppress private icon if the room is a DM
2020-01-10 16:49:07 +00:00
Zoe
808785c2f8
lint
2020-01-10 16:43:36 +00:00
Zoe
5551b207c1
Actually, this task was about join rules, not encryption ones. Oops.
2020-01-10 16:33:08 +00:00
Zoe
cb250c9b10
Use existing available props data to determine whether a room is encrypted, thereby allowing a state update to properly rerender the tile
2020-01-10 13:09:16 +00:00
Weblate
1222e10c89
Merge branch 'origin/develop' into Weblate.
2020-01-10 11:25:47 +00:00
MamasLT
7f116c1bed
Translated using Weblate (Lithuanian)
...
Currently translated at 47.2% (944 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-01-10 11:25:47 +00:00
Szimszon
abf4a88c66
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2000 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-10 11:25:44 +00:00
Kévin C
a02ecca775
Translated using Weblate (French)
...
Currently translated at 100.0% (2000 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-10 11:25:43 +00:00
Jeff Huang
8f292eb6a4
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2000 of 2000 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-10 11:25:43 +00:00
David Baker
4a78faae4c
Merge pull request #3826 from matrix-org/dbkr/roomview_listener_leak
...
Fix listener leak on RoomView
2020-01-10 11:25:36 +00:00
David Baker
63942d5200
Fix listener leak on RoomView
...
It looks like this was causing entire detached DOM trees to leak
in memory by react's internal fibers holding onto them from the
component.
2020-01-10 11:12:52 +00:00
Aaron Raimist
6cf5b3f1a2
Emoji verification: Change name of 🔒 to lock
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-01-09 21:56:28 -06:00
Travis Ralston
9f04f94c65
Enable e2e and Riot tests, removing Karma
2020-01-09 17:55:57 -07:00
Travis Ralston
3591f802a8
Merge pull request #3824 from matrix-org/travis/sm-misc
...
Regenerate i18n for sourcemaps branch
2020-01-09 17:47:32 -07:00
Travis Ralston
4b65cdf3f2
Regenerate i18n
...
Apparently we need to do this.
2020-01-09 17:40:57 -07:00
Travis Ralston
4c3703a5ea
Merge pull request #3823 from matrix-org/travis/sm-fix-tests
...
Fix tests for sourcemaps branch
2020-01-09 17:38:21 -07:00
Travis Ralston
d7dd67f69e
Remove subtly irrelevant package
2020-01-09 17:28:32 -07:00
Travis Ralston
aa38946166
Actually define some tests in TextualBody's test
...
Jest really wants you to do things the right way.
2020-01-09 17:24:13 -07:00
Travis Ralston
4bc5ada50e
Fix test bootstrap for new skinning approach
2020-01-09 17:23:46 -07:00
Travis Ralston
54f3288dea
Fix imports for tests
...
This doesn't fix the fact that someone called it "peg".
2020-01-09 17:23:27 -07:00
Travis Ralston
4dfbce3108
Fix languageHandler's use of $webapp languages.json for Jest
2020-01-09 17:22:50 -07:00
Travis Ralston
ffd037dfa8
Fix resolution of files for Jest
2020-01-09 17:22:21 -07:00
Travis Ralston
0e8af15b9c
Add webcrypto dep back
...
Probably accidentally merge-conflicted out
2020-01-09 17:15:13 -07:00
Travis Ralston
5f51432987
Convert babel config to a different babel config
...
This is needed because of https://github.com/facebook/jest/issues/6229
2020-01-09 17:14:50 -07:00
Travis Ralston
23eb6cbeb3
Upgrade Jest and babel-jest to match js-sdk
...
This also magically gets rid of a ton of errors
2020-01-09 16:17:27 -07:00
Travis Ralston
a8c8406ac4
Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps
2020-01-09 16:06:46 -07:00
Travis Ralston
a27f2d8379
Merge pull request #3817 from matrix-org/travis/sourcemaps-develop
...
Sourcemaps: develop -> feature branch
2020-01-09 14:59:22 -07:00
Travis Ralston
135c84251c
Fix more imports post-merge
2020-01-09 14:19:19 -07:00
Travis Ralston
dc914774fb
Delete files that were conflicting in the merge and deleted on develop
2020-01-09 14:19:19 -07:00
Travis Ralston
a6376461d0
Use yarn's updated lockfile
...
Didn't manually handle this conflict, just let yarn do its thing.
2020-01-09 14:19:19 -07:00
Travis Ralston
19f78d4d97
Fix class construction in MemberList
2020-01-09 14:17:33 -07:00
Travis Ralston
727ce892de
Fix remaining RoomView conflict
...
RoomContext was pulled out to its own file.
2020-01-09 14:17:33 -07:00
Travis Ralston
3e5cc9550b
Fix import merge conflicts, removing any that aren't needed anymore
...
Many imports were removed as part of refactoring work, so here we are.
2020-01-09 14:17:33 -07:00
Travis Ralston
a0da13200f
Fix conflicts in package.json
...
We removed the emojistrip script
2020-01-09 14:15:16 -07:00
Travis Ralston
fde32f13a5
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
Weblate
96125a6cbd
Merge branch 'origin/develop' into Weblate.
2020-01-09 21:14:00 +00:00
Travis Ralston
d40091afc5
Merge pull request #3820 from matrix-org/travis/ftue/user-lists/4.5.5-paste
...
Support pasting a bunch of identifiers into the invite dialog
2020-01-09 14:13:55 -07:00
Weblate
664c505c2f
Merge branch 'origin/develop' into Weblate.
2020-01-09 21:13:37 +00:00
Travis Ralston
ad33a2322e
Merge pull request #3819 from matrix-org/travis/ftue/user-lists/4.5-3pids
...
Support 3PIDs (email addresses) in the invite dialog
2020-01-09 14:13:32 -07:00
Travis Ralston
6ca9a7c998
Merge pull request #3766 from matrix-org/travis/babel7-wp-es6-fixes
...
Misc fixes for ES6 imports/exports
2020-01-09 14:00:59 -07:00
Weblate
57dd462807
Merge branch 'origin/develop' into Weblate.
2020-01-09 20:57:32 +00:00
catborise
5b1246324e
Translated using Weblate (Turkish)
...
Currently translated at 58.2% (1162 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-09 20:57:32 +00:00
Osoitz
8a2efd77ed
Translated using Weblate (Basque)
...
Currently translated at 100.0% (1998 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-01-09 20:57:29 +00:00
Travis Ralston
ba73600cf0
Merge pull request #3815 from matrix-org/travis/ftue/user-lists/4-composer
...
Wire up the invite targets dialog to a real composer and show selections
2020-01-09 13:57:22 -07:00
Travis Ralston
4e4871c281
Move lang import to the top of the file
2020-01-09 13:56:25 -07:00
David Baker
5019eff1e3
Don't allow upgrade from untrusted key backup.
...
If we trust the key backup at upgrade time then we can sign it so
key backup will work automatically when cross-signing is trusted.
If we don't sign it at this point we'll end up with cross-signing
and key backup set up but key backup untrusted by the cross-signing
key which is a bit of a broken situation.
With https://github.com/matrix-org/matrix-js-sdk/pull/1144 fixes
https://github.com/vector-im/riot-web/issues/11747
2020-01-09 20:49:37 +00:00
Travis Ralston
2caebef7a1
Make the SVG smaller
2020-01-09 13:40:35 -07:00
Travis Ralston
cb9e4376b8
Fix flow comment
2020-01-09 13:39:50 -07:00
Travis Ralston
94e9c6ac9f
Make the SVG smaller
2020-01-09 13:38:47 -07:00
Travis Ralston
f452ea225a
FlowJS is not Flow
2020-01-09 12:31:16 -07:00