Commit graph

37774 commits

Author SHA1 Message Date
Šimon Brandner
2f6239770a
Merge remote-tracking branch 'upstream/develop' into task/structures-ts 2021-09-14 17:32:00 +02:00
Robin Townsend
2c0835ed9b Add comments to message bubble magic numbers
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 11:27:03 -04:00
Šimon Brandner
b26bec949d
Use React.Children.count()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 17:19:57 +02:00
Michael Telatynski
b8ee2d2b5b Add warning that some spaces may not be relinked to the newly upgraded room 2021-09-14 16:14:25 +01:00
Michael Telatynski
c786ef9f69 Fix space keyboard shortcuts conflicting with native zoom shortcuts 2021-09-14 16:02:14 +01:00
RiotRobot
85fea9cfd0 Merge branch 'master' into develop 2021-09-14 16:02:04 +01:00
Robin Townsend
35171ccd23 Merge branch 'develop' into message-bubble-misc 2021-09-14 11:00:55 -04:00
RiotRobot
36e8af2978 Merge branch 'release-v3.30.0' 2021-09-14 15:59:56 +01:00
RiotRobot
c3089a1097 v3.30.0 2021-09-14 15:56:23 +01:00
RiotRobot
2eeb3cecd9 Prepare changelog for v3.30.0 2021-09-14 15:56:22 +01:00
Michael Telatynski
9928079b82
Merge pull request #6797 from matrix-org/t3chguy/fix/19025 2021-09-14 15:56:20 +01:00
Michael Telatynski
1298fddebf
Merge pull request #6800 from matrix-org/t3chguy/fix/18694
Simplify Space Panel layout and fix some edge cases
2021-09-14 15:55:44 +01:00
RiotRobot
4ea0385061 Upgrade matrix-js-sdk to 12.5.0 2021-09-14 15:54:30 +01:00
Michael Telatynski
6900fb79c2
Merge pull request #6798 from matrix-org/t3chguy/fix/randoms 2021-09-14 15:53:02 +01:00
Michael Telatynski
4a4c68b71c
Merge pull request #6803 from matrix-org/t3chguy/fix/19034
Stop spinner on space preview if the join fails
2021-09-14 15:52:37 +01:00
Michael Telatynski
919270ff0c
Update src/stores/SpaceStore.tsx
Co-authored-by: Travis Ralston <travisr@matrix.org>
2021-09-14 15:50:51 +01:00
David Baker
07d29f64fa
Merge pull request #6802 from matrix-org/dbkr/18997_rel
Fix autocomplete not having y-scroll
2021-09-14 15:32:50 +01:00
David Baker
d081d3af9e
Merge pull request #6801 from matrix-org/dbkr/19012_rel_2
Fix emoji picker and stickerpicker not appearing correctly when opened
2021-09-14 15:32:32 +01:00
James Salter
a43f5507a3 Use a UUID instead of hashed user ID for tracking
Generate a UUID and save it to account data for cross device tracking.
2021-09-14 15:30:42 +01:00
Michael Telatynski
60f43f0171 Stop spinner on space preview if the join fails 2021-09-14 15:12:25 +01:00
Dariusz Niemczyk
cb6368f885 Fix autocomplete not having y-scroll
After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.

Fix https://github.com/vector-im/element-web/issues/18997
2021-09-14 15:08:40 +01:00
Dariusz Niemczyk
769c9cd780 Add a better comment describing the behavior 2021-09-14 15:03:59 +01:00
Dariusz Niemczyk
8505f292b2 Fix invalid ContextualMenu positions 2021-09-14 15:03:52 +01:00
Michael Telatynski
6672be91a1 Simplify Space Panel layout 2021-09-14 15:00:44 +01:00
Michael Telatynski
f59baf1efb Tidy some types 2021-09-14 14:41:55 +01:00
Michael Telatynski
5048e41e8b Space Hierarchy react to known local rooms changing names 2021-09-14 14:41:51 +01:00
Michael Telatynski
e37f6b96d7 Fix RoomTile subscribing to wrong event emitter for room name 2021-09-14 14:36:11 +01:00
Michael Telatynski
e3ec00bcdf Fix space create menu eating first character of name in private space creation 2021-09-14 14:35:33 +01:00
Michael Telatynski
ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Dariusz Niemczyk
74e4cc9680
Merge pull request #6793 from matrix-org/palid/fix/19012
Fix emoji picker and stickerpicker not appearing correctly when opened
2021-09-14 14:56:49 +02:00
Dariusz Niemczyk
42a1048fde
Merge pull request #6794 from matrix-org/palid/fix/18997
Fix autocomplete not having y-scroll
2021-09-14 14:53:06 +02:00
Dariusz Niemczyk
60174c9836
Add a better comment describing the behavior 2021-09-14 14:51:17 +02:00
Dariusz Niemczyk
527e1eb462
Fix autocomplete not having y-scroll
After changing flex-order the children did not have a max-height which
ended up in the child growing to outside of the screen instead of
being properly constrained.

Fix https://github.com/vector-im/element-web/issues/18997
2021-09-14 14:45:47 +02:00
Michael Telatynski
87c9551507 Fix edge cases around joining new room which does not belong to active space 2021-09-14 12:49:18 +01:00
Michael Telatynski
0ee77e2d17
Merge pull request #6791 from matrix-org/t3chguy/fix/19003 2021-09-14 11:48:27 +01:00
Michael Telatynski
3c44969645 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19003
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
2021-09-14 11:42:51 +01:00
Michael Telatynski
be58a5e623
Merge pull request #6790 from matrix-org/t3chguy/fix/19007
Hide mute/unmute button in UserInfo for Spaces as it makes no sense
2021-09-14 09:07:37 +01:00
Michael Telatynski
73a2225b10
Merge pull request #6792 from matrix-org/t3chguy/fix/19005
Fix automatic field population in space create menu not validating
2021-09-14 09:06:49 +01:00
Š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
Robin Townsend
465ce0820d Make message bubble font size consistent
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-13 23:32:01 -04: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
Dariusz Niemczyk
ceafa83392
Fix invalid ContextualMenu positions 2021-09-13 22:11:58 +02:00
Dariusz Niemczyk
e913f03a67
Add missing types 2021-09-13 22:11:43 +02: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
Michael Telatynski
4a470e4341 Fix automatic field population in space create menu not validating 2021-09-13 17:15:52 +01: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