Commit Graph

32123 Commits

Author SHA1 Message Date
Travis Ralston
101679f647 Adjust some settings 2021-03-25 17:30:44 -06:00
Hubert Chathi
db2f573410 Merge branch 'develop' into room-history-key-sharing2 2021-03-25 19:28:50 -04:00
Hubert Chathi
46fd549ace update with new suggested design 2021-03-25 19:27:14 -04:00
Travis Ralston
1419ac6b69 Hook up a clock and implement proper design 2021-03-25 17:12:26 -06:00
Robin Townsend
8a709b3bf9 Merge branch 'develop' into spoiler-command 2021-03-25 18:20:29 -04:00
Robin Townsend
f1a9c5ae93 Fix line numbers when missing trailing newline
_addLineNumbers expected code blocks to contain a trailing newline, but
this is not always the case.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-03-25 17:38:34 -04:00
Michael Telatynski
1f4437af39
Merge pull request #5799 from matrix-org/t3chguy/redaction-groupere
[Release] Fix edge case with redaction grouper messing up continuations
2021-03-25 21:17:51 +00:00
Michael Telatynski
75bfaa58bb
Merge pull request #5796 from panoschal/fix/save-editor-state-when-reply-is-open
Remember reply when switching rooms
2021-03-25 20:27:57 +00:00
Michael Telatynski
76965285da Fix edge case with redaction grouper messing up continuations 2021-03-25 20:19:59 +00:00
Michael Telatynski
d5ab7801f7
Merge pull request #5797 from matrix-org/t3chguy/redaction-groupere
Fix edge case with redaction grouper messing up continuations
2021-03-25 20:01:32 +00:00
David Baker
82ba546142 WIP attended transfer 2021-03-25 19:56:21 +00:00
Michael Telatynski
5e3a7c48f4 Fix edge case with redaction grouper messing up continuations 2021-03-25 19:37:55 +00:00
Panagiotis
97c7f3753b fix: save editor state when reply is open 2021-03-25 20:58:39 +02:00
Michael Telatynski
1b22cc8f6d delint 2021-03-25 17:41:26 +00:00
Michael Telatynski
a2fe964a31 Fix case where room list did not show DM when user joined space after filtering 2021-03-25 17:37:39 +00:00
Michael Telatynski
5061db259a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12 2021-03-25 16:37:56 +00:00
Michael Telatynski
ea77ab125e Show a face pile on a space preview 2021-03-25 16:15:34 +00:00
Germain
356e4bc6fc
Merge pull request #5785 from matrix-org/gsouquet-failed-invites 2021-03-25 14:54:21 +00:00
Germain
80013a2efa
Merge pull request #5787 from matrix-org/gsouquet-event-indexing-settings
Improve error reporting when EventIndex fails on a supported environment
2021-03-25 14:53:15 +00:00
Germain Souquet
25a47b463e Add user settings for warn before exit 2021-03-25 14:14:38 +00:00
Michael Telatynski
7316eb052b delint 2021-03-25 14:10:01 +00:00
Michael Telatynski
4df197ac61 Tweak layout of the space room directory for better legibility 2021-03-25 14:09:56 +00:00
Michael Telatynski
35ede972db clear filter when switching spaces 2021-03-25 13:29:17 +00:00
Marek Matys
b5bc6251cf fix password change popup message
Fixed bad error message when providing bad old password during password change.

Signed-off-by: Marek Matys <themarcq@gmail.com>
2021-03-25 14:26:00 +01:00
Michael Telatynski
3ce9db162e Tweak some spaces copy 2021-03-25 13:24:16 +00:00
Panagiotis
aa1f468235 fix: room id sticked with event id 2021-03-25 14:36:40 +02:00
RiotRobot
9e2edd7014 v3.17.0-rc.1 2021-03-25 12:20:22 +00:00
RiotRobot
d22dbeac6c Prepare changelog for v3.17.0-rc.1 2021-03-25 12:20:20 +00:00
Michael Telatynski
b6a57f73c6 Tweak border colours in spaces 2021-03-25 12:17:39 +00:00
RiotRobot
fd29c73533 Upgrade matrix-js-sdk to 9.10.0-rc.1 2021-03-25 12:12:55 +00:00
Michael Telatynski
5e00818d70 Fix new space invite button in the room intro 2021-03-25 11:38:14 +00:00
Germain Souquet
510f08e9f1 Update failed invites copy 2021-03-25 10:11:52 +00:00
Michael Telatynski
e31fc91a03 Fix space setting public/private join rule switch 2021-03-25 09:41:05 +00:00
Michael Telatynski
760b11f214
Merge pull request #5789 from matrix-org/t3chguy/spaces4.11
Tweak and fix some space features
2021-03-25 09:02:11 +00:00
Travis Ralston
449e028bbd Actually use a waveform instead of the frequency data 2021-03-24 23:31:02 -06:00
Travis Ralston
8ddd14e252 Early concept for rendering the frequency waveform 2021-03-24 22:17:45 -06:00
Michael Telatynski
d3cdd38ff4 delint some more 2021-03-24 20:11:23 +00:00
Michael Telatynski
d705e3020f delint 2021-03-24 20:01:27 +00:00
Michael Telatynski
a61f4c1811 Auto-select space if joined whilst being viewed 2021-03-24 20:01:21 +00:00
Michael Telatynski
62172ba43d i18n 2021-03-24 19:43:42 +00:00
Michael Telatynski
20ea1436fc Update iconography for spaces 2021-03-24 19:43:33 +00:00
Michael Telatynski
8369d42dd0 Hoist activeSpace tracking from RoomList to LeftPanel 2021-03-24 19:43:09 +00:00
Michael Telatynski
ee5d0d6842 Fix alignment bug with space panel on spaces with subspaces in Chrome 2021-03-24 17:05:21 +00:00
Michael Telatynski
6d9496cc22 Consolidate space summary api logic between space room view and directory 2021-03-24 17:02:12 +00:00
Michael Telatynski
d9f3e70b0b Fix joining over federation from Space Home (via servers) 2021-03-24 16:46:30 +00:00
Michael Telatynski
56dbd5f628 Remove unused autoJoin prop and move viaServers logic into RVS
this fixes the issue where autoJoining ignored viaServers
2021-03-24 16:45:53 +00:00
Michael Telatynski
f340b8f7ed Set invite PL requirement for public spaces to 0 explicitly 2021-03-24 16:42:21 +00:00
Travis Ralston
da7d31aeb6
Merge pull request #5686 from robintown/reply-commands
Support replying with a message command
2021-03-24 09:56:56 -06:00
Travis Ralston
8587ec888b
Merge pull request #5769 from matrix-org/travis/voice-messages/exp
Labs feature: Early implementation of voice messages
2021-03-24 09:56:34 -06:00
J. Ryan Stinnett
c5f145e976
Merge pull request #5788 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2021-03-24 15:49:54 +00:00