mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 12:21:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
34365 commits 219 branches 562 tags 474 MiB
Commit graph

34365 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
59258585b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5 2021-06-22 17:28:19 +01:00
Michael Telatynski
4a66794236 update copy 2021-06-22 17:26:19 +01:00
Michael Telatynski
a839d0f396 More typescript conversion 2021-06-22 17:23:13 +01:00
Michael Telatynski
6d92953311 Convert bunch of utils to TS 2021-06-22 17:22:38 +01:00
Germain
cbfab29a5c
Merge pull request #6236 from matrix-org/gsouquet/bk-branch-matching 
Fix branch matching for Buildkite
 2021-06-22 16:44:15 +01:00
Germain Souquet
b092686453 improve comment grammar 2021-06-22 16:14:01 +01:00
Germain Souquet
fca2feaae8 make github env variable check first as it is new home for ci 2021-06-22 16:09:33 +01:00
Michael Telatynski
3c9cd938d0 remove spurious full stop 2021-06-22 15:29:53 +01:00
Germain
5b72423ea3
Merge pull request #6230 from matrix-org/gsouquet/fix-17051 2021-06-22 15:07:04 +01:00
Germain
ded738ce8c
Add spaces around curlies 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-22 14:57:44 +01:00
Michael Telatynski
c7d823d197
Merge pull request #6088 from matrix-org/t3chguy/fix/17128-1 2021-06-22 14:21:46 +01:00
Germain Souquet
c42f0fd2e4 split GITHUB_REPOSITORY rather than using GITHUB_ACTOR 2021-06-22 14:17:11 +01:00
Germain Souquet
660f3900f8 Change if statement syntax to use positive expressions 2021-06-22 14:11:41 +01:00
Michael Telatynski
847e3dcbce Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1 
 Conflicts:
	src/dispatcher/actions.ts
 2021-06-22 14:11:37 +01:00
Germain
a7daf558bb
Use proper capitalisation for Buildkite 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-06-22 13:03:55 +01:00
Michael Telatynski
1f0fdb95cd Improve accessibility of subspaces in the space panel 2021-06-22 11:59:04 +01:00
Michael Telatynski
66b3feb802 Fix keyboard accessibility of the space panel 2021-06-22 11:50:00 +01:00
Germain Souquet
dd58c9f413 Add TruncatedList in AddExistingToSpaceDialog 2021-06-22 10:52:33 +01:00
Germain
f56216eec5
Merge pull request #6238 from matrix-org/gsouquet/fix-17716 
Fix modal opening race condition
 2021-06-22 10:28:30 +01:00
Germain
9dee75a7b1
Merge pull request #6229 from matrix-org/gsouquet/fix-17678 2021-06-22 10:27:50 +01:00
Germain Souquet
3d3c428455 Fix DesktopBuildsNotice return type 2021-06-22 10:26:49 +01:00
Jaiwanth
36a69313cd Display redactedBecauseUserId for redacted events 2021-06-22 14:53:48 +05:30
Germain Souquet
db9ffe9b3e Fix AccessibleButton label for VerificationRequest 2021-06-22 10:18:09 +01:00
Germain
e9d87478e2
Spaces before/after curlies 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-22 10:06:31 +01:00
Germain Souquet
3c72569270 Fix modal opening race condition 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

React 17 is hitting a race condition when a modal is closing and is trying to open another one within the same tick.
A proper long term fix would be using React.createPortal to avoid manually mounting and unmounting new React roots
 2021-06-22 09:53:58 +01:00
Germain Souquet
8090d2b583 Fix branch matching for BuildKite 2021-06-22 09:31:15 +01:00
Šimon Brandner
066ef18db2
Replace onClick by onMouseDown 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-22 09:24:42 +02:00
Jaiwanth
db875508d8 Add text for room avatar events and skip empty text events 2021-06-22 12:50:15 +05:30
Michael Telatynski
deb075777d Upgrade @types/react and @types/react-dom 2021-06-22 08:17:22 +01:00
Šimon Brandner
a59deeb491
Add onClick handlers 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-22 09:16:45 +02:00
Šimon Brandner
de40657194
Don't show room if we don't click on buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-22 09:12:41 +02:00
Jaiwanth
12ecaf30df i18n 2021-06-22 12:14:31 +05:30
Jaiwanth
8a1cd77ef4 Handle no match cases and modify textForEvent to handle redacted messages 2021-06-22 12:12:37 +05:30
Jaiwanth
c58abd9582 Revert auto format 2021-06-22 10:51:16 +05:30
Jaiwanth
bf189204f2 Implement IRC bridge style reply formatting 2021-06-22 10:49:14 +05:30
Jaiwanth
0cbcc5a5fd Merge branch 'export-conversations' of github.com:jaiwanth-v/matrix-react-sdk into export-conversations 2021-06-22 09:29:24 +05:30
Jaiwanth
a0e0453635 Fix type lint 2021-06-22 09:27:49 +05:30
Jaiwanth
45be4a6d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-22 09:27:37 +05:30
Travis Ralston
9fa7ac21bd
Merge pull request #6216 from SimonBrandner/feature/pr-template 
Add PR template
 2021-06-21 14:05:58 -06:00
Michael Telatynski
dda4c8ec4c Move Promise::allSettled typing from react-sdk to js-sdk 2021-06-21 21:04:29 +01:00
Michael Telatynski
0e4bac46f8
Merge pull request #6222 from SimonBrandner/fix/prioritise-canonical/17570 2021-06-21 20:57:24 +01:00
Michael Telatynski
845bb95887 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5 2021-06-21 20:46:28 +01:00
Michael Telatynski
6b16b9aca6
Merge pull request #6232 from SimonBrandner/fix/quote/17715 
Fix quote button
 2021-06-21 20:29:54 +01:00
Šimon Brandner
903f898bee
Remove ComposerInsertPayload as this is a JS file 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-21 18:28:30 +02:00
RiotRobot
54c3832b5b Resetting package fields for development 2021-06-21 16:54:41 +01:00
RiotRobot
d219c92758 Merge branch 'master' into develop 2021-06-21 16:54:40 +01:00
RiotRobot
d89710defe v3.24.0 2021-06-21 16:53:20 +01:00
RiotRobot
ddbf0fa77f Prepare changelog for v3.24.0 2021-06-21 16:46:20 +01:00
RiotRobot
174a43f1ef Upgrade matrix-js-sdk to 12.0.0 2021-06-21 16:37:49 +01:00
Germain
439e5628f5
Merge pull request #6224 from matrix-org/gsouquet/fix-17707 2021-06-21 16:28:01 +01:00