Commit Graph

37570 Commits (6e674b97c2b55718d6c8feae82aecc0651b3e2a7)

Author SHA1 Message Date
Šimon Brandner 6e674b97c2
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts 2021-09-10 20:33:21 +02:00
Michael Telatynski ac0ba2d597
Merge pull request #6779 from matrix-org/t3chguy/fix/18908 2021-09-10 19:32:03 +01:00
Šimon Brandner 3fffbb0845
Use ISasEvent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:19:29 +02:00
Šimon Brandner 0efd599014
Fix types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:12:33 +02:00
Šimon Brandner 52d203dd8e
Add missing types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:07:55 +02:00
Šimon Brandner 6568e22d70
Add missing import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:06:09 +02:00
Šimon Brandner f2b2a04a21
Make room optional
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:03:29 +02:00
Michael Telatynski ca0d8116ad Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908 2021-09-10 18:02:48 +01:00
Šimon Brandner 6e11f2478c
Use IDialogProps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 19:01:05 +02:00
Šimon Brandner ee90ff0b98
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-10 18:49:55 +02:00
Germain 1a4859ede8
Merge pull request #6727 from SimonBrandner/task/i-hate-my-code 2021-09-10 16:14:24 +01:00
Michael Telatynski 2f3b51139f
Merge pull request #6780 from matrix-org/t3chguy/fix-types 2021-09-10 15:41:54 +01:00
Michael Telatynski d15ea932f6 fix unrelated issues 2021-09-10 15:35:35 +01:00
Michael Telatynski d46181385c Also default to PL invite=50 for private space creation 2021-09-10 13:05:04 +01:00
Michael Telatynski cd73bbf2f5
Merge pull request #6724 from matrix-org/t3chguy/fix/18798 2021-09-10 09:56:56 +01:00
Michael Telatynski 2a8e8b93aa add comment 2021-09-10 09:48:46 +01:00
Michael Telatynski 558b292c25 Adapt and re-use the RolesRoomSettingsTab for Spaces 2021-09-10 09:41:58 +01:00
Germain 6d38256c6a
Merge pull request #6776 from robintown/bubble-corners 2021-09-09 22:43:32 +01:00
Robin Townsend def1c68c16 Fix message bubble corners being wrong in the presence of hidden events
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-09 16:11:36 -04:00
Germain 051e166c68
Merge pull request #6772 from matrix-org/gsouquet/fix-18947 2021-09-09 18:56:49 +01:00
Germain d475b7f1ea
Merge pull request #6753 from matrix-org/revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 18:49:38 +01:00
David Baker 3f28454a8e
Merge pull request #6771 from matrix-org/dbkr/debounce_read_marker_update
Debounce read marker update on scroll
2021-09-09 18:24:08 +01:00
David Baker bd5d02d690
Update comment too
Co-authored-by: Travis Ralston <travisr@matrix.org>
2021-09-09 18:15:51 +01:00
Travis Ralston a6d2bb5e6c
Merge pull request #6693 from SimonBrandner/fix/guest/18776
Render guest settings only in public rooms/spaces
2021-09-09 10:42:38 -06:00
Travis Ralston bdb29e96fa
Merge pull request #6766 from matrix-org/travis/measure-encryption-perf
Add config option to turn on in-room event sending timing metrics
2021-09-09 10:38:15 -06:00
Germain Souquet 672dab1998 Force refresh threads timeline
Fixes vector-im/element-web#18947

In the absence of a proper pending events / remote echo setup it seems fairly difficult to get the timeline to update

Adding a temporary helper to force refresh the timeline and not swallow local events when sending a message from the thread sidebar
2021-09-09 17:31:05 +01:00
David Baker a4aa6dfcd7 Debounce read marker update on scroll
Reverts https://github.com/matrix-org/matrix-react-sdk/pull/6751 in
favour of debouncing the updates to read markers, because it seems
allowing the scroll to be 1px away from the bottom was important for
some browsers and meant they never got to the bottom.

We can fix the problem instead by debouncing the update to read
markers, because the scroll state gets reset back to the bottom when
componentDidUpdate() runs which happens after the read marker code
does a setState(). This should probably be debounced anyway since
it doesn't need to be run that frequently.

Fixes https://github.com/vector-im/element-web/issues/18961
Type: bugfix
2021-09-09 15:58:19 +01:00
Michael Telatynski 8cf891f9a4
Merge pull request #6770 from matrix-org/t3chguy/fix/18951
Use cursor:pointer on space panel buttons
2021-09-09 13:53:42 +01:00
Germain Souquet b5bed32973 Fix i18n 2021-09-09 13:40:07 +01:00
Germain Souquet 07ebd85f7e Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 13:30:35 +01:00
Germain Souquet aa53444267 Improve narrow composer usability 2021-09-09 13:27:25 +01:00
Michael Telatynski 82cd7acdae Use cursor:pointer on space panel buttons 2021-09-09 11:40:43 +01:00
Michael Telatynski 630835961b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-09-09 11:01:11 +01:00
Michael Telatynski 2eb64de508 Tweak edge case behaviour 2021-09-09 10:54:31 +01:00
Michael Telatynski fa60b24a9f fix react error in console 2021-09-09 10:50:12 +01:00
David Baker e5bd863054
Merge pull request #6769 from matrix-org/dbkr/remove_unnecessary_pushd
Remove unnecessary pushd
2021-09-09 10:10:07 +01:00
David Baker b67883b4f1 Remove unnecessary pushd
type: task
2021-09-09 09:41:11 +01:00
David Baker 12ff67ff6a
Merge pull request #6767 from matrix-org/dbkr/rename_type_check_action
Rename type checking script
2021-09-09 09:30:31 +01:00
Michael Telatynski e17a5328d2
Merge pull request #6764 from matrix-org/t3chguy/fix/18677 2021-09-08 23:00:01 +01:00
Michael Telatynski d00c4d042b
Merge pull request #6760 from matrix-org/t3chguy/fix/18528
Improve tooltips on space quick actions and explore button
2021-09-08 22:59:52 +01:00
Michael Telatynski 086d36beb1
Merge pull request #6765 from matrix-org/t3chguy/fix/17018
Make space members and user info behave more expectedly
2021-09-08 22:59:44 +01:00
David Baker 8f221a4849 Rename type checking script
'cos it's type chekcing, not linting
2021-09-08 18:37:13 +01:00
Travis Ralston b4f42e1103 Appease the linter 2021-09-08 11:35:25 -06:00
Travis Ralston 70e28e7e13 Move fields into consistent location for js-sdk to target 2021-09-08 11:31:37 -06:00
Travis Ralston 21e33362e5 Add config option to turn on in-room event sending timing metrics
This is intended to be hooked up to an external system. 

Due to the extra events and metadata concerns, this is only available if turned on from the config.

See `sendTimePerformanceMetrics.ts` for event schemas.
2021-09-08 11:28:19 -06:00
David Baker 7ecb3c8dc7
Merge pull request #6762 from dbkr/develop
Switch type check to GitHub Actions
2021-09-08 17:22:01 +01:00
Michael Telatynski 22c5902ae4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18677 2021-09-08 17:21:42 +01:00
Michael Telatynski 17e0a4b3d7 iterate PR based on feedback 2021-09-08 17:14:51 +01:00
Michael Telatynski 2c134b2dfd
Merge pull request #6763 from matrix-org/t3chguy/ts1234
Improve types based on new TS in js-sdk
2021-09-08 17:09:17 +01:00
Michael Telatynski 600375cafe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
 Conflicts:
	src/i18n/strings/en_EN.json
2021-09-08 15:38:13 +01:00