Commit graph

16379 commits

Author SHA1 Message Date
Travis Ralston
0529efc5cd
Merge pull request #3840 from matrix-org/travis/ftue/user-lists/5.1-suggestions
Improve the quality of invite suggestions by filtering out DMs
2020-01-15 10:49:00 -07:00
Travis Ralston
7bfb3686cd
Merge pull request #3839 from matrix-org/travis/sourcemaps
Fix sourcemaps by refactoring the build system
2020-01-15 10:11:33 -07:00
Travis Ralston
8b6a5d37aa Remove simulated error state used for screenshot 2020-01-14 23:35:45 -07:00
Travis Ralston
b9852c7264 Appease the linter 2020-01-14 23:35:07 -07:00
Travis Ralston
443744733d Move DM creation logic into DMInviteDialog
Fixes https://github.com/vector-im/riot-web/issues/11645

The copy hasn't been reviewed by anyone and could probably use some work.
2020-01-14 23:32:00 -07:00
Michael Telatynski
d37c19d785 Fix timing of when Composer considers itself to be modified
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-15 00:27:54 +00:00
Michael Telatynski
5a5a0d2233 Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel 2020-01-15 00:03:18 +00:00
David Baker
fa174512cc
Merge pull request #3837 from matrix-org/dbkr/dont_error_on_unknown_devices
Don't error on unverified/unknown devices.
2020-01-14 17:12:14 +00:00
Zoe
1fd1e4b953
Merge pull request #3835 from matrix-org/zip/11832-more-padlock-icons
Padlock icons in room header (behind feature_cross_signing)
2020-01-14 14:15:46 +00:00
David Baker
f87541a6a9
Merge pull request #3822 from matrix-org/dbkr/key_backup_resign
Don't allow upgrade from untrusted key backup.
2020-01-14 12:18:00 +00:00
David Baker
24552f567e Add primary button to trigger restore flow 2020-01-14 11:52:00 +00:00
David Baker
c91af5ae49 i18n 2020-01-14 11:33:16 +00:00
David Baker
94e4d5bf1f s/sign-in/session/ 2020-01-14 11:32:30 +00:00
David Baker
44ca35296a
Consistent capitalisation
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-14 11:31:00 +00:00
Zoe
f617fb7bbe Place RoomHeader privacy padlocks behind the crosssigning feature flag 2020-01-14 10:31:01 +00:00
Travis Ralston
76183fc8fd Appease the linter 2020-01-13 21:21:18 -07:00
Travis Ralston
b69b284efa Humanize the recent DM rooms ourselves for translations 2020-01-13 21:20:01 -07:00
Travis Ralston
9188183c9b Improve the quality of invite suggestions by filtering out DMs
This helps the small rooms from being scored highly, bringing out users you've not seen in a long while.
2020-01-13 21:04:13 -07:00
Travis Ralston
90c7535a69 Export VIEWS from MatrixChat for riot-web tests 2020-01-13 20:15:58 -07:00
David Baker
14501b748b lint again 2020-01-13 21:58:26 +00:00
David Baker
9a1be1a24d Don't try to set crypto options without crypto enabled 2020-01-13 21:54:14 +00:00
J. Ryan Stinnett
9cedfeb007
Merge pull request #3825 from aaronraimist/lock
Emoji verification: Change name of 🔒 to lock
2020-01-13 21:32:58 +00:00
Travis Ralston
bf6798e109 Appease the linter 2020-01-13 13:28:33 -07:00
Travis Ralston
5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07:00
David Baker
e47240d838 Lint Eastwood 2020-01-13 17:56:40 +00:00
David Baker
d53016e8fc Room padlock decorations only if cross-signing is enabled
Put the padlock decorations behind the labs flag as without the
context of the shields on the room icons they can be a bit misleading
and make people think it means 'encrypted'.
2020-01-13 17:53:49 +00:00
David Baker
76fe87c941 Don't error on unverifie/unknownd devices.
When cross-signing is enabled, we no longer want to fail and
prompt the user to ack every device in the room. All the info should
be conveyed in the shield colour (although isn't fully just yet).

Fixes https://github.com/vector-im/riot-web/issues/11750
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1150
2020-01-13 17:41:58 +00:00
Zoe
397637d59d used classnames module 2020-01-13 15:08:07 +00:00
Zoe
0bd2ecd798 lint 2020-01-13 14:51:10 +00:00
Zoe
e43174c636 Show padlock in room headers for invite-only rooms
Fixes #11832
2020-01-13 14:49:23 +00:00
Christopher
59ea865e8e Added missing semicolon. 2020-01-13 14:29:42 +00:00
Michael Telatynski
66b55495bb Fix right panel buttons highlighting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-13 12:40:45 +00:00
J. Ryan Stinnett
8fc85797a7 Guard against missing members in avatars
Part of https://github.com/vector-im/riot-web/issues/11744
2020-01-13 12:40:40 +00:00
J. Ryan Stinnett
dd652f6af3
Merge pull request #3832 from matrix-org/jryans/community-user-list-fire
Repair community member info panel
2020-01-13 12:38:24 +00:00
J. Ryan Stinnett
77b479d50c Guard against missing members in avatars
Part of https://github.com/vector-im/riot-web/issues/11744
2020-01-13 12:29:10 +00:00
J. Ryan Stinnett
56a7b6c33e
Merge pull request #3831 from matrix-org/jryans/feature-presence-indicator
Add feature flag around the presence indicator in room list
2020-01-13 12:25:00 +00:00
Zoe
edd08c279c
Merge pull request #3821 from matrix-org/zip/11226-padlock-icons
Display a padlock icon beside invite-only rooms (excluding DMs) in the room list
2020-01-13 12:20:32 +00:00
Michael Telatynski
9c686bf501 Fix right panel buttons highlighting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-13 12:15:54 +00:00
Zoe
878c5b5b52 removed unnecessary lint rule 2020-01-13 12:11:19 +00:00
J. Ryan Stinnett
2168e7ec0c Add feature flag around the presence indicator in room list
This adds a feature flag (disabled by default for now) around the room list
presence indicator, as it still needs some tweaking before it's ready for
production use.

Part of https://github.com/vector-im/riot-web/issues/11799
2020-01-13 11:48:55 +00:00
Zoe
422d4cd73a small simplification in code as .getContent() will always return an object 2020-01-13 11:18:24 +00:00
catborise
b3d3f3b09f Translated using Weblate (Turkish)
Currently translated at 64.2% (1285 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-13 09:40:10 +00:00
Alexey Murz Korepov
0065895b9c Translated using Weblate (Russian)
Currently translated at 90.0% (1799 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-01-13 09:40:03 +00:00
Slavi Pantaleev
e1cb7b4f08 Translated using Weblate (Bulgarian)
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/bg/
2020-01-13 09:40:03 +00:00
Osoitz
6266f21a08 Translated using Weblate (Basque)
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/eu/
2020-01-13 09:40:02 +00:00
Christopher
c370b28694 #11378. Added cut/copy and pasting user pills from editor. 2020-01-12 16:19:24 +00:00
Zoe
54c69b4630 this is what we call fast iteration 2020-01-10 17:47:39 +00:00
Z. E. Cat
1b75909cad
Update src/components/views/rooms/RoomTile.js
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
2020-01-10 17:36:33 +00:00
Zoe
fbabe79647 use getContent() instead 2020-01-10 17:35:57 +00:00
Z. E. Cat
fb587cc62c
Update src/components/views/rooms/RoomTile.js
Co-Authored-By: Michael Telatynski <7t3chguy@gmail.com>
2020-01-10 17:33:37 +00:00
Zoe
bebfd60daf Very fastidiously check for null/undefined 2020-01-10 17:22:09 +00:00
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
4b65cdf3f2 Regenerate i18n
Apparently we need to do this.
2020-01-09 17:40:57 -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
a8c8406ac4 Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps 2020-01-09 16:06:46 -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
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
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
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
cb9e4376b8 Fix flow comment 2020-01-09 13:39:50 -07:00
Travis Ralston
f452ea225a
FlowJS is not Flow 2020-01-09 12:31:16 -07:00
Michael Telatynski
0a9d7f43c6 pass the correct phase params for consistency
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-09 15:51:19 +00:00
Michael Telatynski
7dfc392a2b Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel 2020-01-09 15:48:06 +00:00
Zoe
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
Weblate
3f5663071a Merge branch 'origin/develop' into Weblate. 2020-01-09 12:26:22 +00:00
Kenneth Larsson
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
Michael Telatynski
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
Michael Telatynski
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
Weblate
9b8ce0de52 Merge branch 'origin/develop' into Weblate. 2020-01-09 04:38:44 +00:00
Kenneth Larsson
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
Slavi Pantaleev
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
Travis Ralston
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
Travis Ralston
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
Travis Ralston
6e5de1893b Bind handlers to this 2020-01-08 21:01:53 -07:00
Travis Ralston
ab5d82b5ac Appease the linter 2020-01-08 20:53:20 -07:00
Travis Ralston
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
Travis Ralston
36b7be920b Merge branch 'travis/sourcemaps' into travis/babel7-wp-es6-fixes 2020-01-08 14:42:01 -07:00