Michael Telatynski
5d0d81e79a
not sure how I butchered this merge conflict resolution this much.
2021-06-03 19:37:26 +01:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606
2021-06-03 19:33:09 +01:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms
2021-06-03 08:44:01 +01:00
Michael Telatynski
4f50727010
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606
...
Conflicts:
src/components/structures/RoomView.tsx
src/components/views/right_panel/UserInfo.tsx
2021-06-03 08:42:05 +01:00
Michael Telatynski
83d223475b
delint imports
2021-06-03 08:41:22 +01:00
Germain Souquet
bc50028f70
Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash
2021-06-02 13:57:33 +01:00
Germain Souquet
c7c6a818f0
Merge branch 'develop' into gsouquet/switch-rooms
2021-05-26 09:51:27 +01:00
Michael Telatynski
c1f397dcf7
delint
2021-05-25 16:20:23 +01:00
Michael Telatynski
59f4c728c9
Initial cut of Pinned event card in the right panel
2021-05-25 16:10:44 +01:00
Germain
1751b4ba43
Merge pull request #6092 from matrix-org/gsouquet/window-dimensions-reflow
2021-05-25 12:00:08 +01:00
Germain Souquet
f156c2db15
prevent reflow in app when accessing window dimensions
2021-05-25 10:28:43 +01:00
Germain Souquet
b5295b03ce
Trigger join room actions properly
2021-05-24 14:34:06 +01:00
Germain Souquet
ecff5bd65c
Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash
2021-05-24 09:20:12 +01:00
Germain Souquet
4851e96297
Switch rooms documentation and polishing
2021-05-24 09:17:29 +01:00
Germain Souquet
ccfd6ba4b1
fix linting issues
2021-05-21 12:53:26 +01:00
Germain
49c853a304
Delete RoomView dead code
2021-05-20 09:37:33 +01:00
Germain Souquet
cf8e49729a
prevent unwarranted RoomView re-render
2021-05-19 14:32:49 +01:00
Germain Souquet
382a08bdb1
Delete RoomView dead code
2021-05-19 11:38:10 +01:00
Germain Souquet
871c48f69b
stop assuming that decryption happens ahead of time
2021-05-18 10:02:21 +01:00
Michael Telatynski
a8c4aabb52
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/i18n/strings/en_EN.json
2021-05-07 11:50:49 +01:00
Michael Telatynski
90538c95aa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021
2021-05-06 08:05:14 +01:00
Michael Telatynski
9518e4d415
Guard all isSpaceRoom calls behind the labs flag
2021-05-05 23:59:07 +01:00
Michael Telatynski
e390c3c732
Inhibit sending RR when context switching to a room
2021-04-29 09:37:21 +01:00
Michael Telatynski
18a01d9271
Show spaces beta prompt when viewing a space without the beta
2021-04-28 08:41:31 +01:00
Germain Souquet
d148b521f5
Revert JumpToBottom to button and use dispatcher to view room
2021-04-09 11:23:41 +01:00
Šimon Brandner
dacffdd62e
Add some comments
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 07:57:25 +02:00
Germain Souquet
c5eb17eabd
reset highlighted event on room timeline scroll
2021-04-07 09:48:56 +01:00
Šimon Brandner
d547cd5db8
Show drop file UI only if dragging a file
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-06 07:52:02 +02:00
Germain Souquet
a308a54183
Clicking jump to bottom resets room hash
2021-03-31 12:28:24 +01:00
J. Ryan Stinnett
33e8edb3d5
Merge pull request #5720 from czeidler/key-bindings
...
Decouple key bindings from event handling
2021-03-26 15:14:38 +00:00
Michael Telatynski
56dbd5f628
Remove unused autoJoin prop and move viaServers logic into RVS
...
this fixes the issue where autoJoining ignored viaServers
2021-03-24 16:45:53 +00:00
Clemens Zeidler
2a21d45ac0
Merge branch 'develop' into key-bindings
2021-03-12 16:44:12 +13:00
Travis Ralston
229a95f190
Merge pull request #5734 from matrix-org/travis/skinning/pt3-easy-comps
...
[SK-3] Decorate easy components with replaceableComponent
2021-03-11 07:26:20 -07:00
Michael Telatynski
bd3386358a
Merge pull request #5749 from matrix-org/t3chguy/spaces4.6
...
Properly gate SpaceRoomView behind labs
2021-03-11 11:17:36 +00:00
Michael Telatynski
4ca838d4c7
Properly gate SpaceRoomView behind labs
2021-03-11 11:04:39 +00:00
Travis Ralston
c230a75eda
Flag structural components as replaceable
2021-03-08 20:23:24 -07:00
Travis Ralston
bb80cfb9a6
Convert all of file uploads to the new dispatcher
2021-03-05 13:20:50 -07:00
Travis Ralston
676259e78c
Merge pull request #5505 from SimonBrandner/improve-file-drop-ui
...
File drop UI fixes and improvements
2021-03-04 20:30:45 -07:00
Clemens Zeidler
4a6f931782
Merge branch 'develop' into key-bindings
2021-03-04 21:10:35 +13:00
Šimon Brandner
0a4c0b69b0
Move fileDropTarget to RoomView
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 12:07:33 +01:00
Šimon Brandner
ff00683f32
Use ===
...
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-03-02 07:42:07 +01:00
Michael Telatynski
c10512fd56
Initial SpaceRoomView work
2021-03-01 18:53:11 +00:00
Michael Telatynski
c8fe3f7676
Pass room creation opts for new rooms into RoomView
2021-03-01 17:54:53 +00:00
Clemens Zeidler
ef7284e69d
Add missing JumpToOldestUnread action
2021-03-01 22:15:05 +13:00
Clemens Zeidler
601be50b71
Split KeyAction into multiple enums
...
This gives some additional type safety and makes enum member usage more
clear.
2021-03-01 21:43:00 +13:00
Clemens Zeidler
32ec8b7dc8
Add key bindings for RoomList, Room and Navigation
2021-02-28 20:13:34 +13:00
Travis Ralston
4e27b00cf3
Move call buttons to the room header
...
This is to make some room in the composer for voice messages. The hangup behaviour is intentionally lost by this change as the VOIP UX is intended to rely on dedicated hangup buttons instead.
2021-02-26 13:46:39 -07:00
Šimon Brandner
9a5ba072ba
Fix auxPanel
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:23:58 +01:00
Šimon Brandner
11c5aa02d2
Remove mx_RoomView_container
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:19:45 +01:00
Šimon Brandner
0d6a9fce67
Remove weird styling
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:12:14 +01:00
