Commit Graph

37566 Commits

Author SHA1 Message Date
Šimon Brandner
c460d56e50
Remove unused import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 06:37:08 +02:00
Šimon Brandner
eae45d8a7e
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 06:31:43 +02:00
Travis Ralston
298fb49017
Merge pull request #6783 from matrix-org/madlittlemods/12876-optimize-input-field-transition
Optimize input label transition on focus
2021-09-13 20:57:41 -06:00
Travis Ralston
6249a1be5f
Merge pull request #6768 from AndrewFerr/develop
Set dark theme colors for auth components
2021-09-13 11:14:31 -06:00
Šimon Brandner
8a86407a4c
Use MatrixClientContext
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:28:52 +02:00
Šimon Brandner
807792dc69
Revert some changes that are unncessary due to js-sdk changes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:24:53 +02:00
Šimon Brandner
44141bf048
Iterate PR first round
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:23:37 +02:00
Šimon Brandner
e4cf7314f5
Fix init value
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-13 18:14:55 +02:00
Michael Telatynski
e3a2c25421
Merge pull request #6786 from aaronraimist/fix18990 2021-09-13 14:11:36 +01:00
RiotRobot
f9e17621af Merge branch 'master' into develop 2021-09-13 13:00:40 +01:00
RiotRobot
df20960ee8 v3.29.1 2021-09-13 12:54:45 +01:00
RiotRobot
2a2c2c19cf Upgrade matrix-js-sdk to 12.4.1 2021-09-13 12:54:01 +01:00
RiotRobot
bfd563e564 Changelog 2021-09-13 12:53:15 +01:00
Šimon Brandner
1590fe32cf
Convert RoomStatusBar to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 10:15:34 +02:00
Šimon Brandner
e48407a1d6
Convert ViewSource to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 10:15:34 +02:00
Šimon Brandner
9a7e2b31d4
Convert IndicatorScrollbar to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 10:15:28 +02:00
Šimon Brandner
ff7e32cdd1
Convert UserView to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 09:24:55 +02:00
Šimon Brandner
a6a56b455b
Convert GenericErrorPage to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 08:56:29 +02:00
Šimon Brandner
e882576f86
Convert EmbeddedPage to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 08:56:00 +02:00
Šimon Brandner
716aba2a0e
Convert MainSplit to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 08:40:56 +02:00
Šimon Brandner
4673e1aa49
Convert SearchBox to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-12 08:24:17 +02:00
Aaron Raimist
354d0cfba4
Redirect from /#/welcome to /#/home if already logged in
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-09-11 10:52:33 -05:00
Eric Eastwood
049040b67d Optimize input label transition on focus
Fix https://github.com/vector-im/element-web/issues/12876
2021-09-11 02:03:55 -05:00
Michael Telatynski
ac0ba2d597
Merge pull request #6779 from matrix-org/t3chguy/fix/18908 2021-09-10 19:32:03 +01: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
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
Andrew Ferrazzutti
09ef07a3b0 Replace dark theme's $authpage-primary-color
Use `$primary-content` instead of `$text-primary-color`.

Signed-off-by: Andrew Ferrazzutti <fair@miscworks.net>
2021-09-10 01:21:53 -04: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