Commit graph

26914 commits

Author SHA1 Message Date
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
96f0681c2e Move e2e icon 2020-07-16 03:52:35 +01:00
Jorik Schellekens
bcbb3e8169 fix name jump 2020-07-16 03:14:20 +01:00
Jorik Schellekens
e873ba9608 ellipse senders for images and videos 2020-07-16 02:52:16 +01:00
Hubert Chathi
e1cf5ecd2f
Merge pull request #4988 from matrix-org/uhoreg/fix_encryption_info
check that encryptionInfo.sender is set
2020-07-15 14:31:38 -04: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
113a0f1b5c
Merge pull request #4985 from matrix-org/dbkr/cover_photo_link_element
Update cover photo link
2020-07-15 14:32:13 +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
RiotRobot
7098cbfce1 Reset matrix-js-sdk back to develop branch 2020-07-15 12:01:14 +01:00
RiotRobot
3fd15a34e7 Merge branch 'master' into develop 2020-07-15 12:00:19 +01:00
Travis Ralston
226f755259 Match the string correctly 2020-07-15 04:59:34 -06:00
Jorik Schellekens
eb0cb5c279 Revert "Revert "Merge branch 'joriks/horizontal-resize-bars' into 'element'""
This reverts commit 8cde611653.
2020-07-15 04:52:34 -06:00
Travis Ralston
6994b8c5ea Bob needs to accept the toast too 2020-07-15 04:50:15 -06:00
RiotRobot
a842e0936e v2.10.0 2020-07-15 11:49:38 +01:00
RiotRobot
b806cb9d9c Prepare changelog for v2.10.0 2020-07-15 11:49:37 +01:00
RiotRobot
c339e5cbf9 Upgrade matrix-js-sdk to 7.1.0 2020-07-15 11:40:31 +01:00
Travis Ralston
cc18438a0a Fix another toast 2020-07-15 04:32:07 -06:00
Travis Ralston
c5cba6d02a
Merge pull request #4983 from matrix-org/travis/e2e-tests
Incorporate new toasts into end-to-end tests
2020-07-15 04:22:37 -06:00
Travis Ralston
2def39fef7 Fix brand too 2020-07-15 04:21:37 -06:00
Travis Ralston
86cb3cf93f Incorporate new toasts into end-to-end tests 2020-07-15 04:13:38 -06:00
David Baker
21d5700501
Merge pull request #4982 from matrix-org/dbkr/ts_lint_post_rebrand
Fix TS lint errors
2020-07-15 11:11:03 +01:00
David Baker
fad5edf794 Fix TS lint errors 2020-07-15 10:56:50 +01:00
David Baker
30eed39fe0
Merge pull request #4981 from matrix-org/dbkr/hello_linting_my_old_friend
Fix js lint errors after rebrand merge
2020-07-15 10:54:08 +01:00
David Baker
0e7eabcbf5 Merge remote-tracking branch 'origin/develop' into dbkr/hello_linting_my_old_friend 2020-07-15 10:53:31 +01:00
Travis Ralston
80af7baa8e
Merge pull request #4980 from matrix-org/travis/fix
Fix style lint
2020-07-15 03:52:06 -06:00
David Baker
c6418fb083 A visit from the lint bunny 2020-07-15 10:51:57 +01:00
Travis Ralston
17dba01993 Fix style lint 2020-07-15 03:49:59 -06:00
David Baker
729fd6fa2d
Merge pull request #4979 from matrix-org/dbkr/login_spinner_align
Fix alignment of login/syncing spinner
2020-07-15 10:46:27 +01:00
David Baker
bb0f2ce944 Fix alignment of login/syncing spinner
Somewhat hacky but makes it look sensible
2020-07-15 10:44:20 +01:00
J. Ryan Stinnett
683935856b Merge branch 'dbkr/fix_redirect_path' into 'element'
Fix pathname for riot.im redirects

See merge request new-vector/element/element-web/matrix-react-sdk!26
2020-07-15 09:17:25 +00: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
Michael Telatynski
2bf5e4b142 clean up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 09:49:02 +01:00
Michael Telatynski
8812f98b35 Convert editor to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 09:45:45 +01:00
Bruno Windels
aea3a8de8d Merge branch 'bwindels/fixcustomthemes' into 'element'
Make custom themes acceptable with recent changes for element theme

See merge request new-vector/element/element-web/matrix-react-sdk!25
2020-07-15 08:44:01 +00:00
Bruno Windels
7ca8b27dc1 Make custom themes acceptable with recent changes for element theme
Note that custom themes are still based on the old theme, now called legacy-light/dark
2020-07-15 10:38:24 +02:00
Travis Ralston
895dc9c37f Fix homepage logo 2020-07-15 00:09:39 -06:00
Michael Telatynski
918683c232 fix import. wtf webstorm
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 05:10:05 +01:00
Michael Telatynski
13775f897c consolidate properties
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 04:59:35 +01:00
Michael Telatynski
31e0d74adc Query Matcher apply js-sdk's removeHiddenChars
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 04:58:13 +01: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
Jorik Schellekens
8cde611653 Revert "Merge branch 'joriks/horizontal-resize-bars' into 'element'"
This reverts commit 2a4c09880c.
2020-07-14 18:45:01 -06:00