OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
35,216 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

35216 Commits (45f9f3e13ec763bdd89746666f6ddc206e6b7fd1)

Author SHA1 Message Date
Michael Telatynski 316b21408d Fix tests 2021-07-15 10:59:52 +01:00
Michael Telatynski 50b6c5c557 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-07-15 10:19:04 +01:00
Andrew Morgan f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363) 
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2021-07-15 09:55:58 +01:00
Michael Telatynski 80f9793c73 only show space beta tweaks if you have the beta enabled as they do nothing otherwise 2021-07-15 08:29:50 +01:00
Michael Telatynski 90d380c8ae Cache value of feature_spaces* flags as they cause page refresh so are immutable 2021-07-15 08:26:49 +01:00
Germain c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming 2021-07-15 08:07:03 +01:00
David Baker f42382edbd Update PR template for new changelog stuff 2021-07-14 23:29:54 +01:00
David Baker f990a595d1
Merge pull request #6379 from matrix-org/dbkr/contributing_md 
Convert CONTRIBUTING to markdown
 2021-07-14 23:06:18 +01:00
David Baker 21a6a2d01e Update links 2021-07-14 22:39:03 +01:00
David Baker f4c767ab3e Convert CONTRIBUTING to markdown 
Where by 'convert', I mean 'rename'
 2021-07-14 22:37:47 +01:00
Michael Telatynski 6fc6d6b0a3
Merge pull request #6366 from matrix-org/t3chguy/ts/c4 2021-07-14 20:14:01 +01:00
Travis Ralston 2c5c2e82bf
Merge pull request #6378 from matrix-org/travis/widgets/fix-state-read 
Exclude state events from widgets reading room events
 2021-07-14 12:59:58 -06:00
Travis Ralston 421392f339 Exclude state events from widgets reading room events 
They can request state reading permissions to read state.
 2021-07-14 12:48:27 -06:00
Michael Telatynski 12761fd823 add valuable ts-ignore 2021-07-14 19:16:34 +01:00
Michael Telatynski 296d5d1d5e stub out workers for jest tests as it doesn't like the worker-loader 2021-07-14 18:50:01 +01:00
Michael Telatynski 50a9394c59 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c4 
 Conflicts:
	src/components/views/room_settings/RoomPublishSetting.tsx
 2021-07-14 18:36:12 +01:00
Michael Telatynski 8de4f092d4
Merge pull request #6356 from matrix-org/t3chguy/ts/c3 2021-07-14 18:25:25 +01:00
Michael Telatynski e8fcf0978d fix worker import 2021-07-14 18:05:06 +01:00
Michael Telatynski 0e38eee080 improve typing in the idb worker 2021-07-14 17:53:42 +01:00
Michael Telatynski 4084a11847 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c3 2021-07-14 17:52:32 +01:00
Travis Ralston 5a51b7139c
Merge pull request #6371 from matrix-org/travis/widgets/fix-enc 
Send clear events to widgets when permitted
 2021-07-14 10:34:08 -06:00
Travis Ralston c4b03064ae fix imports 2021-07-14 10:28:45 -06:00
David Baker 603889dbb8
Merge pull request #6377 from matrix-org/dbkr/comment_only_develop 
Comment why end to end tests are only on the develop branch
 2021-07-14 17:23:17 +01:00
Michael Telatynski 57f9b819b5
Merge pull request #6345 from matrix-org/t3chguy/ts/c1 2021-07-14 17:19:07 +01:00
Travis Ralston 5dc3d09dd8 Use new function name 2021-07-14 10:18:55 -06:00
David Baker 5399929da5 Comment why end to end tests are only on the develop branch 2021-07-14 17:13:40 +01:00
David Baker 5bb5eae487
Merge pull request #6376 from matrix-org/dbkr/fix_user_type_import_rel 
Fix 'User' type import
 2021-07-14 17:07:02 +01:00
David Baker 4d16cfc951 Fix 'User' type import 2021-07-14 16:51:45 +01:00
David Baker 291723107a
Merge pull request #6375 from matrix-org/dbkr/fix_user_type_import 
Fix 'User' type import
 2021-07-14 16:49:41 +01:00
Germain Souquet 51c5094ca4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 17:47:22 +02:00
David Baker 6c72955731 Fix 'User' type import 2021-07-14 16:41:01 +01:00
RiotRobot 0fe91c07b8 v3.26.0-rc.1 2021-07-14 16:27:35 +01:00
RiotRobot 70c93a6fee Prepare changelog for v3.26.0-rc.1 2021-07-14 16:27:34 +01:00
RiotRobot d3823305cc Upgrade matrix-js-sdk to 12.1.0-rc.1 2021-07-14 16:21:02 +01:00
Germain Souquet dde58d449d Only hide sender when in bubble mode 2021-07-14 17:16:13 +02:00
Šimon Brandner acd37d2aad
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 16:53:05 +02:00
Travis Ralston fe2eb5ebf0
Merge pull request #6370 from matrix-org/travis/voice_messages/right-panel 
Fix voice messages in right panels
 2021-07-14 08:46:55 -06:00
Travis Ralston 2b8e709125
Merge pull request #6369 from matrix-org/travis/tileshape 
Use TileShape enum more universally
 2021-07-14 08:46:27 -06:00
James Salter e054af7f38 Run yarn i18n 2021-07-14 15:35:57 +01:00
Germain Souquet a6120ef3b7 Revert fetchdep script diff 2021-07-14 16:32:29 +02:00
Germain Souquet 789d078814 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 16:26:22 +02:00
Germain Souquet f4dfe9832b change labs flag wording 2021-07-14 16:20:25 +02:00
James Salter 2fe5ad5d4b Slightly refine error message 2021-07-14 15:07:22 +01:00
James Salter 7f70b982cd Add English i18n string 2021-07-14 15:02:59 +01:00
James Salter 8bf5e61acc Add "Copy" to room context menu. 
This menu item creates a matrix.to link for the room and copies it to the clipboard.
 2021-07-14 14:58:18 +01:00
Germain Souquet fc270b435c fix group layout 2021-07-14 15:32:35 +02:00
David Baker 181a23d259
Merge pull request #6373 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Translations update from Weblate
 2021-07-14 11:52:44 +01:00
Weblate 14e024b17f Merge branch 'origin/develop' into Weblate. 2021-07-14 10:44:59 +00:00
Phuc D** 769c91387c Translated using Weblate (Vietnamese) 
Currently translated at 10.0% (307 of 3046 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/vi/
 2021-07-14 10:44:48 +00:00
Šimon Brandner 54d2784818
Remove unused import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 12:19:16 +02:00