mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 02:21:34 +03:00
Code Issues Projects Releases Packages Wiki Activity
33231 commits 219 branches 562 tags 474 MiB
Commit graph

108 commits

Author SHA1 Message Date
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
Šimon Brandner
dacffdd62e
Add some comments 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 07:57:25 +02: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
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
Šimon Brandner
c1a105f071
Merge branch 'develop' into improve-file-drop-ui 2021-02-25 18:12:37 +01:00
Michael Telatynski
3ca5632f6a Replace ObjectUtils.js with objects.ts 2021-02-19 00:00:10 +00:00
Šimon Brandner
5072fb0608
Merge branch 'develop' into improve-layout-handling 2021-02-15 16:12:08 +01:00
Michael Telatynski
53334de5a9 Fix RoomView re-mounting breaking peeking 
Because as of React 16 order of unmount & re-mount is undefined
this was causing the possibility of the unmount running after
the willMount of the replacement RoomView, upsetting the state
of the singleton inside the js-sdk.
 2021-01-31 16:09:11 +00:00
J. Ryan Stinnett
5431dc7331
Merge pull request #5548 from SimonBrandner/add-search-shortcut 
Add optional search shortcut
 2021-01-28 12:33:32 +00:00
Šimon Brandner
972c947049
More generic layout setting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-23 10:35:35 +01:00
Travis Ralston
27dc4cb574 Appease the linter 2021-01-22 17:03:36 -07:00
Travis Ralston
807a8c41e3 Remove debug 2021-01-22 17:02:00 -07:00
Travis Ralston
6ac8803191 Update AuxPanel and related buttons when widgets change or on reload 
If we have widgets we're meant to be showing due to layout or because we reloaded the page (slightly different code paths) then we need to show those. This change fixes a bug in that where the layout wasn't being applied at the right moment in time so was never showing the widgets.

Seems to only be an issue if the layout state event was sent by someone other than you.
 2021-01-22 17:00:30 -07:00
Travis Ralston
7413cea6ea Format imports because the IDE said so 2021-01-22 16:58:47 -07:00
Travis Ralston
1768d6ea5f Move all widget pinning logic to the WidgetLayoutStore 2021-01-18 20:26:47 -07:00
Šimon Brandner
cb91d7037f
Added search shortcut 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-17 08:28:52 +01:00
Šimon Brandner
365d252d3f Fix removing event listeners 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-17 20:25:12 +01:00
Šimon Brandner
e70dee08d0 Fix flickering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-17 19:50:59 +01:00
Šimon Brandner
dcb30b72b0 Fix left panel resizer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-17 13:25:22 +01:00
Travis Ralston
3e3a32cf10 Only show confetti if the current room is receiving an appropriate event 2020-12-09 11:56:57 -07:00
Travis Ralston
f30d2ff1c5 Fix confetti room unread state check 
Turns out that if you want confetti from other people you would need to have rooms on "All Messages" or higher - this isn't as fun for those of us who have most of our rooms as Mentions Only.
 2020-12-07 16:54:09 -07:00
Travis Ralston
550a5220d9 Undocumented linter cleanup 2020-12-07 15:12:26 -07:00
Travis Ralston
2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07:00
Michael Telatynski
3223b00028 Jump to home page when leaving a room 
so that you don't get thrown into a room you may be ignoring on purpose
 2020-12-03 11:15:55 +00:00
Steffen Kolmer
0e53e220d0
Fixed copy paste error 2020-11-27 17:25:34 +01:00
nurjinn jafar
6ce5d3b044 refactored effects dir and changed effects exported name 2020-11-27 16:32:04 +01:00