matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity
35,433 Commits 3,075 Branches 549 Tags
001490f70d7930e14b17d8dbb8da46dc3533da99
Commit Graph

35433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J. Ryan Stinnett
173b0e9d78 Merge pull request #6117 from SimonBrandner/fix/down-arrow-edit/17491 
Clear stored editor state when canceling editing using a shortcut
 2021-06-01 12:07:23 +01:00
Michael Telatynski
349d0daef7 Merge pull request #6124 from matrix-org/t3chguy/fix/rs5394 
Respect newlines in space topics
 2021-06-01 12:06:57 +01:00
Germain Souquet
ebd7cd6212 Add CSS containement rules for shorter reflow operations 2021-06-01 11:26:32 +01:00
Šimon Brandner
14605e49c4 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-01 12:11:11 +02:00
Michael Telatynski
6e74ab0cf5 Fix the ability to remove avatar from a space via settings 2021-06-01 11:11:04 +01:00
Michael Telatynski
4526998332 Remove brand prefix too 2021-06-01 11:04:45 +01:00
Michael Telatynski
f11a7083ae Switch to stable endpoint/fields for MSC2858 2021-06-01 11:01:09 +01:00
Šimon Brandner
91288ab525 i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 11:51:34 +02:00
Šimon Brandner
527723c630 Remove unused import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 11:51:05 +02:00
Michael Telatynski
e525d046c7 remove outdated TODO 2021-06-01 10:49:19 +01:00
Michael Telatynski
b2f01b8438 Respect newlines in space topics 2021-06-01 10:48:53 +01:00
Šimon Brandner
79f51adf25 Delete old call tile handlers that are replaced by CallEventGrouper and CallEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 11:38:17 +02:00
Šimon Brandner
0785997983 Handle missed calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 11:28:45 +02:00
Michael Telatynski
826efeaeaa Update way of checking for registration disabled 
Spec says 403 + M_FORBIDDEN
 2021-06-01 10:22:24 +01:00
Michael Telatynski
1ea73ae9ae Fix all DMs wrongly appearing in room list when m.direct is changed 2021-06-01 10:18:57 +01:00
J. Ryan Stinnett
a8b6094482 Merge pull request #5674 from churchtools/default-username 
Add url param `defaultUsername` to prefill the login username field
 2021-06-01 10:12:31 +01:00
Šimon Brandner
5b3967a486 Add handling for invite 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 11:01:10 +02:00
Šimon Brandner
79ec655e66 Fix translations 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:58:17 +02:00
Šimon Brandner
67a052e46a Reorganize things and do some fixes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:55:03 +02:00
Šimon Brandner
8c67b96a0f Save all events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:42:21 +02:00
Šimon Brandner
c1fcadba3b Manage some more call states 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:33:44 +02:00
Šimon Brandner
f96e25d833 Simply use call states 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:11:48 +02:00
Šimon Brandner
6b72c13e34 Add some call states 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:06:03 +02:00
Šimon Brandner
86402e9788 Add some styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:03:23 +02:00
Šimon Brandner
30365ca1ad Allow picking up calls from the timeline 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 10:03:17 +02:00
Germain Souquet
d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Šimon Brandner
dac741d8b9 Another rewrite 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 09:30:37 +02:00
Šimon Brandner
8eb24d0d74 Rename callState to timelineCallState 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 08:01:34 +02:00
Šimon Brandner
5e4a10ab84 Reorganize HTML 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 07:55:55 +02:00
Hivaa
7de605259e Translated using Weblate (Persian) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
 2021-06-01 03:48:39 +00:00
Hivaa
595f8428f5 Translated using Weblate (Persian) 
Currently translated at 100.0% (2974 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
 2021-06-01 03:41:14 +00:00
Hivaa
5734304cf9 Translated using Weblate (Persian) 
Currently translated at 95.3% (2835 of 2974 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
 2021-05-31 18:43:19 +00:00
Šimon Brandner
d05b1798b8 Add callId 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
20c5735e96 Add getCallById() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
f94230c292 Fix css 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
5e8df03724 Fix styling a bit 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
85bcf8ed52 Hook up CallEventGrouper 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
8dc0e2a7ab Add CallEventGrouper as a replacement for TimeLineCallEventStore 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
31d16d4277 Fix ignoring events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
4ae92d8adc Hook up TimelineCallEventStore and add Avatar 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
320ceb5036 Add POC TimelineCallEventStore 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
3ac63b03a6 Use styling for CallEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
cd67d50a85 Add basic CallEvent styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
eaa3645238 Hook up CallEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Šimon Brandner
73c66c36dd Add basic CallEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-30 19:44:17 +02:00
Aaron Raimist
ccdd2311f4 Make "share this room" use aliases if possible 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-05-29 01:38:47 -05:00
Aaron Raimist
53ebf3b8e3 Don't include via when sharing room alias 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-05-29 01:37:22 -05:00
Šimon Brandner
d72c773e2d clearStoredEditorState when canceling editing using a shortcut 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-29 08:26:53 +02:00
Travis Ralston
30e136d103 Merge pull request #6115 from matrix-org/dependabot/npm_and_yarn/ws-7.4.6 
Bump ws from 7.4.2 to 7.4.6
 2021-05-28 22:14:54 -06:00
dependabot[bot]
d66bafd1a6 Bump ws from 7.4.2 to 7.4.6 
Bumps [ws](https://github.com/websockets/ws) from 7.4.2 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.4.2...7.4.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-29 03:12:59 +00:00