PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
33803 commits 1 branch 0 tags 338 MiB
Commit graph

13795 commits

Author SHA1 Message Date
Michael Telatynski
17bbbff479 Remove Promise allSettled polyfill as its widespread enough now and js-sdk uses it directly 2021-05-25 16:12:34 +01:00
Michael Telatynski
59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Michael Telatynski
4fa6d3599b Convert PinnedEventTile to Typescript 2021-05-25 15:44:39 +01:00
Germain
7ecd96b320
Merge pull request #6095 from matrix-org/gsouquet/sticky-headers-results 2021-05-25 15:32:49 +01:00
Germain Souquet
b09dd8f1f8 remove unused values 2021-05-25 14:54:27 +01:00
Germain Souquet
d644338421 WhoIsTypingTile TypeScript conversion 2021-05-25 14:34:19 +01:00
Germain Souquet
a803e33ffe Convert WhoIsTypingTile to TypeScript 2021-05-25 14:10:16 +01:00
Michael Telatynski
02d11b8926 Extend HeaderButton and HeaderButtons to be more generic 2021-05-25 13:53:46 +01:00
Germain Souquet
7303166924 fix sticky headers when results num get displayed 2021-05-25 13:53:20 +01:00
Michael Telatynski
96928e5d31 Header Buttons switch to a fragment from an array of nodes 2021-05-25 13:17:14 +01:00
Michael Telatynski
13427aaf07 Add a pulse animation to the pinned messages indicator and move it 2021-05-25 13:07:39 +01:00
Germain Souquet
88af74e4a4 Improve addEventsToTimeline performance scoping WhoIsTypingTile::setState 2021-05-25 12:45:19 +01:00
J. Ryan Stinnett
cb88f37bbd Remove outdated diagnostic log 
The cited issue (https://github.com/vector-im/element-web/issues/11120) has
since been fixed, so this "temporary" (2 years ago) logging is no longer needed.
 2021-05-25 12:28:16 +01:00
Michael Telatynski
152c178ea9 Convert NotificationPanel to Typescript 2021-05-25 12:15:37 +01:00
Michael Telatynski
170b11d130 Convert RightPanel to Typescript 2021-05-25 12:13:16 +01:00
Germain
1751b4ba43
Merge pull request #6092 from matrix-org/gsouquet/window-dimensions-reflow 2021-05-25 12:00:08 +01:00
Michael Telatynski
5980528f30
Merge pull request #6089 from matrix-org/t3chguy/fix/17336 
Use local room state to render space hierarchy if the room is known
 2021-05-25 11:59:09 +01:00
Germain Souquet
f156c2db15 prevent reflow in app when accessing window dimensions 2021-05-25 10:28:43 +01:00
Germain Souquet
a57887cc61 Prevent layout trashing on EffectsOverlay 2021-05-25 10:28:32 +01:00
Germain Souquet
ac93cc514f Prevent layout trashing when resizing the window 2021-05-25 10:28:20 +01:00
Germain Souquet
73d51a91d6 Prevent unneeded state updates to hide StickerPicker 2021-05-25 10:27:59 +01:00
David Schilling
5c674365d3 Add url param defaultUsername to prefill the login username field 
Signed-off-by: David Schilling <dschilling@churchtools.de>
 2021-05-25 10:39:33 +02:00
Michael Telatynski
4be8bbeef9 Close creation menu when expanding space panel via expand hierarchy 2021-05-24 21:17:30 +01:00
Michael Telatynski
5b66975605 Use local room state to render space hierarchy if the room is known 2021-05-24 18:57:24 +01:00
Germain Souquet
cdecc156df Remove unused prop 2021-05-24 17:30:37 +01:00
Germain Souquet
3b69c0203c Remove resize notifier prop from RoomTile 2021-05-24 17:05:59 +01:00
Germain Souquet
fdc22bfdf7 Adhere to TypeScript codestyle better 2021-05-24 16:40:55 +01:00
Germain Souquet
0bbfb1a6d9 remove unused variable checkObjectHasNoAdditionalKeys 2021-05-24 16:18:55 +01:00
Germain Souquet
671f169457 Remove unused middlePanelResized event listener 2021-05-24 16:08:48 +01:00
Germain Souquet
36d95ff737 Display spinner in user menu when joining a room 2021-05-24 15:02:26 +01:00
Germain Souquet
19569f3897 Convert Tooltip to TypeScript 2021-05-24 15:01:59 +01:00
Germain Souquet
b5295b03ce Trigger join room actions properly 2021-05-24 14:34:06 +01:00
Germain Souquet
d6bc1861ae Migrate InlineSpinner to TypeScript 2021-05-24 14:33:31 +01:00
Robin Townsend
5c7da97ff6 Give forward dialog send buttons an accessible label 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-24 08:55:08 -04:00
Robin Townsend
121ed5eba9 Pass Matrix client around as matrixClient 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-24 08:51:04 -04:00
Robin Townsend
6ced61b709 Use camelCase 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-24 08:34:03 -04:00
Robin Townsend
400917623c Make myself the copyright holder for forward dialog code 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-24 08:33:28 -04:00
Robin Townsend
88e0e9b9fb Merge branch 'develop' into improved-forwarding-ui 2021-05-24 08:23:07 -04: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
Michael Telatynski
a6adfde8e2
Merge pull request #6070 from matrix-org/t3chguy/fix/17360 
Improve explore rooms when no results are found
 2021-05-23 21:17:35 +01:00
Robin Townsend
cd460a2555 Adjust forward dialog copy 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-21 12:59:13 -04:00
Robin Townsend
7a04502151 Iterate on forward dialog design feedback 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-21 12:41:29 -04:00
Michael Telatynski
35b9388fc2 Iterate PR 2021-05-21 13:37:21 +01:00
J. Ryan Stinnett
44ecf62758 Add explicit member access 2021-05-21 13:15:54 +01:00
Robin Townsend
f34d61cf5d Merge branch 'develop' into improved-forwarding-ui 2021-05-21 08:15:09 -04:00
J. Ryan Stinnett
3b50808cb0 Use any instead of object 2021-05-21 13:11:33 +01:00
J. Ryan Stinnett
320c8d2091 Move function prop to bottom 2021-05-21 13:10:50 +01:00
J. Ryan Stinnett
e4cf66f0e4 Move state init to constructors 2021-05-21 13:09:24 +01:00
J. Ryan Stinnett
5d6f16ff64 Add explicit public 2021-05-21 12:59:54 +01:00
J. Ryan Stinnett
66077e3a05 Add spaces to imports 2021-05-21 12:57:51 +01:00
Germain Souquet
ccfd6ba4b1 fix linting issues 2021-05-21 12:53:26 +01:00
J. Ryan Stinnett
f8e61a982b One less Set 2021-05-21 12:41:59 +01:00
J. Ryan Stinnett
d59b2b3579 Fix unintended buttons class change 2021-05-21 12:38:32 +01:00
J. Ryan Stinnett
d0da4b2a25 Use separate name for verification request component 2021-05-21 12:37:34 +01:00
Germain Souquet
5ba419db54 split room header and header wrapper 2021-05-21 10:21:54 +01:00
Germain Souquet
47e007e08f batch load events in ReplyThread before adding them to the state 2021-05-21 10:20:24 +01:00
Robin Townsend
332412782e Remove logo spinner 
Removed since design wants to avoid associating slowness with the brand.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-20 17:31:10 -04:00
Michael Telatynski
d0d56d4b42
Merge pull request #6073 from matrix-org/t3chguy/fix/17412 
Fix add reaction prompt showing even when user is not joined to room
 2021-05-20 21:00:10 +01:00
Travis Ralston
767c7a1e38
Merge pull request #5680 from robintown/better-spinners 
Vectorize spinners
 2021-05-20 13:31:35 -06:00
Michael Telatynski
e984a4f0cd rejig the code to make types happy 2021-05-20 20:12:28 +01:00
Michael Telatynski
073127aa3c Fix handling of via servers for suggested rooms 2021-05-20 18:47:12 +01:00
Germain Souquet
0f63098c59 Remove typo semicolon 2021-05-20 18:02:44 +01:00
Germain Souquet
229c4b98b4 use userGroups cached value to avoid re-render 2021-05-20 18:02:03 +01:00
J. Ryan Stinnett
d9e490926b Add types to DevtoolsDialog 2021-05-20 17:59:45 +01:00
J. Ryan Stinnett
df09bdf823 Add types to InteractiveAuthEntryComponents 2021-05-20 17:59:45 +01:00
J. Ryan Stinnett
6574ca98fa Fix basic lint errors 2021-05-20 17:56:16 +01:00
J. Ryan Stinnett
21c1179f8d Update extensions for more files with types 
This migrates the another bucket of files using some amount of Flow typing to
mark them as TypeScript instead. The remaining type errors are fixed in
subsequent commits.
 2021-05-20 17:56:16 +01:00
Germain
fff849c611
Merge pull request #6071 from matrix-org/gsouquet/roomview-deadcode 
Delete RoomView dead code
 2021-05-20 17:10:57 +01:00
Germain Souquet
9e55f24092 Remove extraenous DOM nodes 2021-05-20 16:11:33 +01:00
Germain Souquet
f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Germain Souquet
171539d42d Simplify EventTile structure 
Only render MessageTimestamp to the DOM when a tile is hovered
 2021-05-20 15:26:02 +01:00
Germain Souquet
d362321706 Simplify SenderProfile DOM structure 2021-05-20 15:25:20 +01:00
Michael Telatynski
dab75f9b88 Fix add reaction prompt showing even when user is not joined to room 2021-05-20 12:20:53 +01:00
Michael Telatynski
35710da174
Merge pull request #6069 from matrix-org/t3chguy/fix/17386 
Fix room name issues in right panel summary card
 2021-05-20 12:08:33 +01:00
Germain Souquet
422740f13b normalize displayName 2021-05-20 11:04:17 +01:00
Germain
49c853a304 Delete RoomView dead code 2021-05-20 09:37:33 +01:00
Michael Telatynski
aa7ccc1420 Show prompt to create new room from room directory results 2021-05-19 20:07:54 +01:00
Michael Telatynski
a61e977b5f Fix room directory ts migration 2021-05-19 19:30:56 +01:00
Michael Telatynski
8b67cdb80b Pre-populate create room dialog name when going from room directory 2021-05-19 19:20:58 +01:00
Michael Telatynski
b3aade075d Convert CreateRoomDialog to Typescript 2021-05-19 19:18:28 +01:00
Michael Telatynski
d10a45c6a3 Convert RoomDirectory and NetworkDropdown to Typescript 2021-05-19 18:40:03 +01:00
Robin Townsend
6cb6c7f3d0 Combine forward dialog room and DM lists 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-19 13:33:48 -04:00
Robin Townsend
678b298bab Merge branch 'develop' into improved-forwarding-ui 2021-05-19 12:39:48 -04:00
Michael Telatynski
aa4984019c
Merge pull request #6061 from jaiwanth-v/update-memberlist-invite 
Update MemberList to reflect changes for invite permission change
 2021-05-19 17:35:58 +01:00
Michael Telatynski
f52dc9a3ea Fix room name not updating whilst summary card is open 2021-05-19 17:12:31 +01:00
Michael Telatynski
b252005778
Merge pull request #6067 from matrix-org/t3chguy/spaces-0-subrooms 
Show subspace rooms count even if it is 0 for consistency
 2021-05-19 15:41:30 +01:00
Germain Souquet
cf8e49729a prevent unwarranted RoomView re-render 2021-05-19 14:32:49 +01:00
Germain
6170403c10
Depile encrypted events to find the most suitable one for preview (#6056) 2021-05-19 13:25:52 +01:00
Jaiwanth
d73eb0c70f Update MemberList.js 2021-05-19 17:46:10 +05:30
Michael Telatynski
6e25e42e66 Show subspace rooms count even if it is 0 for consistency 2021-05-19 13:00:46 +01:00
Michael Telatynski
f985918859
Merge pull request #6057 from matrix-org/t3chguy/fix/17350 
Support filtering by alias in add existing to space dialog
 2021-05-19 12:29:00 +01:00
Michael Telatynski
bde95e313d
Merge pull request #6064 from matrix-org/t3chguy/fix/rs5084 
Fix issue when a room without a name or alias is marked as suggested
 2021-05-19 12:28:41 +01:00
Michael Telatynski
9b01e1575d
Merge pull request #6055 from matrix-org/t3chguy/fix/17332 
Fix space room hierarchy not updating when removing a room
 2021-05-19 12:28:11 +01:00
Germain Souquet
8f945ce846 Render nothin rather than an empty div 2021-05-19 11:57:32 +01:00
Germain Souquet
382a08bdb1 Delete RoomView dead code 2021-05-19 11:38:10 +01:00
Michael Telatynski
78a8c9e10e Fix issue when a room without a name or alias is marked as suggested 2021-05-19 10:46:11 +01:00
Germain
f7d0afcd28
Performance monitoring measurements (#6041) 2021-05-19 10:07:02 +01:00
Jaiwanth
e78206301f Modify to avoid forceUpdate 2021-05-19 14:31:04 +05:30
Jaiwanth
0d8a7eabc7 Update MemberList on invite permission change 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-19 12:49:55 +05:30
Germain
cf384c2a54
Merge pull request #6052 from matrix-org/gsouquet/decrypt-relations 2021-05-18 17:21:13 +01:00
Michael Telatynski
edb2026780 Support any alias not just first 2021-05-18 13:31:53 +01:00
Michael Telatynski
655010844a Switch to using QueryMatcher for add existing to space dialog 
This helps it support filtering by alias
 2021-05-18 13:27:34 +01:00
Germain Souquet
f9f10de0da use renamed decrypt event method 2021-05-18 13:01:38 +01:00
Michael Telatynski
2732280923 Fix space room hierarchy not updating when removing a room 2021-05-18 11:54:45 +01:00
Germain Souquet
1cfd4b6e1a Use client.decryptEvent to avoid accessing js-sdk private members 2021-05-18 11:41:20 +01:00
Michael Telatynski
afd9843722 Fix broken string interpolation in chat effects warning 2021-05-18 10:28:37 +01:00
Germain Souquet
871c48f69b stop assuming that decryption happens ahead of time 2021-05-18 10:02:21 +01:00
Travis Ralston
6ccb0d487a Merge branch 'develop' into travis/msc2873 2021-05-17 16:27:20 -06:00
Robin Townsend
d3f1754dfd Fix crash on opening notification panel 
The check for pending edits needed a null guard, since the notification
panel uses MessagePanel but is not associated with a specific room.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-17 12:24:41 -04:00
Germain Souquet
7e846b8532 remove unused import 2021-05-17 15:05:20 +01:00
Germain Souquet
c67f31144f remove custom LoggedInView::shouldComponentUpdate logic 2021-05-17 14:45:41 +01:00
Michael Telatynski
6e5847ea6b Fix right clicking on add reactions prompt button behaviour 2021-05-17 10:01:56 +01:00
Michael Telatynski
a22a1918e1 Fix add reactions prompt button showing up even if all reactions have been removed 2021-05-17 10:01:43 +01:00
Robin Townsend
e798b36f1d Decorate forward dialog room avatars 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-16 08:39:22 -04:00
Robin Townsend
64e828d069 Merge branch 'develop' into improved-forwarding-ui 2021-05-16 08:13:59 -04:00
Robin Townsend
555b2e3266 Reuse Spinner styles for InlineSpinner 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-16 08:00:54 -04:00
Robin Townsend
74cc00b319 Merge branch 'develop' into better-spinners 2021-05-16 07:47:34 -04:00
Michael Telatynski
b06514273f
Merge pull request #6043 from SimonBrandner/fix/add-ids 
Add ids to homeserver and passphrase fields
 2021-05-15 15:22:27 +01:00
Šimon Brandner
bdf7837044
Add mx to homeserverInput 2021-05-15 16:13:26 +02:00
Šimon Brandner
ce4439e118
Add mx to passPhraseInput 2021-05-15 16:13:02 +02:00
Šimon Brandner
37348375a2
Add id for passpharase 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-15 15:07:35 +02:00
Šimon Brandner
fef081c736
Add id for homeserver field 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-15 15:07:15 +02:00
Travis Ralston
89933d779c Merge branch 'develop' into travis/msc2873 2021-05-14 14:22:53 -06:00
Travis Ralston
55eddae096
Merge pull request #6035 from matrix-org/travis/voicemessages/playback-time 
Improve progress bar progression for smaller voice messages
 2021-05-14 10:17:35 -06:00
Michael Telatynski
49b24408bb
Merge pull request #6039 from matrix-org/t3chguy/public-space-no-invite 
Fix share space edge case where space is public but not invitable
 2021-05-14 16:46:50 +01:00
Travis Ralston
6df079a5bd
Merge pull request #6033 from matrix-org/travis/rel-imageview 
Add missing 'rel' to image view download button
 2021-05-14 08:12:11 -06:00
Michael Telatynski
882000dfcb
Merge pull request #6040 from matrix-org/t3chguy/fix/17296 
Fix roving tab index intercepting home/end in space create menu
 2021-05-14 15:07:34 +01:00
Michael Telatynski
c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276 
Decorate room avatars with publicity in add existing to space flow
 2021-05-14 11:23:46 +01:00
Michael Telatynski
d0458332d5 fix roving tab index intercepting home/end in space create menu 2021-05-14 11:22:20 +01:00
Michael Telatynski
4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674 
Improve Spaces "Just Me" wizard
 2021-05-14 10:58:55 +01:00
Michael Telatynski
6f9c2f05a2 remove unused vars/imports 2021-05-14 10:49:53 +01:00
Michael Telatynski
034bd9cb02
Merge pull request #6029 from matrix-org/t3chguy/fix/17275 
Show alternative button during space creation wizard if no rooms
 2021-05-14 10:48:39 +01:00
Michael Telatynski
e1df62472d remove unused imports and run i18n 2021-05-14 10:48:24 +01:00
Michael Telatynski
f31f7b243d Fix share space edge case where space is public but not invitable 2021-05-14 10:46:09 +01:00
Travis Ralston
ddf9027daa Improve progress bar progression for smaller voice messages 
Instead of chunking the thing, we'll improve our precision and clock accuracy. Clock accuracy is improved by flagging the "load time" of the clip in the context, which can be about 500ms (or more) off the context's start line. The precision is just a number in the PlaybackWaveform component.
 2021-05-13 22:35:43 -06:00
Jaiwanth
26dd6d5510 Swap rotate left and right buttons 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-14 08:26:29 +05:30
Travis Ralston
b9f775d969 Add missing 'rel' to image view download button 
We're supposed to have this on every link off-site.
 2021-05-13 20:55:14 -06:00
Travis Ralston
e38d27f64e
Merge pull request #5915 from aaronraimist/initialisation 
Typo: initilisation -> initialisation
 2021-05-13 20:15:08 -06:00
Travis Ralston
2d2c0d54c0
Merge pull request #6001 from jaiwanth-v/save-edited-state-messages 
Save edited state of a message when switching rooms
 2021-05-13 20:06:31 -06:00
Michael Telatynski
5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622 2021-05-13 16:12:42 +01:00
Michael Telatynski
6aa477f0f5 Decorate room avatars with publicity in add existing to space flow 2021-05-13 14:23:28 +01:00
Michael Telatynski
f6e8d38b87 Remove redundant tag prop 2021-05-13 14:23:10 +01:00
Michael Telatynski
a41d76b588 fix typos 2021-05-13 14:14:01 +01:00
Michael Telatynski
76afc1100a Convert to Typescript and move from ClientPeg to Context 2021-05-13 14:13:00 +01:00
Michael Telatynski
87ae47bd61 tweak reactions row some more, third try lucky 2021-05-13 13:59:10 +01:00
Michael Telatynski
36633ec025 Tweak alignment of reactions row, move add reaction to right and only show on hover 2021-05-13 13:32:38 +01:00
Michael Telatynski
2f28de8472 Show alternative button during space creation wizard if user opted to create 0 rooms 2021-05-13 13:22:50 +01:00
Michael Telatynski
b5fa4d88bf Add extra add reactions button to encourage more diverse reactions to content 2021-05-13 10:56:51 +01:00
Michael Telatynski
423c515708 Consolidate AddExistingToSpace between Dialog and Just Me integrated flow 2021-05-13 09:46:45 +01:00
Travis Ralston
f98eee318e Fill out fields for MSC2873 values 
As required by https://github.com/matrix-org/matrix-widget-api/pull/36
 2021-05-12 14:10:02 -06:00
Travis Ralston
3aef3b72b5 Move language handling into languageHandler 2021-05-12 14:08:32 -06:00
Michael Telatynski
52420feab0
Merge pull request #6021 from matrix-org/t3chguy/fix/17268 
Iterate beta feedback dialog
 2021-05-12 17:42:42 +01:00
Michael Telatynski
654ce95c74 Progress from adding existing rooms to new space upon completion 2021-05-12 17:31:55 +01:00
Michael Telatynski
5430f44c27 Convert verification and UntrustedDeviceDialog to TS 2021-05-12 17:08:44 +01:00
Michael Telatynski
565e41c3df Extract UntrustedDeviceDialog and fix e2ee icon 2021-05-12 17:04:24 +01:00
Michael Telatynski
607ca17971 Iterate beta feedback dialog 2021-05-12 16:11:38 +01:00
Michael Telatynski
2c89be312a Disable space fields whilst their form is busy 2021-05-12 13:30:00 +01:00
J. Ryan Stinnett
23869cdaa7 Add missing space on beta feedback dialog 2021-05-12 12:32:39 +01:00
Germain
91133ed35b
Prioritise and reduce the amount of events decrypted on application startup (#5980) 2021-05-12 12:19:53 +01:00
Germain
bd2917aa69
Add a limit option for autocomplete results (#6016) 2021-05-12 12:18:56 +01:00
Michael Telatynski
2c2d95560b Linkify topics in space room directory results 2021-05-12 10:05:53 +01:00
Travis Ralston
7bd1a2b87f
Merge pull request #5972 from SimonBrandner/fix/17164/remember-collapsed-state 
Persistent space collapsed states
 2021-05-11 23:23:48 -06:00
Šimon Brandner
262fc40afb
Move comment to the correct place 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-12 07:12:00 +02:00
Travis Ralston
9842bcde50
Merge pull request #6010 from ndarilek/develop 
Catch another instance of unlabeled avatars.
 2021-05-11 21:44:15 -06:00
Michael Telatynski
7396ce76e5 Tweak the feedbacks a tad 2021-05-11 17:30:33 +01:00
Michael Telatynski
7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +01:00
Michael Telatynski
bf4c8f048f Add feedback mechanism for beta features 2021-05-11 15:58:19 +01:00
Nolan Darilek
006aa2d5b9 Catch another instance of unlabeled avatars. 
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
 2021-05-11 09:39:06 -05:00
Jaiwanth
240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
Michael Telatynski
df72fbb22a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-05-11 14:07:47 +01:00
Michael Telatynski
2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-05-11 13:40:28 +01:00
Michael Telatynski
f0342b0ea7
Merge pull request #6009 from matrix-org/t3chguy/fix/15359 
Improve permissions error when adding new server to room directory
 2021-05-11 12:36:40 +01:00
Michael Telatynski
b0f23aa65b Improve permissions error when adding new server to room directory 2021-05-11 12:20:18 +01:00
Germain Souquet
da1df70557 Improve comments and explainer for new decryption approach 2021-05-11 10:18:53 +01:00
Šimon Brandner
1b877f2b7c
Make SpaceTreeLevelLayoutStore into a singleton 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 11:16:14 +02:00
Šimon Brandner
4115fd8695
Rewrite SpaceTreeLevelLayoutStore to save paths 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 11:13:13 +02:00
Michael Telatynski
23001cb10d remove unused import 2021-05-11 10:11:51 +01:00
Germain Souquet
be236309c5 use arrayFastClone instead of slice 2021-05-11 10:08:57 +01:00
Michael Telatynski
de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
Michael Telatynski
5eed9f6cba Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227 2021-05-11 09:14:01 +01:00
Šimon Brandner
965af1a642
Initial SpaceTreeLevelLayoutStore implementation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-11 08:08:02 +02:00
Jaiwanth
87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages 2021-05-11 11:12:32 +05:30
Šimon Brandner
bc0ff5bbea
Merge branch 'develop' into fix/17164/remember-collapsed-state 2021-05-11 07:38:08 +02:00
Jaiwanth
4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Jaiwanth
376befd38e
Update src/components/views/rooms/EditMessageComposer.js 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-05-11 10:37:53 +05:30
Travis Ralston
7ac12d14af
Merge pull request #5865 from jaiwanth-v/edit-slashcommands 
Add slash commands support to edit message composer
 2021-05-10 20:16:44 -06:00
Travis Ralston
12657f0fbc Merge branch 'develop' into edit-slashcommands 2021-05-10 20:09:33 -06:00
Travis Ralston
beef07bdef Merge branch 'develop' into err 2021-05-10 20:08:19 -06:00
Travis Ralston
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js 2021-05-10 20:03:20 -06:00
Travis Ralston
379d19e2e0
Lint 2021-05-10 19:56:30 -06:00
Robin Townsend
c39d9649ba Merge branch 'develop' into improved-forwarding-ui 2021-05-10 13:38:02 -04:00
Robin Townsend
503301aa89 Make rooms in ForwardDialog clickable 
…so that you can jump to a room easily once you've forwarded a message
there.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-10 13:00:06 -04:00
Germain Souquet
17f4945323 Merge branch 'develop' into gsouquet/cache-decrypt 2021-05-10 17:34:44 +01:00
Michael Telatynski
70d7a59ea2
Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1 
Switch the Home Space out for an All rooms space
 2021-05-10 16:26:05 +01:00
Michael Telatynski
95b43d1284
Merge pull request #5985 from aaronraimist/blank-device-name 
Show device ID in UserInfo when there is no device name
 2021-05-10 16:19:56 +01:00
Michael Telatynski
c96bb374ea Allow user to progress through space setup wizard using Enter/Return 2021-05-10 16:06:23 +01:00
Germain Souquet
f1a6f6fd7f make breadcrumb room events decryption more idiomatic 2021-05-10 15:48:39 +01:00
Michael Telatynski
3a75eb1226 Fix handling of enter/return in space creation menu 2021-05-10 14:39:10 +01:00
J. Ryan Stinnett
4311d91372
Merge pull request #5982 from SimonBrandner/fix/17184/dont-use-event-meta 
Don't use the event's metadata to calc the scale of an image
 2021-05-10 13:06:08 +01:00