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
1222e10c89
Merge branch 'origin/develop' into Weblate.
2020-01-10 11:25:47 +00:00
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
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
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
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
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
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
6cf5b3f1a2
Emoji verification: Change name of 🔒 to lock
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2020-01-09 21:56:28 -06:00
4b65cdf3f2
Regenerate i18n
...
Apparently we need to do this.
2020-01-09 17:40:57 -07:00
4dfbce3108
Fix languageHandler's use of $webapp languages.json for Jest
2020-01-09 17:22:50 -07:00
a8c8406ac4
Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps
2020-01-09 16:06:46 -07:00
135c84251c
Fix more imports post-merge
2020-01-09 14:19:19 -07:00
dc914774fb
Delete files that were conflicting in the merge and deleted on develop
2020-01-09 14:19:19 -07:00
19f78d4d97
Fix class construction in MemberList
2020-01-09 14:17:33 -07:00
727ce892de
Fix remaining RoomView conflict
...
RoomContext was pulled out to its own file.
2020-01-09 14:17:33 -07:00
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
fde32f13a5
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
96125a6cbd
Merge branch 'origin/develop' into Weblate.
2020-01-09 21:14:00 +00:00
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
664c505c2f
Merge branch 'origin/develop' into Weblate.
2020-01-09 21:13:37 +00:00
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
57dd462807
Merge branch 'origin/develop' into Weblate.
2020-01-09 20:57:32 +00:00
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
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
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
4e4871c281
Move lang import to the top of the file
2020-01-09 13:56:25 -07:00
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
cb9e4376b8
Fix flow comment
2020-01-09 13:39:50 -07:00
f452ea225a
FlowJS is not Flow
2020-01-09 12:31:16 -07:00
5d22561815
Display a padlock icon beside encrypted rooms in the room list
...
https://github.com/vector-im/riot-web/issues/11226
2020-01-09 15:42:31 +00:00
3f5663071a
Merge branch 'origin/develop' into Weblate.
2020-01-09 12:26:22 +00:00
e0d80fb8b2
Translated using Weblate (Swedish)
...
Currently translated at 76.8% (1535 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2020-01-09 12:26:22 +00:00
245a68b3ba
Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody
...
Conflicts:
yarn.lock
2020-01-09 12:17:21 +00:00
8116ac74ce
Update src/components/views/context_menus/MessageContextMenu.js
...
Co-Authored-By: Travis Ralston <travpc@gmail.com >
2020-01-09 12:10:44 +00:00
9b8ce0de52
Merge branch 'origin/develop' into Weblate.
2020-01-09 04:38:44 +00:00
9cd364b0e2
Translated using Weblate (Swedish)
...
Currently translated at 76.3% (1525 of 1998 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2020-01-09 04:38:44 +00:00
27468a4abc
Translated using Weblate (Bulgarian)
...
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/bg/
2020-01-09 04:38:38 +00:00
1d9d706b9c
Merge pull request #3789 from matrix-org/t3chguy/render_html_entities_in_og-description
...
Render encoded html entities in og:description
2020-01-08 21:38:31 -07:00
4ad4437f33
Support pasting a bunch of identifiers into the invite dialog
...
Part of https://github.com/vector-im/riot-web/issues/11199
2020-01-08 21:21:08 -07:00
6e5de1893b
Bind handlers to this
2020-01-08 21:01:53 -07:00
ab5d82b5ac
Appease the linter
2020-01-08 20:53:20 -07:00
79ab69353c
Support searching for 3PIDs from the invite dialog
...
Part of https://github.com/vector-im/riot-web/issues/11199
2020-01-08 20:49:29 -07:00
36b7be920b
Merge branch 'travis/sourcemaps' into travis/babel7-wp-es6-fixes
2020-01-08 14:42:01 -07:00
59f608ffd6
Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export
...
Convert CommonJS exports to ES6 exports
2020-01-08 09:09:11 -07:00
9aab1503a5
Merge pull request #3764 from matrix-org/travis/babel7-wp-es6-imports-2
...
Round 2 of CommonJS to ES6 imports
2020-01-08 09:08:36 -07:00
96cb1ddff5
Use a regex that actually works
2020-01-08 10:52:03 +00:00
bd336b0710
Use a regex because it's simpler and works
...
and my loop did not because I meant 'or', not 'and'
2020-01-08 10:51:58 +00:00
f31cc7dfee
Strip all variation selectors on emoji
...
...when inserting into or looking up in the unicode to emoji map.
This broke with emojibase 4.2.0 which changed the type of a whole
load of emojis to 'text' when previously they were 'emoji'. This
caused them to get the 'text' variant of the unicode string which
has the text variation selector (15) appended instead of the emoji
variation selector (16). We were only stripping the emoji selector,
so upgrading to 4.2.0 caused riot to fail to find the heart in the
unicode map, which therefore prevented the app from starting.
2020-01-08 10:51:52 +00:00
9b5d774bf0
Merge branch 'origin/develop' into Weblate.
2020-01-08 10:30:05 +00:00
Zoe