Travis Ralston
5fd27a10bb
Merge branch 'develop' into travis/sourcemaps
2020-01-13 11:19:41 -07: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
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
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
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
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