Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
63,001 Commits 1 Branch 646 Tags
bb41616d5f9fc6d47c735d4794de1fa46766cb7a
Commit Graph

63001 Commits

This Branch
This Branch
All Branches
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
Michael Telatynski 8289d6937f Merge pull request #18006 from vector-im/t3chguy/spacesperf 2021-07-15 10:18:18 +01:00
Michael Telatynski de88a39604 delint and improve ts 2021-07-15 10:09:24 +01:00
Michael Telatynski 5986609731 i18n 2021-07-15 10:05:37 +01:00
Michael Telatynski dcb9b9b777 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/elements/MiniAvatarUploader.tsx
	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
	src/i18n/strings/en_EN.json
	src/settings/handlers/RoomSettingsHandler.ts
	src/stores/SpaceStore.tsx
 2021-07-15 10:04:48 +01:00
Michael Telatynski ebfe38dc4a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete 
 Conflicts:
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
 2021-07-15 09:59:40 +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 2877ef8fcf Fix skinning 2021-07-15 08:29:18 +01:00
Michael Telatynski f65231268d Cache value of feature_spaces* flags as they cause page refresh so are immutable 2021-07-15 08:26: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
Šimon Brandner 18343d839c Show MSC2285 only if supported by server 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 09:23:15 +02:00
Germain bd4c6b8c6c Merge pull request #17980 from psrpinto/fix/naming 
Standardise casing of identity server
 2021-07-15 08:07:10 +01:00
Germain c7c29f2119 Merge pull request #6365 from psrpinto/fix/naming 2021-07-15 08:07:03 +01:00
David Baker a0f55c9e8f Update PR template for new changelog stuff 2021-07-14 23:30:18 +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 fcf1f06b31 Merge pull request #18002 from vector-im/dbkr/contributing_md 
Convert CONTRIBUTING to markdown
 2021-07-14 23:06:11 +01:00
David Baker a79a05cd52 Convert CONTRIBUTING to markdown 2021-07-14 22:41:07 +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 ca8cbacad7 Merge pull request #17999 from vector-im/t3chguy/ts/c4 2021-07-14 20:14:02 +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 2194e4cc10 fix path to worker mock 2021-07-14 19:05:57 +01:00
Michael Telatynski 43afa4c1e0 Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/c4 2021-07-14 18:57:50 +01:00
Michael Telatynski 322c957f7f ignore workers for jest tests because it disagrees with worker-loader 2021-07-14 18:56:35 +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 6c476bdc0d Merge pull request #17963 from vector-im/t3chguy/ts/c3 2021-07-14 18:25:28 +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 7aca548f65 Add missing stylelint dependencies and run i18n 2021-07-14 18:13:00 +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
Michael Telatynski 80bc659b11 Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/c3 
 Conflicts:
	src/vector/indexeddb-worker.ts
 2021-07-14 17:50:40 +01:00
Michael Telatynski 5646f3aff8 Merge pull request #17962 from vector-im/t3chguy/ts/c2 2021-07-14 17:44:37 +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
RiotRobot d58c4deebb v1.7.33-rc.1 v1.7.33-rc.1 2021-07-14 17:25:04 +01:00
RiotRobot 280e6528f1 Prepare changelog for v1.7.33-rc.1 2021-07-14 17:25:04 +01: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
RiotRobot d4638f8825 Bump to RC versions of js-sdk and react-sdk 2021-07-14 17:20:15 +01:00
Michael Telatynski 22a25f0e95 Merge pull request #17931 from vector-im/t3chguy/ts/c1 
Improve and consolidate typing
 2021-07-14 17:19:10 +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