Commit graph

21333 commits

Author SHA1 Message Date
Weblate
01887ef162 Merge branch 'origin/develop' into Weblate. 2020-07-16 11:42:12 +00:00
yuuki-san
d5d0cfe42a Translated using Weblate (Slovak)
Currently translated at 67.1% (1596 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-07-16 11:42:12 +00:00
Michael Telatynski
9db05db951
Merge pull request #4999 from matrix-org/t3chguy/room-list/14503
Fix Room Tile Icon to not ignore DMs in other tags
2020-07-16 12:42:07 +01:00
Weblate
768d34f5a5 Merge branch 'origin/develop' into Weblate. 2020-07-16 11:41:55 +00:00
yuuki-san
df96e4f07a Translated using Weblate (Slovak)
Currently translated at 67.0% (1595 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-07-16 11:41:55 +00:00
Michael Telatynski
725fa7df9b
Merge pull request #4997 from matrix-org/t3chguy/fix/14526
Fix filtering by community not showing DM rooms with community members
2020-07-16 12:41:50 +01:00
Weblate
3906028ab8 Merge branch 'origin/develop' into Weblate. 2020-07-16 11:41:44 +00:00
Michael Telatynski
b1d57ca13e
Merge pull request #4996 from matrix-org/t3chguy/room-list/14491
Fix enter in new room list filter breaking things
2020-07-16 12:41:39 +01:00
Weblate
fb25013054 Merge branch 'origin/develop' into Weblate. 2020-07-16 11:41:38 +00:00
yuuki-san
e10f8083c5 Translated using Weblate (Slovak)
Currently translated at 67.0% (1594 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-07-16 11:41:37 +00:00
Michael Telatynski
19d733561d
Merge pull request #4995 from matrix-org/t3chguy/room-list/14509
Notify left panel of resizing when it is collapsed&expanded
2020-07-16 12:41:32 +01:00
Weblate
594b5a31b7 Merge branch 'origin/develop' into Weblate. 2020-07-16 11:41:28 +00:00
yuuki-san
1d7314731a Translated using Weblate (Slovak)
Currently translated at 67.0% (1593 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-07-16 11:41:28 +00:00
Michael Telatynski
dcc59198be
Merge pull request #4994 from matrix-org/t3chguy/room-list/14487
When removing a filter condition, try recalculate in case it wasn't last
2020-07-16 12:41:22 +01:00
Weblate
b142f6dc6c Merge branch 'origin/develop' into Weblate. 2020-07-16 11:41:12 +00:00
yuuki-san
e9ade66572 Translated using Weblate (Slovak)
Currently translated at 67.0% (1593 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-07-16 11:41:12 +00:00
Michael Telatynski
05b100f44d
Merge pull request #4975 from matrix-org/t3chguy/a11y-toolbar
Create a generic ARIA toolbar component
2020-07-16 12:41:05 +01:00
Weblate
6e3a809c29 Merge branch 'origin/develop' into Weblate. 2020-07-16 11:34:57 +00:00
yuuki-san
eab61eaf59 Translated using Weblate (Slovak)
Currently translated at 66.3% (1577 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-07-16 11:34:57 +00:00
Szimszon
5c1644d3a4 Translated using Weblate (Hungarian)
Currently translated at 99.7% (2371 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-07-16 11:34:54 +00:00
jadiof
b998058720 Translated using Weblate (German)
Currently translated at 97.9% (2329 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-07-16 11:34:54 +00:00
Priit Jõerüüt
1e0c6faa4d Translated using Weblate (Estonian)
Currently translated at 90.4% (2151 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-07-16 11:34:53 +00:00
Michael Telatynski
91b4193e6a
Merge pull request #4604 from matrix-org/t3chguy/fix-op
Fix /op Slash Command
2020-07-16 12:34:40 +01:00
Michael Telatynski
c94c937b31 Fix Room Tile Icon to not ignore DMs in other tags
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 12:33:05 +01:00
Priit Jõerüüt
c713df4e26 Translated using Weblate (Estonian)
Currently translated at 87.0% (2069 of 2379 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-07-16 09:47:19 +00:00
Weblate
1c5072ea32 Merge branch 'origin/develop' into Weblate. 2020-07-16 09:21:48 +00:00
Imre Kristoffer Eilertsen
b3e4afb7f6 Translated using Weblate (Norwegian Bokmål)
Currently translated at 59.2% (1408 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-07-16 09:21:48 +00:00
random
2766ab114c Translated using Weblate (Italian)
Currently translated at 100.0% (2377 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-07-16 09:21:48 +00:00
Szimszon
2aa11e152f Translated using Weblate (Hungarian)
Currently translated at 99.7% (2369 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-07-16 09:21:44 +00:00
Balázs Meskó
8ec3b7583a Translated using Weblate (Hungarian)
Currently translated at 99.7% (2369 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-07-16 09:21:42 +00:00
XoseM
b168ed9077 Translated using Weblate (Galician)
Currently translated at 100.0% (2377 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-07-16 09:21:41 +00:00
Priit Jõerüüt
48aa2e7bb3 Translated using Weblate (Estonian)
Currently translated at 84.0% (1996 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-07-16 09:21:39 +00:00
Tirifto
ed2fdfa243 Translated using Weblate (Esperanto)
Currently translated at 99.9% (2374 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-07-16 09:21:22 +00:00
Besnik Bleta
f649edd6aa Translated using Weblate (Albanian)
Currently translated at 98.7% (2345 of 2377 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-07-16 09:21:12 +00:00
Michael Telatynski
b160fe886f
Merge pull request #4987 from matrix-org/t3chguy/room-list/room-tile-icon-tooltip
Add tooltip to Room Tile Icon
2020-07-16 10:21:06 +01:00
Michael Telatynski
3498922882 Fix filtering by community not showing DM rooms with community members
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 09:13:23 +01:00
Michael Telatynski
ed9d3a36a2 fix typescript definitions
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 08:58:11 +01:00
Michael Telatynski
2f959a974a Fix enter in new room list filter breaking things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 06:31:06 +01:00
Michael Telatynski
48aa203b95 Notify left panel of resizing when it is collapsed&expanded
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 06:05:53 +01:00
Michael Telatynski
0097ba24a4 When removing a filter condition, try recalculate in case it wasn't the last one
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 05:52:39 +01:00
Michael Telatynski
a7f92f35f5 Sync recently used reactions list across sessions
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 04:15:32 +01:00
Jorik Schellekens
e873ba9608 ellipse senders for images and videos 2020-07-16 02:52:16 +01:00
Hubert Chathi
aa445a061d check that encryptionInfo.sender is set 2020-07-15 12:25:10 -04:00
Michael Telatynski
78da0c863a Update copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 16:52:10 +01:00
Michael Telatynski
ae17cd3ec6 Add tooltip to Room Tile Icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 16:46:39 +01:00
David Baker
7ab1416787
Merge pull request #4986 from matrix-org/dbkr/update_help_link
Update help link
2020-07-15 16:30:03 +01:00
David Baker
7d5f40876e Update help link 2020-07-15 14:31:15 +01:00
David Baker
6e35cd1d0c Update cover photo link 2020-07-15 14:22:58 +01:00
David Baker
fad5edf794 Fix TS lint errors 2020-07-15 10:56:50 +01:00
David Baker
c6418fb083 A visit from the lint bunny 2020-07-15 10:51:57 +01:00
David Baker
e8700392b5 Fix pathname for riot.im redirects
Need to redirect to root on x.element.io
2020-07-15 10:16:04 +01:00
Travis Ralston
895dc9c37f Fix homepage logo 2020-07-15 00:09:39 -06:00
Michael Telatynski
dd0bf17cec Fix copyrights
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 04:26:10 +01:00
Michael Telatynski
2a683354a8 Wire up new room list breadcrums as an ARIA Toolbar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 04:22:37 +01:00
Michael Telatynski
933945130e Tidy up Roving Tab Index helpers and create one for RovingAccessibleTooltipButton
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 04:22:19 +01:00
Michael Telatynski
1b08c1e9df Fix AccessibleTooltipButton leaking tooltipclassname into the DOM
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 04:19:51 +01:00
Michael Telatynski
793c3554dc fix up type declaration
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 03:58:49 +01:00
Michael Telatynski
8703bc1abc Create a generic ARIA toolbar component which works with existing roving tab index context
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 03:47:35 +01:00
Travis Ralston
cc22be4f1d Update attribution 2020-07-14 15:51:34 -06:00
Travis Ralston
556da7fe5c Swap out Modular for EMS 2020-07-14 15:47:03 -06:00
David Baker
b2e5bc3fa1 Merge branch 'dbkr/fix_show_less_broken' into 'element'
Fix bug where 'show more' sometimes did nothing

See merge request new-vector/element/element-web/matrix-react-sdk!23
2020-07-14 21:04:58 +00:00
Travis Ralston
322d58ba0c Merge branch 'develop' into element 2020-07-14 15:04:17 -06:00
David Baker
839851c90f Fix bug where 'show more' sometimes did nothing
a3a1e2e01f added the padding
to maxTilesPx which was confusing the calculation of whether we
should be showing the 'show more' button or the 'show less' button.

Hopefully this fixes the issue without undoing fixes from
https://github.com/matrix-org/matrix-react-sdk/pull/4964 or the
above commit by adding the padding in all cased in `get padding()`.
2020-07-14 21:49:51 +01:00
Travis Ralston
76fbb7c1b0 Merge branch 'develop' into joriks/delabs-font-scaling 2020-07-14 14:48:21 -06:00
Jorik Schellekens
3eac852ad0 Change font slider values 2020-07-14 21:27:01 +01:00
Travis Ralston
945dab6b1f Revert "Turn previews on for DMs and ensure they get rendered"
This reverts commit b19ae3ac93.
2020-07-14 13:36:28 -06:00
J. Ryan Stinnett
9d094a793c Merge branch 'bwindel/polish' into 'element'
More polish

See merge request new-vector/element/element-web/matrix-react-sdk!21
2020-07-14 19:35:41 +00:00
Travis Ralston
f6b9d44e4b Invert logging 2020-07-14 13:18:06 -06:00
Travis Ralston
b19ae3ac93 Turn previews on for DMs and ensure they get rendered 2020-07-14 12:49:29 -06:00
Travis Ralston
d74e803fa9 Remove potential source of room duplication issues
This is an estimated fix as the problem cannot be easily identified. We don't appear to need these lines, unlike what the comment implies.
2020-07-14 12:40:48 -06:00
Bruno Windels
38549ecf4c change accent color 2020-07-14 20:36:27 +02:00
Travis Ralston
e955feb12d Revert "Merge pull request #4972 from matrix-org/travis/room-list/prelaunch/3-remove-debug"
This reverts commit e1b34acdc8.
2020-07-14 12:02:40 -06:00
Travis Ralston
3a8b3e26ac Fix appearance tab saying the wrong theme is selected
Fixes https://github.com/vector-im/riot-web/issues/14275
2020-07-14 11:53:10 -06:00
J. Ryan Stinnett
f452abf822 Merge branch 'jryans/font-text' into 'element'
Fix font input branding

See merge request new-vector/element/element-web/matrix-react-sdk!14
2020-07-14 17:08:20 +00:00
J. Ryan Stinnett
c0a552bfb0 Fix font input branding 2020-07-14 18:04:29 +01:00
Bruno Windels
b1444146e6 rename traces of element(-dark) theme in code 2020-07-14 18:40:32 +02:00
Bruno Windels
f47268ce74 Revert "Merge branch 'nadonomy/use-element-theme' into 'element'"
This reverts merge request !9
2020-07-14 16:23:06 +00:00
J. Ryan Stinnett
ea511faafe Merge remote-tracking branch 'origin/develop' into element 2020-07-14 16:57:00 +01:00
Travis Ralston
e1b34acdc8
Merge pull request #4972 from matrix-org/travis/room-list/prelaunch/3-remove-debug
Remove debug logging from new room list
2020-07-14 09:56:17 -06:00
Bruno Windels
ebbcbe231a Merge branch 'nadonomy/ui-tweaks-part-deux' into 'element'
UI tweaks - part deux

See merge request new-vector/element/element-web/matrix-react-sdk!8
2020-07-14 13:47:10 +00:00
J. Ryan Stinnett
5294349dc3 Remove base domain from instance name 2020-07-14 14:32:52 +01:00
Nad Chishtie
d3944b9e67 Use element theme 2020-07-14 14:19:42 +01:00
Nad Chishtie
71dc6e8e10 Update missing var to use element theme 2020-07-14 14:15:24 +01:00
Nad Chishtie
5b3c3f53fe Use element theme by default 2020-07-14 13:56:24 +01:00
Bruno Windels
b6a5fa38e1 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux'
# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
2020-07-14 12:40:52 +00:00
Bruno Windels
4f466300b7 Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element 2020-07-14 14:32:08 +02:00
Bruno Windels
4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02:00
Michael Telatynski
9c5f7492e3 undo changes which are no longer needed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 12:53:55 +01:00
Michael Telatynski
507d493b60 Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-14 12:42:58 +01:00
Michael Telatynski
4e8203cca1 revert some changes to resolve what looks like a props mutation race-condition
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 12:42:51 +01:00
J. Ryan Stinnett
a09f773edd Tweak sticky header hiding to avoid pop
When transitioning between sublists, there can be a visibly observable jump in
the positioning of list items when the header container is restored to normal
size outside of sticky mode.

To avoid this problem, this leaves all headers at normal size. This creates a
new issue of a permanent gap at the top of the list for the first header, but
this can be solved by always hiding (since it can only ever appear stuck to
top).

Fixes https://github.com/vector-im/riot-web/issues/14429
2020-07-14 12:16:17 +01:00
Michael Telatynski
030586275f Fix /op command to accept only joined/invited users
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 10:59:06 +01:00
Michael Telatynski
67d1956437 Merge branches 'develop' and 't3chguy/fix-op' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-op 2020-07-14 10:56:15 +01:00
Bruno Windels
106c91aec0 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux'
# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
2020-07-14 09:26:04 +00:00
J. Ryan Stinnett
aea3ad48b5 Merge remote-tracking branch 'origin/develop' into element 2020-07-14 10:17:43 +01:00
Michael Telatynski
f394190423
Merge pull request #4973 from matrix-org/t3chguy/room-list/14395
Fix show-all keyboard focus regression
2020-07-14 09:56:03 +01:00
Michael Telatynski
03f94779f1 Fix show-all keyboard focus regression
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 09:38:31 +01:00
J. Ryan Stinnett
f16962bb41
Merge pull request #4970 from matrix-org/travis/room-list/prelaunch/1-cleanup
Clean up TODOs, comments, and imports in the new room list
2020-07-14 09:38:30 +01:00
J. Ryan Stinnett
e5c199952d
Merge pull request #4971 from matrix-org/travis/room-list/prelaunch/2-membership
Make EffectiveMembership utils generic
2020-07-14 09:36:45 +01:00
Travis Ralston
6632db01cf Remove debug logging from new room list
Fixes https://github.com/vector-im/riot-web/issues/14408

Yes, all the issue references are wrong :(
2020-07-13 20:34:05 -06:00
Travis Ralston
4a8a59c578 Make EffectiveMembership utils generic
Fixes https://github.com/vector-im/riot-web/issues/14460

Just have to move them to utils.
2020-07-13 20:29:46 -06:00
Travis Ralston
bdb136e24e Clean up TODOs, comments, and imports in the new room list
Fixes https://github.com/vector-im/riot-web/issues/14412
2020-07-13 20:25:02 -06:00
Travis Ralston
917c41dfa0 Update sticky headers when breadcrumbs pop in or out
Fixes https://github.com/vector-im/riot-web/issues/14455
2020-07-13 20:08:12 -06:00
Travis Ralston
126aa862db
Merge pull request #4967 from matrix-org/travis/room-list/fix-show-less
Fix show less button occluding the last tile
2020-07-13 19:51:26 -06:00
Travis Ralston
80cf2839d9 Ensure breadcrumbs don't keep turning themselves back on
Fixes https://github.com/vector-im/riot-web/issues/14452
2020-07-13 18:46:17 -06:00
Michael Telatynski
d4e397cbd0 Switch to svg masks for the e2eicon and border it for the EntityTile avatars
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 00:52:03 +01:00
Michael Telatynski
4d432f23e4 Fix room header timeline and composer alignment
Room header use DecoratedRoomAvatar instead of manual e2eIcon overlay
move e2eIcon next to it instead of private padlock

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:56:25 +01:00
Travis Ralston
a3a1e2e01f Fix show less button occluding the last tile
Fixes https://github.com/vector-im/riot-web/issues/14450

People may have to click various combinations of 'show more' and 'show less' until it fixes itself, as their layout could be a bit weird now.
2020-07-13 16:38:13 -06:00
Michael Telatynski
646c5d4a64 Replace timeline tooltips to match breadcrumb tooltips
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:14:00 +01:00
J. Ryan Stinnett
a54b18adfe Merge remote-tracking branch 'origin/develop' into element 2020-07-13 21:54:45 +01:00
J. Ryan Stinnett
f47e94259e Merge branch 'jryans/rename-strings' into 'element'
Update server dialog, analytics

See merge request new-vector/element/element-web/matrix-react-sdk!7
2020-07-13 20:43:53 +00:00
J. Ryan Stinnett
4b5faf8148 Update top vs. bottom sticky styles separately
If a sublist changes from sticky top to sticky bottom in a single run of the
logic (without passing through the default state), we were leaving the previous
top position set. This handles them independently to resolve this.

Fixes https://github.com/vector-im/riot-web/issues/14390
Maybe helps with https://github.com/vector-im/riot-web/issues/14443
For vector-im/riot-web#13635
2020-07-13 21:24:47 +01:00
J. Ryan Stinnett
b50c809d35 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 20:28:57 +01:00
Travis Ralston
edb19786ec
Merge pull request #4965 from matrix-org/travis/room-list/logout
Ensure RoomListStore2 gets reset when the client becomes invalidated
2020-07-13 13:26:20 -06:00
Travis Ralston
19500cf96a Allow the tests to force a MatrixClient 2020-07-13 13:24:02 -06:00
Travis Ralston
eb78b1b328 Export the matrix client from the store 2020-07-13 13:18:01 -06:00
Travis Ralston
a8829f09d0 Ensure RoomListStore2 gets reset when the client becomes invalidated
Fixes https://github.com/vector-im/riot-web/issues/14384

We also make use of the new AsyncStore type to handle this more safely.
2020-07-13 13:15:44 -06:00
Travis Ralston
8e982f52ff Fix extra room tiles being rendered on smaller sublists
Fixes https://github.com/vector-im/riot-web/issues/14426

The issue only applies to lists which won't have a 'show less' button, as the lists with the button would have the button's height considered when determining visible tiles. For lists that were under that (1-4 rooms), the show more button wasn't being considered and thus leading to the padding being added rather than subtracted, causing an extra tile to render.

By ensuring we include the padding for both show more and show less, we ensure that no extra tiles get rendered and that the cutoff semantics are still present.
2020-07-13 12:59:09 -06:00
Travis Ralston
1f57b85b30
Merge pull request #4962 from matrix-org/travis/room-list/leave-fix
Ensure tag changes (leaving rooms) causes rooms to move between lists
2020-07-13 12:44:23 -06:00
Jorik Schellekens
6bf6ae2031 try to fix test
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/delabs-font-scaling
2020-07-13 19:08:44 +01:00
Travis Ralston
d6ca05938d
Merge pull request #4960 from matrix-org/travis/room-list/default-order
Fix default sorting mechanics for new room list
2020-07-13 12:01:37 -06:00
Travis Ralston
d2c7a55fa0 Ensure tag changes (leaving rooms) causes rooms to move between lists
Fixes https://github.com/vector-im/riot-web/issues/14442

Turns out that we are so good at moving a room that when it flows through as a TIMELINE update the algorithm no-ops and does nothing, so don't do that.
2020-07-13 12:00:56 -06:00
J. Ryan Stinnett
995a7879a1 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 18:49:55 +01:00
J. Ryan Stinnett
f0c6139803 Update analytics host tracking for new structure 2020-07-13 17:57:56 +01:00
J. Ryan Stinnett
231c26c8a4 Update CustomServerDialog to use brand token 2020-07-13 17:57:56 +01:00
Michael Telatynski
33422f1744 Switch out Labs spinner to be the Flow-generated from Design
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 17:39:57 +01:00
Michael Telatynski
cc49e645b7
Merge pull request #4961 from matrix-org/t3chguy/room-list/14273
Fix room sub list header collapse/jump interactions on bottom-most sublist
2020-07-13 17:36:13 +01:00
Bruno Windels
62bdbb22e8 Merge branch 'element-roomlist-polish' into 'element'
Element roomlist polish

See merge request new-vector/element/element-web/matrix-react-sdk!5
2020-07-13 16:26:49 +00:00
Bruno Windels
c346122adf align room header with user menu button 2020-07-13 18:24:28 +02:00
Bruno Windels
02b27086da swap search field and breadcrumbs 2020-07-13 18:24:28 +02:00
Michael Telatynski
fd8f43e245 Fix room sub list header collapse/jump interactions on bottom-most sublist
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 17:17:05 +01:00
Travis Ralston
40ab3e23c6 Add a null guard on the client 2020-07-13 10:09:46 -06:00
Michael Telatynski
3060cdf934 Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 17:01:50 +01:00
Travis Ralston
9a3744ebb2 Fix default sorting mechanics for new room list
Fixes https://github.com/vector-im/riot-web/issues/14445
2020-07-13 09:54:15 -06:00
Michael Telatynski
b3c3ef594e i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 16:39:59 +01:00
Michael Telatynski
5bee948717 Fix room tile context menu for Historical rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 16:35:03 +01:00
Jorik Schellekens
59e153e024
Merge branch 'develop' into joriks/delabs-font-scaling 2020-07-13 16:15:52 +01:00
Jorik Schellekens
ea15725164
Merge pull request #4895 from jugglinmike/gh-12743-ignore-user-names
"ignore"/"unignore" commands: validate user ID
2020-07-13 16:07:31 +01:00
Jorik Schellekens
71e97177b0
Merge pull request #4957 from matrix-org/joriks/room-list-avatar-aspect-ratio
Stop classname from overwritting baseavatar's
2020-07-13 16:02:06 +01:00
Michael Telatynski
1ce3ae0cf2
Merge pull request #4952 from matrix-org/t3chguy/room-list/14413
Remove redundant scroll-margins and fix RoomTile wrongly scrolling
2020-07-13 15:57:27 +01:00
Jorik Schellekens
3e2280a6f4 Stop classname from overwritting baseavatar's 2020-07-13 15:43:34 +01:00
Michael Telatynski
3c096fdf23
Merge pull request #4953 from matrix-org/t3chguy/fix/14402
Fix RoomAvatar viewAvatarOnClick to work on actual avatars instead of default ones
2020-07-13 15:28:29 +01:00
Michael Telatynski
97734395f7
Merge pull request #4955 from matrix-org/t3chguy/fix/13991
Be consistent with the at-room pill avatar configurability
2020-07-13 15:28:12 +01:00
Michael Telatynski
72407a30d3
Merge pull request #4954 from matrix-org/t3chguy/room-list/14409
Room List v2 Enter in the filter field should select the first result
2020-07-13 15:27:16 +01:00
J. Ryan Stinnett
c77b312fd3 Merge branch 'jryans/rename-strings' into 'element'
Update brand name using variable in all strings

See merge request new-vector/element/element-web/matrix-react-sdk!3
2020-07-13 12:23:28 +00:00
Travis Ralston
0908e813fb Merge branch 'develop' into travis/room-list/enable 2020-07-12 22:50:27 -06:00
Michael Telatynski
c3789245b8 Be consistent with the at-room pill avatar configurability
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 19:25:43 +01:00
Michael Telatynski
d253c58830 Room List v2 Enter in the filter field should select the first result
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 19:06:47 +01:00
Michael Telatynski
71ecd5dc85 clean-up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 18:40:24 +01:00
Michael Telatynski
3f51bb84e1 Fix RoomAvatar viewAvatarOnClick to work on actual avatars instead of default ones
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 18:24:28 +01:00