mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 23:52:10 +03:00
Code Issues Projects Releases Packages Wiki Activity
34959 commits 219 branches 562 tags 474 MiB
Commit graph

5306 commits

Author SHA1 Message Date
Michael Telatynski
5061db259a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12 2021-03-25 16:37:56 +00:00
Michael Telatynski
ea77ab125e Show a face pile on a space preview 2021-03-25 16:15:34 +00:00
Michael Telatynski
35ede972db clear filter when switching spaces 2021-03-25 13:29:17 +00:00
Michael Telatynski
3ce9db162e Tweak some spaces copy 2021-03-25 13:24:16 +00:00
Panagiotis
aa1f468235 fix: room id sticked with event id 2021-03-25 14:36:40 +02:00
Michael Telatynski
760b11f214
Merge pull request #5789 from matrix-org/t3chguy/spaces4.11 
Tweak and fix some space features
 2021-03-25 09:02:11 +00:00
Michael Telatynski
d705e3020f delint 2021-03-24 20:01:27 +00:00
Michael Telatynski
20ea1436fc Update iconography for spaces 2021-03-24 19:43:33 +00:00
Michael Telatynski
8369d42dd0 Hoist activeSpace tracking from RoomList to LeftPanel 2021-03-24 19:43:09 +00:00
Michael Telatynski
6d9496cc22 Consolidate space summary api logic between space room view and directory 2021-03-24 17:02:12 +00:00
Michael Telatynski
d9f3e70b0b Fix joining over federation from Space Home (via servers) 2021-03-24 16:46:30 +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
Michael Telatynski
ea760e8f29 Fix space room directory behaviour 2021-03-24 15:26:56 +00:00
Michael Telatynski
3df3baea14 Tweak behaviour during space creation 2021-03-24 14:19:10 +00:00
Michael Telatynski
f7a3805eed Fix styling inconsistency in space room view 2021-03-24 14:02:25 +00:00
Michael Telatynski
4e9a2df3b0 Spaces autofocus and prefill the search box 2021-03-24 14:00:52 +00:00
Michael Telatynski
fb46815b6a Spaces move away from Form Buttons 2021-03-24 13:15:31 +00:00
Travis Ralston
2f2bb9456f Reduce code duplication 2021-03-23 18:17:41 -06:00
Travis Ralston
fa54ca615a Appease the linter 2021-03-22 21:41:13 -06:00
Travis Ralston
026aa6f88d Track next event [tile] over group boundaries 
Fixes https://github.com/vector-im/element-web/issues/16745
 2021-03-22 21:39:07 -06:00
Travis Ralston
2f8ed0bffc
Merge pull request #5781 from matrix-org/t3chguy/fix/16739 
Fix redaction event list summaries breaking sender profiles
 2021-03-22 15:52:36 -06:00
Michael Telatynski
2818cdf3d4 Fix space hierarchy exploding when encountering an empty subspace 2021-03-22 17:46:50 +00:00
Michael Telatynski
03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10 
Improve discovery of rooms in a space
 2021-03-22 13:24:23 +00:00
Michael Telatynski
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9 
Spaces improve creation journeys
 2021-03-22 13:24:10 +00:00
Michael Telatynski
497caf5645 Fix redaction event list summaries breaking sender profiles 2021-03-22 13:22:16 +00:00
Michael Telatynski
98df2883d3
Merge pull request #5728 from matrix-org/t3chguy/fix/3657 
Collapse redactions into an event list summary
 2021-03-19 19:16:20 +00:00
Travis Ralston
3caf07be87
Merge pull request #5658 from matrix-org/travis/welcome-login 
Add an optional config option to make the welcome page the login page
 2021-03-19 09:12:35 -06:00
Travis Ralston
6ce0c17455
Merge pull request #5774 from matrix-org/travis/js-sdk-imports 
Convert a bunch more js-sdk imports to absolute paths
 2021-03-19 07:23:45 -06:00
Travis Ralston
1f5c090ed2
Merge pull request #5775 from matrix-org/travis/fix-archive 
Remove forgotten rooms from the room list once forgotten
 2021-03-19 07:23:18 -06:00
Michael Telatynski
76dffdcb2c Tweak space creation copy and auto focus fields 2021-03-19 13:20:30 +00:00
Michael Telatynski
1fbbb67e74 Consolidate button styles in Space creation flows 2021-03-19 13:20:30 +00:00
Michael Telatynski
c6f6d24b32 Iterate space creation and previews 2021-03-19 13:20:30 +00:00
Michael Telatynski
90d87122bc Tweak copy on space creation flows 2021-03-19 13:20:30 +00:00
Michael Telatynski
d04c8b3fb4 Improve discovery of rooms in a space 2021-03-19 11:54:10 +00:00
Travis Ralston
3bd186e2d2
Merge pull request #5772 from SimonBrandner/fix-timeline-jumps 
Fix weird timeline jumps
 2021-03-18 23:51:52 -06:00
Travis Ralston
1d43c8b791 Remove forgotten rooms from the room list once forgotten 
Fixes https://github.com/vector-im/element-web/issues/15559

This isn't exactly perfect as an implementation: if the user refreshes immediately after forgetting then there is a good chance the room re-appears because of the sync accumulator. At the very least this change makes it so in *most* cases the room goes away, which is probably good enough until https://github.com/vector-im/element-web/issues/14038 can be implemented properly.
 2021-03-18 23:28:59 -06:00
Travis Ralston
1d9d0cd7be Convert a bunch more js-sdk imports to absolute paths 
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
 2021-03-18 20:50:34 -06:00
Travis Ralston
720ac9d837 Replace type declaration in Registration.tsx 2021-03-18 14:45:14 -06:00
Šimon Brandner
4a506a809e
Merge branch 'develop' into fix-timeline-jumps 2021-03-18 18:26:43 +01:00
Šimon Brandner
7ac8fdea64
Don't call scrollToBottom() on scroll_to_bottom() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-18 18:02:33 +01:00
Šimon Brandner
a4a3b4da78
jumpToLiveTimeline() on scroll_to_bottom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-18 18:01:50 +01:00
Michael Telatynski
17399c6be6
Merge pull request #5764 from matrix-org/t3chguy/spaces4.9 
Fix left panel resizing and lower min-width improving flexibility
 2021-03-18 11:34:55 +00:00
David Baker
bd763a09ba
Merge pull request #5765 from matrix-org/dbkr/resize_dispatch_async 
Make some dispatches async
 2021-03-16 16:00:05 +00:00
David Baker
67e2ae9988 Make some dispatches async 
It looks like these dispatches were being dispatched while already
dispatching, causing soft crashes (although I can't see where the
first dispatch was from). Either way, seems like these didn't need
to be sync.
 2021-03-16 15:42:03 +00:00
Michael Telatynski
688407abe6
Merge branch 'develop' into t3chguy/spaces4.9 2021-03-16 11:14:38 +00:00
Michael Telatynski
11cd791c76 Tweak left panel min widths for better flexibility 2021-03-16 11:13:39 +00:00
Michael Telatynski
baaceccfda Rearrange dom hierarchy to put space panel at same level as LeftPanel 
so they don't steal horizontal space from each other
 2021-03-16 11:13:39 +00:00
Travis Ralston
0e0ccfea88
Merge pull request #5756 from SimonBrandner/hangup-all-on-logout 
Hangup all calls on logout
 2021-03-15 21:10:13 -06:00
Travis Ralston
9b6d9b3bf1 years are difficult 2021-03-12 15:02:39 -07:00
Travis Ralston
75cfd9a8f5 Redirect to login properly 2021-03-12 15:01:05 -07:00
Travis Ralston
c8d7b0e1b9 Collapse copyright 2021-03-12 14:56:47 -07:00
Travis Ralston
25485edb3f Merge branch 'develop' into travis/welcome-login 2021-03-12 14:55:40 -07:00
Travis Ralston
d3541b78eb
Merge pull request #5714 from matrix-org/travis/media-customization 
Support a media handling customisation endpoint
 2021-03-12 11:01:59 -07:00
Šimon Brandner
02051a39ff
Hangup all calls on logout 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-12 13:55:14 +01:00
Clemens Zeidler
a8a8741c06 Make FocusRoomSearch a NavigationAction 2021-03-12 19:40:28 +13:00
Clemens Zeidler
2a21d45ac0 Merge branch 'develop' into key-bindings 2021-03-12 16:44:12 +13:00
panoschal
104bcdd0b0
Merge branch 'develop' into forgot-password-validation 2021-03-11 19:18:08 +02:00
Travis Ralston
a9a4bd50ca Merge branch 'develop' into travis/media-customization 2021-03-11 08:37:49 -07:00
Panagiotis
be7fb33a67 Merge branch 'develop' into edit-view-source 2021-03-11 17:07:56 +02: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
081e745417
Merge pull request #5751 from matrix-org/t3chguy/spaces4.7 
Rebuild space previews with new designs
 2021-03-11 14:06:31 +00:00
J. Ryan Stinnett
6a939c4de8
Merge pull request #5727 from matrix-org/matthew/rework-cross-signing-login 
Rework cross-signing login flow
 2021-03-11 12:53:55 +00:00
Michael Telatynski
6d81634eec Rebuild space previews with new designs 2021-03-11 11:49:43 +00: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
Panagiotis
066f72fcdb feat: require strong password in forgot password form 2021-03-11 00:14:55 +02:00
Travis Ralston
533c9fed64 Appease the linter 2021-03-10 12:32:18 -07:00
Travis Ralston
fa5d98c319 Convert cases of getHttpUriForMxc to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca Convert cases of mxcUrlToHttp to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
e5180a472f Merge branch 'develop' into travis/skinning/pt3-easy-comps 2021-03-10 12:30:06 -07:00
Travis Ralston
9e43fca9b6
Merge pull request #5739 from matrix-org/travis/message-state-fixes/hidden-rr 
Document behaviour of showReadReceipts=false for sent receipts
 2021-03-10 07:23:51 -07:00
J. Ryan Stinnett
32f737e1ba Tweak sent marker code style 2021-03-10 13:45:37 +00:00
J. Ryan Stinnett
51ece182e8
Merge pull request #5737 from matrix-org/travis/message-states-fixes/edits 
Fix sent markers disappearing for edits/reactions
 2021-03-10 13:42:46 +00:00
Michael Telatynski
98338f1505
Merge pull request #5736 from matrix-org/t3chguy/spaces4.5 
Spaces suggested rooms support
 2021-03-10 10:56:17 +00:00
Travis Ralston
78568d6a01 Document behaviour of showReadReceipts=false for sent receipts 2021-03-10 01:40:43 -07:00
Travis Ralston
ac1ce24b74 Fix sent markers disappearing for edits/reactions 
Fixes https://github.com/vector-im/element-web/issues/16651
 2021-03-09 20:52:30 -07:00
Travis Ralston
5b3367d44e Merge remote-tracking branch 'origin/develop' into travis/skinning/pt3-easy-comps 2021-03-09 09:33:19 -07:00
Travis Ralston
eb45731d2e
Merge pull request #5735 from matrix-org/travis/use-strict-no 
Remove a bunch of useless 'use strict' definitions
 2021-03-09 07:24:41 -07:00
Panagiotis
ef267829de Merge branch 'develop' into edit-view-source 2021-03-09 14:49:05 +02:00
Panagiotis
0936ea7e64 feat: show edit button only when user has permissions 
call appropriate functions for state events and edit message events
 2021-03-09 14:46:37 +02:00
J. Ryan Stinnett
d33acaac95
Merge pull request #5713 from panoschal/improve-view-source 
Display decrypted and encrypted event source on the same dialog
 2021-03-09 11:36:53 +00:00
Travis Ralston
591ccabab9 Remove a bunch of useless 'use strict' definitions 2021-03-08 20:26:08 -07:00
Travis Ralston
c230a75eda Flag structural components as replaceable 2021-03-08 20:23:24 -07:00
Matthew Hodgson
d388f877b4 add PHASE_LOADING to SetupEncryptionStore to avoid flashing cross-signing setup 2021-03-08 23:28:44 +00:00
Panagiotis
9287e8dfa4 use isEncrypted, edit state events 2021-03-08 22:15:34 +02:00
Matthew Hodgson
14b828ecc6 shorten verify button label 2021-03-08 17:58:30 +00:00
Travis Ralston
52621946de
Merge pull request #5723 from matrix-org/travis/uploads 
Refresh UI for file uploads
 2021-03-08 08:52:51 -07:00
Travis Ralston
d35afe6fbb
Merge pull request #5699 from matrix-org/travis/message-states 
Improve message sending states to match new designs
 2021-03-08 08:52:26 -07:00
Travis Ralston
fdea45ad74 Add a quick sender check to isLastSuccessful 2021-03-08 08:51:57 -07:00
Michael Telatynski
6106e01ab4 Collapse redactions into an event list summary 2021-03-08 09:39:07 +00:00
Matthew Hodgson
7abc48a716 lint 2021-03-08 05:30:02 +00:00
Matthew Hodgson
997d6e1281 lint 2021-03-08 05:08:01 +00:00
Matthew Hodgson
c02d03cc5b Merge branch 'develop' of git+ssh://github.com/matrix-org/matrix-react-sdk into develop 2021-03-08 04:57:10 +00:00
Matthew Hodgson
7673818400 switch to using an explicit verify button when cross-signing a new login 2021-03-08 04:43:59 +00:00
Panagiotis
df52ec28d6 fix: show edit button only if you have permission 2021-03-06 17:09:46 +02:00
Panagiotis
29b95e6083 fix: make edit prefill work correctly from EditHistory 
handle encrypted and unencrypted events

get the correct event_id (the base message) when called from EditHistoryMessage

keep only the `body` and `msgtype` fields when prefilling
 2021-03-06 16:47:29 +02:00
Panagiotis
51ac5421c9 chore: refactor code 
pass only the mxEvent object to ViewSource
derive the necessary values inside the component
 2021-03-06 11:30:31 +02:00
Travis Ralston
757597e55f Fixed review concerns 2021-03-05 16:29:14 -07:00
Travis Ralston
08072aca9a Add upload icon, fix cancel button, refresh styles 2021-03-05 14:42:15 -07:00
Travis Ralston
fa41489d5a Refactor UploadBar into component state 2021-03-05 14:24:53 -07:00
Travis Ralston
711181cc69 Rough style for new upload bar 
This repurposes ProgressBar which was not used anywhere in code.
 2021-03-05 14:14:43 -07:00
Travis Ralston
bb80cfb9a6 Convert all of file uploads to the new dispatcher 2021-03-05 13:20:50 -07:00
Travis Ralston
ae9618367e Convert UploadBar to TypeScript 2021-03-05 13:06:53 -07:00
Will Hunt
d07069238f Merge remote-tracking branch 'origin/develop' into hs/blocked-err 2021-03-05 18:50:00 +00:00
Travis Ralston
f87f2b11ef Appease the linter 2021-03-05 11:05:56 -07:00
Travis Ralston
ca63e937d3 Fix up logic to show sent receipts correctly 2021-03-05 10:56:13 -07:00
Will Hunt
35dbc82b87
Add issue comments 2021-03-05 15:01:48 +00: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
Panagiotis
288d98daed chore: format, lint 2021-03-05 00:07:59 +02:00
Panagiotis
af5cfff51d feat: edit button on View Source dialog 
reuse component SendCustomEvent
swap it in place in the View Source dialog
the Back button takes you to the View Source dialog, not the DevTools dialog
do not display the flip toggle box for changing between State Event and Normal Event
 2021-03-04 23:17:29 +02:00
Michael Telatynski
ab4220b20d Defer auto-joining within spaces and switch to using suggested 2021-03-04 13:04:58 +00:00
Clemens Zeidler
4a6f931782 Merge branch 'develop' into key-bindings 2021-03-04 21:10:35 +13:00
Panagiotis
6d792cc08c feat: use <details> to hide encrypted block 2021-03-03 23:48:39 +02:00
Panagiotis
0a1f372371 fix: lint 2021-03-03 23:26:31 +02:00
Panagiotis
ae08f74336 feat: improve "view source" 
display encrypted and decrypted event source on the same dialog
keep only one "View Source" action on event context menu
 2021-03-03 22:38:30 +02:00
Michael Telatynski
73411fa53d tidy code style 2021-03-03 13:42:44 +00:00
Michael Telatynski
d9a801910a Tweak spaces copy 2021-03-03 11:34:29 +00:00
Clemens Zeidler
0214397e27 Fix handling of the platform onKeyDown 
Only call it if the event hasn't been handled yet.
 2021-03-03 22:06:36 +13:00
Michael Telatynski
43cc7deeda Show hierarchy of auto_join rooms in the space view 2021-03-02 14:37:28 +00:00
Michael Telatynski
faf7a4b8bc Initial Space room directory view 2021-03-02 14:14:50 +00:00
Michael Telatynski
4e93452275 Tweak resizer collapse distributor behaviour to work with the expanding space panel 2021-03-02 14:02:03 +00:00
Michael Telatynski
e479edd47a Add an add existing room to space CTA to Space View 2021-03-02 13:34:53 +00:00
Michael Telatynski
a687b9883c Add a create room in space CTA to Space View 2021-03-02 13:29:34 +00:00
Michael Telatynski
ab4b7b73ea Add a basic Space Settings view 2021-03-02 13:26:00 +00: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
Michael Telatynski
926e226a78 Add Invite CTA to Space View 2021-03-02 10:12:49 +00:00
Michael Telatynski
dfd0aaffe3 Iterate copy for some global warning prompts for spaces 2021-03-02 09:56:43 +00: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
Michael Telatynski
483d56320c Beginning of space creation UX from space panel 2021-03-01 17:47:40 +00:00
Michael Telatynski
ce64863326 Annotate User Menu handle with currently selected space 2021-03-01 15:53:16 +00:00
Michael Telatynski
d248a5fa5d
Merge pull request #5689 from matrix-org/t3chguy/spaces2 
Space Store and Space Panel for Room List filtering
 2021-03-01 09:42:04 +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
Michael Telatynski
f21aedc6cf Add Space Panel with Room List filtering 2021-02-26 10:41:26 +00: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
Will Hunt
c78d1c49ab Apply changes from review 2021-02-24 17:32:00 +00:00
Will Hunt
84bcdf66f2 Fix TS check 2021-02-23 13:00:05 +00:00
Will Hunt
aa86c1d751 Ensure that a dismissed usage alert toast stays dismissed 2021-02-23 12:51:47 +00:00
Will Hunt
0daed98627 Do not process an older usage event if we've already processed a newer one 2021-02-23 12:51:17 +00:00
J. Ryan Stinnett
72ff919512
Merge pull request #5644 from weeman1337/fix-contextmenu-padding 
Fix context menu leaving visible area
 2021-02-22 17:42:09 +00:00
Germain
bce88efa4f update isUserOnDarkTheme to return correct theme when use_system_theme is true 
Signed-off-by: Germain <germain@grabyo.com>
 2021-02-21 16:49:30 +00:00
Michael Telatynski
3ca5632f6a Replace ObjectUtils.js with objects.ts 2021-02-19 00:00:10 +00:00
Michael Telatynski
354925c2c8 Improve TS definitions 2021-02-18 15:16:07 +00:00
J. Ryan Stinnett
53c4a1ada5
Merge pull request #5571 from SimonBrandner/improve-layout-handling 
Use a more generic layout setting - useIRCLayout → layout
 2021-02-17 11:02:26 +00:00
Travis Ralston
21b9ab9d85 Add an optional config option to make the welcome page the login page 
This is commonly requested by deployments with custom setups or those using SSO. Instead of having them all ship the same welcome.html with redirect code in it, we can offer a built-in redirect.

Note that this doesn't actually redirect and instead just replaces the view. This is to make the change less invasive as otherwise it involves changing the routing layers.
 2021-02-16 15:18:31 -07:00
J. Ryan Stinnett
234f1bf2c4 Test domains in config directly 2021-02-15 17:38:11 +00:00
J. Ryan Stinnett
d96043d5ab Use config for host signup branding 2021-02-15 17:37:33 +00:00
Šimon Brandner
5072fb0608
Merge branch 'develop' into improve-layout-handling 2021-02-15 16:12:08 +01:00
Michael Weimann
f343aaa05a
fix context menu padding calculation 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-02-14 18:37:06 +01:00
Jason Robinson
23140a84ff Remove host signup config strings, make translatable instead 
Also replace the icon in the UserMenu and change the text, requested from design.
 2021-02-10 13:38:32 +02:00
Jason Robinson
2197c1e519 Address some of the PR feedback 2021-02-09 20:13:58 +02:00
Jason Robinson
a4a478cf72 Remove host signup link from UserMenu.tsx 
It duplicates the new host signup modal dialog.
 2021-02-09 20:01:45 +02:00
Jason Robinson
5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
J. Ryan Stinnett
811ae9ba82
Merge pull request #5616 from dangwynne/develop 
Close current modal when session is logged out
 2021-02-08 12:56:00 +00:00
J. Ryan Stinnett
5abced7049
Merge pull request #5551 from weeman1337/fix-15347-explore-rooms-spacing 
Switch room explorer list to CSS grid
 2021-02-08 11:18:01 +00:00
Michael Weimann
f0f6e4678e
switch room explorer list to css grid 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-02-06 14:40:16 +01:00
Michael Telatynski
1d1a3e72ca Improve SSO login start screen and 3pid invite handling somewhat 2021-02-05 17:18:13 +00:00
J. Ryan Stinnett
295cf12cf8
Merge pull request #5621 from SimonBrandner/fix-jump-on-reaction 
Don't jump to bottom on reaction
 2021-02-05 14:28:25 +00:00
Šimon Brandner
69e81119e9
Don't jump to bottom on reaction 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-05 15:15:20 +01:00
dangwynne
12f6272ab4 implement qa feedback for closing modals when logging out 2021-02-05 09:24:12 +00:00
Šimon Brandner
f2d236d429
Use LayoutPropType 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-05 08:17:30 +01:00
Jason Robinson
b50ac0c096 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-04 18:32:16 +02:00
J. Ryan Stinnett
4a73f3c504
Merge pull request #5598 from SimonBrandner/fix-confusing-right-panel 
Fix confusing right panel button behaviour
 2021-02-04 16:30:41 +00:00
Šimon Brandner
fdc78396fa
Replaced defaultDis and removed duplicate import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-04 16:53:25 +01:00
dangwynne
88aa2a6f70 fix whitespace change. Signed-off-by: Dan Gwynne dangwynne1@gmail.com 2021-02-04 09:33:21 +00:00
dangwynne
c1823e2e5a
Close current modal when session is logged out 2021-02-03 22:31:28 +00:00
Jason Robinson
6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02:00
Michael Telatynski
842fe36c7e Fix register exploding if the server is down or we just don't have flows 2021-02-02 17:32:05 +00:00
Michael Telatynski
3e3a88116d Fix register exploding if the server is down or we just don't have flows 2021-02-02 17:28:52 +00:00
Michael Telatynski
bad71cf52f Better errors for SSO failures 2021-02-02 13:35:26 +00:00
Michael Telatynski
5d86c2f8e0 Better errors for SSO failures 2021-02-01 16:42:58 +00:00
J. Ryan Stinnett
799753d2b2
Merge pull request #5565 from SimonBrandner/fix-13090 
Scroll to bottom on message_sent
 2021-02-01 13:04:38 +00:00
Michael Telatynski
741b3f76ee
Merge pull request #5593 from SimonBrandner/fix-collapsing-of-left-panel 
Fix saving the collapsed state of the left panel
 2021-02-01 12:50:37 +00:00
Michael Telatynski
077ceeb20d 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-02-01 12:29:11 +00:00
Michael Telatynski
72263a4a56
Merge pull request #5602 from matrix-org/t3chguy/peeking 
Fix RoomView re-mounting breaking peeking
 2021-02-01 12:26:42 +00:00
J. Ryan Stinnett
50452d52ff
Merge pull request #5592 from matrix-org/jryans/opt-room-id 
Tweak a few room ID checks
 2021-02-01 10:54:29 +00: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
Šimon Brandner
73ab074219
Properly handle closing the panel while verifying 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-30 10:22:04 +01:00
Šimon Brandner
eee6a509c7
Close button should always close the panel 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-30 08:04:25 +01:00
Michael Telatynski
62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes 
Improve SSO auth flow
 2021-01-29 13:28:53 +00:00
Michael Telatynski
0eb0d242d5
Apply suggestions from code review 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-01-29 13:05:09 +00:00
Šimon Brandner
9c5af8b61e
Fix collapsing of the left panel 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-29 13:19:09 +01:00
J. Ryan Stinnett
b8e3908ee2
Merge pull request #5586 from matrix-org/jryans/maybe-mobile 
Add optional mobile guide toast
 2021-01-29 11:18:08 +00:00
J. Ryan Stinnett
c9a6214256 Tweak a few room ID checks 2021-01-29 11:15:30 +00:00
J. Ryan Stinnett
2996ceca52 Add optional mobile guide toast 
This adds an optional toast which Element deployments can enable to nudge users
towards the mobile apps once they are inside the app.

Part of https://github.com/vector-im/element-web/issues/16283
 2021-01-28 17:21:36 +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
Michael Telatynski
fd4109b8ad fix tests by reverting if removal 2021-01-28 11:00:04 +00:00
Michael Telatynski
1761a4ec80 Improve SSO UIA 
Fixes Fallback UIA postmessage interface
Auto-closes SSO UIA tab when the user has completed the flow within it
Error for when auth stage is restarted because it failed
 2021-01-28 10:45:29 +00:00
Michael Telatynski
e6673bca1b Improve SSO auth flow 
Use replaceState instead of a redirect to strip the loginToken
Put user into the same post-auth flows of E2ESetup
Skip UIA prompt in this post-auth flow, happy path is a server grace period
 2021-01-27 12:50:12 +00:00
J. Ryan Stinnett
d78bc98521 Resolve linting errors after upgrades 2021-01-27 12:42:39 +00:00
Will Hunt
5de92b68d9 Show a specific error for hs_disabled 2021-01-27 11:39:57 +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
Šimon Brandner
c7ff0f302a
Scroll to bottom on message_sent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-23 09:35:05 +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
a779951512
Merge pull request #5553 from matrix-org/travis/widget-layout 
Support room-defined widget layouts
 2021-01-21 13:22:52 -07:00
J. Ryan Stinnett
e49a931588
Merge pull request #5533 from aaronraimist/security-key 
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
 2021-01-21 17:46:02 +00:00
J. Ryan Stinnett
3115c4f3f3 Show only preview buttons in directory for guest users 
This aligns the room directory with the rest of Element Web so that it does not
allow guest users to join rooms. Instead, we show preview buttons (even when the
preview might not actually happen).

Fixes https://github.com/vector-im/element-web/issues/16213
 2021-01-19 17:59:30 +00:00
Travis Ralston
1768d6ea5f Move all widget pinning logic to the WidgetLayoutStore 2021-01-18 20:26:47 -07:00
Šimon Brandner
e7384f829a
Made search shortcut optional 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-17 16:44:29 +01: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
Jason Robinson
158036ccf9 Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-01-15 16:12:53 +02:00
Jason Robinson
e80dba9414 WIP 2021-01-15 15:32:30 +02:00
J. Ryan Stinnett
80f3e14faf Move LoggedInView subscriptions to after mounted 
This avoids a React warning about trying to call `setState` before the component
is mounted.
 2021-01-15 13:20:49 +00:00
Jason Robinson
d6af5b3bbd WIP minimize 2021-01-14 12:20:42 +02:00
Jason Robinson
d4a58bdb2a WIP minimize 2021-01-14 11:53:20 +02:00
David Baker
e2111d9161
Merge pull request #5532 from matrix-org/dbkr/dtmf 
Add in-call dialpad for DTMF sending
 2021-01-13 13:07:27 +00:00
J. Ryan Stinnett
a73fe72b09 Fix soft crash on soft logout page 
This fixes a soft crash on the soft logout page, which can occur if it is shown
very quickly after app startup before encryption has become enabled.
 2021-01-13 12:25:36 +00:00
Aaron Raimist
b81e6fdedb
Update src/components/structures/auth/SetupEncryptionBody.js 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-01-12 16:04:43 -06:00
Jason Robinson
2b98f14242 Merge branch 'develop' into jaywink/hosting-provider-iframe 2021-01-11 11:16:03 +02:00
David Baker
2d37151750
Merge pull request #5523 from matrix-org/dbkr/dial_pad 
Add a dialpad UI for PSTN lookup
 2021-01-05 17:23:34 +00:00
Jason Robinson
5f84371038 Update some copyrights 2021-01-05 14:29:48 +02:00
Aaron Raimist
4f96d5dee5
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-01-04 19:17:17 -06:00
David Baker
4b43929aa3 Add in-call dialpad for DTMF sending 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1573
 2021-01-04 20:01:43 +00:00
Jason Robinson
bb53ae8038 Rename Element Pro -> Host Signup 2021-01-04 16:05:49 +02:00
Jason Robinson
6286c23aa5 Merge branch 'develop' into jaywink/hosting-provider-iframe 2021-01-04 15:46:28 +02:00
Jason Robinson
7a358b1ca3 Rename components to be less EMS specific 2020-12-28 11:21:42 +02:00
Šimon Brandner
65285fd55e Fix 15988 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-24 08:00:23 +01:00
David Baker
452fbb076b Add a dialpad UI for PSTN lookup 
Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user.
 2020-12-23 19:02:01 +00:00
Jason Robinson
0ae28d584b Typing and other PR feedback fixes 2020-12-18 16:05:57 +02: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
bebbb3b90e Merge branch 'develop' into improve-file-drop-ui 2020-12-17 20:22:48 +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
Jason Robinson
5aa24b97cd Merge remote-tracking branch 'origin/develop' into jaywink/elementPro 2020-12-16 14:45:16 +02:00
Michael Telatynski
4c2b6f410b fix tests 2020-12-16 10:41:56 +00:00
Hubert Chathi
983ffe98ff
Merge pull request #5483 from uhoreg/web_pickle 
Use random pickle key on all platforms
 2020-12-15 12:56:41 -05:00
Jason Robinson
cd836be809 Rename everything HostingSignup -> EMSElementPro 
This setup flow ended up quite specific due to all the various moving parts.
 2020-12-15 10:50:38 +02:00
Travis Ralston
18a60ae2ea
Merge pull request #5484 from matrix-org/travis/remove-dead-feature 
Remove impossible labs feature: sending hidden read receipts
 2020-12-10 08:24:05 -07:00
David Baker
f987908d04
Merge pull request #5446 from matrix-org/dbkr/hold_ui 
Add UI for hold functionality
 2020-12-10 12:30:59 +00:00
Travis Ralston
80d6629c3e delete the rest too 2020-12-09 18:50:16 -07:00
Travis Ralston
27df6ae6e1 Remove impossible labs feature: sending hidden read receipts 
This claims it requires a compatible homeserver, but that does not exist and hasn't for years. Let's just remove the option to stop giving people false hope.

Once notifications are decoupled from read receipts, this sort of thing should be more possible.
 2020-12-09 18:36:48 -07:00
Hubert Chathi
753ec9e45a use random pickle key on all platforms, and store access token encrypted in IDB 2020-12-09 18:40:31 -05:00
Travis Ralston
3e3a32cf10 Only show confetti if the current room is receiving an appropriate event 2020-12-09 11:56:57 -07:00
David Baker
4a009d480d Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-08 11:48:14 +00: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
David Baker
6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
Michael Telatynski
e4b929c6f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15882 2020-12-03 11:42:47 +00:00
Michael Telatynski
f432d4e394 delint 2020-12-03 11:31:14 +00: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
Michael Telatynski
eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 
 Conflicts:
	src/i18n/strings/en_EN.json
 2020-12-01 16:33:29 +00:00
David Baker
31044b68d1 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-01 15:09:25 +00:00
Michael Telatynski
26e1cdb82c Update i18n 2020-12-01 12:04:41 +00:00
Jason Robinson
a67ad0750d
Code styling 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:49:04 +02:00
Steffen Kolmer
0e53e220d0
Fixed copy paste error 2020-11-27 17:25:34 +01:00
nurjinn jafar
82023dcf42 Merge branch 'feature_confetti#14676' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 2020-11-27 16:33:15 +01:00
nurjinn jafar
6ce5d3b044 refactored effects dir and changed effects exported name 2020-11-27 16:32:04 +01:00
Steffen Kolmer
d9c7148182 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-11-27 16:20:35 +01:00
Jason Robinson
ad49dedec3 Document hosting_signup config option in source 2020-11-27 15:10:35 +02:00
Jason Robinson
5ad9b83870 Fix copyright strings 2020-11-27 15:10:35 +02:00
Jason Robinson
94fba82227 Fix hostingSignupIFrame rendering in UserMenu after latest develop changes 2020-11-27 15:10:35 +02:00
Richard Lewis
116f109a62 Improve setup initiation link 2020-11-27 15:10:35 +02:00
Jason Robinson
a37e0db3e1 Move HostingSignupDialog to the dialogs folder 2020-11-27 15:10:35 +02:00
Jason Robinson
e6582c140f Dont' allow HostingSignupDialog to close 
Except via confirmed cancel action or host setup success postmessage.
 2020-11-27 15:10:35 +02:00
Jason Robinson
a1d750a4aa Rename a few things, make hosting signup config an object 2020-11-27 15:10:35 +02:00
Jason Robinson
54b22290e7 Add hosting_signup_domains for controlling which users see the hosting signup dialog 2020-11-27 15:10:35 +02:00
Jason Robinson
48fefa0d3e Implement fetching OpenID token for hosting provider iframe 
And then pass it via postMessage when requested.

Send whole OpenID credentials object to Hosting Provider iframe
 2020-11-27 15:10:35 +02:00
Jason Robinson
c7706ac3d5 Add possibility for hosting provider IFrame 
Add config option hosting_signup_iframe that
will render an action in the UserMenu and ProfileSettings
for setting up a host with some hosting provider
that provides an HTML to do that.

Add iframe for hosting provider signup content
 2020-11-27 15:10:35 +02:00
Michael Telatynski
edd5bf5842
Merge pull request #5421 from matrix-org/t3chguy/fix/15700 
Simplify UserMenu for Guests as they can't use most of the options
 2020-11-27 10:57:54 +00:00
Michael Telatynski
00b1cd01eb Update copy 2020-11-27 09:44:04 +00:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676 2020-11-26 18:21:28 +01:00
Michael Telatynski
5f03cbd88f Iterate PR some more 2020-11-26 15:45:15 +00:00
David Baker
2a02e57a95 Add UI for hold functionality 2020-11-26 14:35:09 +00:00
Michael Telatynski
c4084196d1 delint 2020-11-25 10:39:44 +00:00
Michael Telatynski
1b1c482f9c Iterate tests 2020-11-25 10:22:16 +00:00
Michael Telatynski
758b47c64d Replace *ServerConfig and SignInToText with ServerPicker 2020-11-25 09:46:56 +00:00
Michael Telatynski
6a315e80b6 Improve auth error messages 2020-11-25 09:24:24 +00:00
Michael Telatynski
2f64160a0e Remove backwards compatibility in ServerConfig for m.require_identity_server 2020-11-25 09:00:31 +00:00
Michael Telatynski
f7d7182dc9 Iterate Multi-SSO support 2020-11-24 12:09:11 +00:00
Michael Telatynski
b1ca1eb3f5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-11-24 11:30:51 +00:00
Michael Telatynski
1d53a5cf23 Initial support for MSC2858 2020-11-24 11:18:11 +00:00
Michael Telatynski
613710b75c Iterate Auth copy 2020-11-23 17:01:35 +00:00
David Baker
37059a3fcd Move call listener out of MatrixChat 
and into callhandler
 2020-11-23 16:20:15 +00:00
David Baker
f0fdfd53d2
Merge pull request #5432 from matrix-org/dbkr/new_look_callview 
New Look in-Call View
 2020-11-23 15:51:09 +00:00
Michael Telatynski
56ffa17b89
Merge pull request #5433 from matrix-org/t3chguy/socials_preamble 
Auth typescripting and validation tweaks
 2020-11-23 14:14:25 +00:00
Michael Telatynski
cc12f2f017 delint 2020-11-20 14:20:22 +00:00
Michael Telatynski
0c179e9e6a Revert room header click behaviour to opening room settings 2020-11-20 13:58:28 +00:00
Michael Telatynski
d85b5b6e2b delint & post-rebase fixes 2020-11-20 13:34:44 +00:00
Michael Telatynski
d45d0c6633 Convert Registration to Typescript 2020-11-20 13:23:10 +00:00
Michael Telatynski
7243ba0fe2 Convert Login to Typescript 2020-11-20 13:23:10 +00:00
Michael Telatynski
85fbc6d89f Consolidate PasswordLogin state and input control/ownership 
previously data was stored in two places which drifted
 2020-11-20 13:23:10 +00:00
Michael Telatynski
0b74d3a0ef Use field validation for PasswordLogin instead of global errors 2020-11-20 13:23:10 +00:00
David Baker
50965e41eb Remove call bar 
Also hide video mute button on voice calls (awaiting clarification from design)
and fix mute keyboard shortcuts by moving them out of roomview & into
callview.
 2020-11-19 15:15:31 +00:00
Michael Telatynski
532b2e5ced Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/home-page-analytics 
 Conflicts:
	src/components/structures/HomePage.tsx
 2020-11-19 11:11:10 +00:00
Travis Ralston
df6218ef4a
Merge pull request #5364 from mkenigs/mxc-imgs 
Specify community description img must be mxc urls
 2020-11-18 15:21:09 -07:00
Aaron Raimist
80c4d54ccc
Fix lint 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-11-18 13:54:54 -06:00
Heiko Carrasco
3fd13b89b8
Merge branch 'develop' into develop 2020-11-18 20:14:25 +01:00
Michael Telatynski
11fb081f7a
Merge pull request #5423 from matrix-org/t3chguy/sso 
Redirect user home from auth screens if they are already logged in
 2020-11-18 15:49:47 +00:00
Michael Telatynski
9b2143742a
Merge pull request #5418 from matrix-org/t3chguy/fix/muggle-hustle 
Small delight tweaks to improve rough corners in the app
 2020-11-18 10:07:31 +00:00
Michael Telatynski
e05fcc8d34
Merge pull request #5408 from matrix-org/t3chguy/fix/15400 
Update styling of the Analytics toast
 2020-11-17 15:35:20 +00:00
Michael Telatynski
5b32287f3d Redirect user home from auth screens if they are already logged in 2020-11-16 15:56:54 +00:00
Michael Telatynski
6a3049b90f Remove old unused views/paths 2020-11-16 15:40:56 +00:00
Michael Telatynski
5f23c9499c Simplify UserMenu for Guests as they can't use most of the options 2020-11-12 12:46:55 +00:00
Michael Telatynski
f0ca8e152e
Merge pull request #5414 from matrix-org/t3chguy/fix/7420 
Fix drag drop file to upload for Safari
 2020-11-12 10:44:09 +00:00
Michael Telatynski
0911007c77 fix issue with server selector introduced in this PR 2020-11-11 17:12:27 +00:00
Michael Telatynski
edb5e10506 Iterate registration to simplify it based on usertesting 2020-11-11 17:04:10 +00:00
Michael Telatynski
d0513406ee Pass filter text when clicking explore/dm prompt 2020-11-11 17:04:09 +00:00
Michael Telatynski
d3fee540c5 Update Room List filter copy 2020-11-11 17:04:09 +00:00
Michael Telatynski
187901004d Fix the Join rooms prompt not showing up due to missing updates 2020-11-11 17:04:09 +00:00
Michael Telatynski
d5c399dfd9 Fix Left Panel layout being wrong when filtering with 0 rooms 2020-11-11 17:04:09 +00:00
Aaron Raimist
29a81bbe85
Warn when you attempt to leave room that you are the only member of 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-11-10 15:05:25 -06:00
Michael Telatynski
dc304d4ad8 Fix drag drop file to upload for Safari 2020-11-10 15:55:07 +00:00
Michael Telatynski
0766519467
Merge pull request #5398 from matrix-org/t3chguy/fix/8141 
Improvements around new room empty space interactions
 2020-11-10 13:09:59 +00:00
David Baker
50bce642d5
Merge pull request #5366 from matrix-org/dbkr/call_hold 
Implement call hold
 2020-11-10 08:41:34 +00:00
Michael Telatynski
73eb43d32a
Merge pull request #5406 from matrix-org/t3chguy/fix/home-button-ctx-menu 
Close context menu when user clicks the Home button
 2020-11-10 01:19:33 +00:00
Michael Telatynski
5bed02b6e8 Skip e2ee warn logout prompt if user has no megolm sessions to lose 2020-11-09 15:50:35 +00:00
Michael Telatynski
453c956d06 Add Analytics instrumentation to the Homepage 2020-11-09 14:44:53 +00:00
Michael Telatynski
36ef9ec341 Update styling of the Analytics toast to try and decrease number of users blindly pressing No 2020-11-09 14:21:45 +00:00
Michael Telatynski
462be2b6a0 Close context menu when user clicks the Home button 2020-11-09 13:45:33 +00:00
Michael Telatynski
252484fcd9 add key to make React happier 2020-11-05 17:01:20 +00:00
Michael Telatynski
664079a127 Use MiniAvatarUploader for the new NewRoomIntro component 2020-11-05 15:50:42 +00:00
Michael Telatynski
6aeea3e38e Extract MiniAvatarUploader into a reusable component 2020-11-05 15:42:45 +00:00
Michael Telatynski
2594ff8e80 Remove old isAlone checker 2020-11-05 15:39:22 +00:00
Travis Ralston
cbd568a1e8
Merge pull request #5371 from resynth1943/change-password-to-new-password-in-forgot-password 
Change "Password" to "New Password"
 2020-11-04 12:15:49 -07:00
Michael Telatynski
2fdfe9346f Update copy on the Encryption Enabled bubble tile and room creation ELS to cater better in general but specifically for DMs 2020-11-04 17:50:59 +00:00
Matthew Hodgson
ced58b9ecf apostrophe!! 2020-11-04 14:54:53 +00:00
Michael Telatynski
5c9acc364f
Merge pull request #5383 from matrix-org/t3chguy/fix/15604 
Tweaks to toasts and post-registration landing
 2020-11-04 13:59:51 +00:00
Michael Telatynski
6a916757df
Merge pull request #5382 from matrix-org/t3chguy/countly 
Track UISIs as Countly Events
 2020-11-03 10:42:02 +00:00
Michael Telatynski
0c14de3017 defer some toasts 2020-11-02 17:25:48 +00:00
Michael Telatynski
4afa610ee1 Add variant of default home page for justRegistered 2020-11-02 17:24:47 +00:00
Michael Telatynski
f2d8069a24 Track UISIs as Countly Events 2020-11-02 10:28:57 +00:00
Michael Telatynski
06bd2d99c4
Merge pull request #5379 from matrix-org/t3chguy/countly 
Fix room directory events happening in the wrong order for Funnels
 2020-10-30 21:13:14 +00:00
Michael Telatynski
0368ad4516 Fix room directory events happening in the wrong order for Funnels 2020-10-30 20:20:58 +00:00
David Baker
7ec1d5a881 Fix a bunch of silly lint errors 
At some point the script to generate .eslintignore.errorfiles had
been run and added all these files to the ignore list, often because
they lacked a space before a brace or something equally mundane.

These are the easiest bunch.
 2020-10-30 18:18:17 +00:00
David Baker
7796621e8d Merge remote-tracking branch 'origin/develop' into dbkr/call_hold 2020-10-30 16:49:42 +00:00
Resynth
a74f4fa25e Change "Password" to "New Password" 
Doesn't solve most issues in the Forgot Password menu, but clears up the
UI a little. "New Password" makes more sense here, as "Password" may
suggest to the user that they have to enter the password they forgot.

Signed-off-by: Resynth <resynth1943@tutanota.com>
 2020-10-30 16:05:35 +00:00
Michael Telatynski
f80ee391bc
Merge pull request #5370 from matrix-org/t3chguy/countly 
Fix CountlyAnalytics NPE on MatrixClientPeg
 2020-10-30 14:28:48 +00:00
Michael Telatynski
171b3ede76 improve comments 2020-10-30 14:27:14 +00:00
Michael Telatynski
70fe26d163 Fix CountlyAnaltics NPE on MatrixClientPeg 2020-10-30 14:14:17 +00:00
Michael Telatynski
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly 
Initial Countly work
 2020-10-30 13:07:58 +00:00
David Baker
f828c6d494 Implement call hold 
Currently just by adding /holdcall and /unholdcall slash commands

The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.

Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened.
 2020-10-29 17:56:24 +00:00
Michael Telatynski
c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Michael Telatynski
3c9cc636c4
Merge pull request #5360 from matrix-org/t3chguy/fix/15586 
Watch replyToEvent at RoomView to prevent races
 2020-10-29 11:54:49 +00:00
Matthew Kenigsberg
24ba566877 Specify community description img must be mxc urls 
Closes vector-im/element-web#7100

Signed-off-by: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
 2020-10-28 18:34:54 -05:00
Michael Telatynski
e06550b748 Watch replyToEvent at RoomView to prevent races 2020-10-28 12:47:59 +00:00
nurjinn jafar
19395f3c3c null checks added 2020-10-26 16:37:45 +01:00
Travis Ralston
b10a6a5720
Merge pull request #5349 from RinkiyaKeDad/comments 
docs: added comment explanation
 2020-10-26 08:48:39 -06:00
Arsh Sharma
e57f4fbd54 docs: fixed whitespace 2020-10-21 20:13:50 +05:30
Arsh Sharma
312d46917c docs: added comment explanation 2020-10-21 20:10:35 +05:30
Steffen Kolmer
fbe2d7e0f8 Optimized naming 2020-10-21 16:15:15 +02:00
Michael Telatynski
0170fa608e Fix User Menu avatar colouring being based on wrong string 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 14:11:39 +01:00
Steffen Kolmer
daa03098f3 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-21 14:21:25 +02:00
Steffen Kolmer
d4ec1dd775 Refactoring 2020-10-21 13:56:58 +02:00
Michael Telatynski
4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
 2020-10-21 12:48:51 +01:00
nurjinn jafar
1c6d28b861 refactoring roomView / slashCommands / SendMessageComposer with the new effects configurations and fix confetti animation timeout 2020-10-21 13:37:36 +02:00
Michael Telatynski
a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/resizer/distributors/collapse.ts
	src/resizer/distributors/fixed.ts
	src/resizer/index.ts
	src/resizer/item.ts
	src/resizer/resizer.ts
	src/resizer/sizer.ts
 2020-10-21 09:56:22 +01:00
Michael Telatynski
42228719b9
Merge pull request #5343 from matrix-org/t3chguy/ts/resizer 
Convert resizer to Typescript
 2020-10-20 23:54:17 +01:00
Michael Telatynski
9181e3e89a
Merge pull request #5338 from matrix-org/t3chguy/fix/15166 
Hide filtering microcopy when left panel is minimized
 2020-10-20 15:21:43 +01:00
Michael Telatynski
5caad82f9f
Merge pull request #5337 from matrix-org/t3chguy/fix/15484 
Spec compliance, /search doesn't have to return results
 2020-10-20 11:36:37 +01:00
Michael Telatynski
329ded92c1 Convert resizer to Typescript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 11:03:03 +01:00
Steffen Kolmer
48633f76ab added event handling back 2020-10-19 23:10:43 +02:00
Michael Telatynski
b0acae6e77 fix remaining type mismatches 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 21:13:31 +01:00
Michael Telatynski
bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
 2020-10-19 20:50:16 +01:00
Steffen Kolmer
6d98335368 Removed old todo 2020-10-19 21:28:22 +02:00
Steffen Kolmer
607e33feba Extensibility, TypeScript and lazy loading 2020-10-19 21:25:01 +02:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Michael Telatynski
35d12171b1 Remove unused prop for clarity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 12:54:53 +01:00
Steffen Kolmer
41160ff08e Render confetti the react way 2020-10-19 13:54:09 +02:00
Michael Telatynski
9789f8cf94 Spec compliance, /search doesn't have to return results 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 12:46:55 +01:00
Steffen Kolmer
3e8e817a3d Fixed merge error 2020-10-19 13:35:18 +02:00
Michael Telatynski
30adc98a15 Fix excessive hosting link padding 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 12:34:25 +01:00
Steffen Kolmer
929cc48cef Fixed eslint error 2020-10-19 13:30:52 +02:00
Steffen Kolmer
c86964cd5e Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-10-19 13:15:33 +02:00
Steffen Kolmer
3358ed2792 Use arrow functions 2020-10-19 12:57:57 +02:00
Michael Telatynski
84111a2eaf
Merge pull request #5326 from matrix-org/t3chguy/fix/11195 
Discard all mx_fadable legacy cruft which is totally useless
 2020-10-15 18:34:03 +01:00
Michael Telatynski
0c87df4957
Merge pull request #5319 from matrix-org/t3chguy/fix/null-avatar 
Fix background-image: url(null) for backdrop filter
 2020-10-15 17:48:51 +01:00
Michael Telatynski
6a82a1f3c7
Update src/components/structures/LeftPanel.tsx 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-10-15 17:15:01 +01:00
Michael Telatynski
3e548bbc94 tidy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 16:57:07 +01:00
Michael Telatynski
916c78d4cf delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 16:56:16 +01:00
Michael Telatynski
6b01b6ac6c Discard all mx_fadable legacy cruft which is totally useless 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 16:13:16 +01:00
Michael Telatynski
f198b95579 Iterate PR; tidy and improve widget context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 15:24:42 +01:00
Michael Telatynski
a6c81a903c Iterate with new buttons and resize locking 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 11:14:48 +01:00
Travis Ralston
25db3ac6aa Fix _groupFilterOrderStoreToken naming 2020-10-14 16:32:23 -06:00
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Michael Telatynski
efad42439e Fix background-image: url(null) for backdrop filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 11:41:24 +01:00
Michael Telatynski
e3155fe58f
Merge pull request #5313 from matrix-org/t3chguy/other/1 
Improve LHS resize performance and tidy stale props&classes
 2020-10-14 10:06:37 +01:00
Heiko Carrasco
d7f15985f5
Close all active modals when home shortcut is used 
Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
 2020-10-13 19:26:30 +02:00
Arsh Sharma
3bdb6606de fix(LeftPanel.tsx): fix 2 for linting errors 2020-10-13 21:07:18 +05:30
Arsh Sharma
fa88eea274 fix(LeftPanel.tsx): fix for linting errors 2020-10-13 20:56:28 +05:30
Heiko Carrasco
f36651f538
Add keyboard shortcut to close current conversations 
Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
 2020-10-13 17:26:14 +02:00
Michael Telatynski
bb52bad099 Remove stale props and CSS classes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:23:49 +01:00
Michael Telatynski
a2b61796af Improve LHS resize performance 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:20:54 +01:00
Michael Telatynski
a1d25efceb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/structures/RoomView.tsx
 2020-10-13 13:45:22 +01:00
Arsh Sharma
357579d6ba fixed errors in leftpanel.tsx 2020-10-13 17:04:39 +05:30
Michael Telatynski
f72b1e0c7d Remove stale things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 12:27:50 +01:00
David Baker
4c11a82fef Fix rogue (partial) call bar 
Call state is now null if there is no call, so check for that too
 2020-10-13 12:16:15 +01:00
Michael Telatynski
afacf8c6b7 Improve LHS resize performance 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 10:30:52 +01:00
David Baker
ed9584bbac Comment scoping block 2020-10-13 09:55:03 +01:00
David Baker
abd5e3b3cf More enums 2020-10-12 10:25:23 +01:00
RinkiyaKeDad
f5a40eff4b updated TagFilterStore 2020-10-10 18:02:58 +05:30
RinkiyaKeDad
4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30
David Baker
55f77b04ae Rewrite call state machine 
* Remove the two separate enumerations of call state: now everything
   uses the js-sdk version of call state. Stop adding a separate
   'call_state' field onto the call object(!)
 * Better reflection of the actual state of the call in the call bar,
   so when it's connecting, it says connecting, and only says 'active call'
   when the call is actually active.
 * More typey goodness
 2020-10-09 18:56:07 +01:00
Michael Telatynski
85aca420f4 sort hasPinnedWidgets out 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 08:52:34 +01:00
Michael Telatynski
ada6d1aa46 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 08:42:21 +01:00
Michael Telatynski
b8080a7d2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-08 13:04:59 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration 
Convert auth lifecycle to TS, remove dead ILAG code
 2020-10-07 15:42:42 +01:00
J. Ryan Stinnett
f2b72efe39 Remove various remaining bits of ILAG flows 
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
 2020-10-07 12:53:59 +01:00
J. Ryan Stinnett
1b255e42c3 Convert src/Lifecycle.ts to TypeScript 2020-10-07 12:53:59 +01:00
Michael Telatynski
c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/views/right_panel/WidgetCard.tsx
	src/stores/WidgetStore.ts
 2020-10-07 10:04:45 +01:00
David Baker
0c6be6cf5e Update copyright 
As per https://github.com/matrix-org/synapse/issues/7565#issuecomment-639171606
 2020-10-06 19:32:21 +01:00
David Baker
9dc0837619 Hopefully fix righhtpanel crash 
The right panel wearns many hats, and only one of those hats comes
with a room prop, so make sure it's there.
 2020-10-06 18:11:28 +01:00
Michael Telatynski
1e34365caa
Merge pull request #5268 from matrix-org/t3chguy/fix/15349 
Fix right panel for peeking rooms
 2020-10-06 00:32:05 +01:00
Michael Telatynski
489c5b9b0a
Merge pull request #5276 from michel-zimmer/room-directory-clipped-uris 
Fix room directory clipping links in the room's topic
 2020-10-02 18:29:19 +01:00
Michael Telatynski
f01ea32397
Merge pull request #5261 from matrix-org/t3chguy/fix/15279 
Fix Encryption Panel close button clashing with Base Card
 2020-10-02 18:18:20 +01:00
Michel Zimmer
58bbbf31b9 Fix room directory clipping links in the room's topic 
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
 2020-10-02 18:00:58 +02:00
Travis Ralston
153e63b6aa Fix conditional on communities prototype room creation dialog 2020-10-01 13:44:16 -06:00
Michael Telatynski
a9cee7cf70 Fix right panel for peeking rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-01 12:30:41 +01:00
Michael Telatynski
ed30750f63 Extract RoomWidgetContextMenu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-30 15:38:35 +01:00
Michael Telatynski
c4ee8e4a6c Fix Encryption Panel close button clashing with Base Card 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-29 10:11:04 +01:00
Michael Telatynski
4273de31ca
Merge pull request #5254 from resynth1943/only-refresh-title-if-needed 
Only set title when it changes
 2020-09-27 23:36:41 +01:00
resynth1943
b499fd06fc Formatting change 2020-09-27 21:20:41 +01:00
resynth1943
747f9fba38 Only set title when it changes 
I've seen Chromium constantly refresh the title in the developer tools.
To be honest, I'm not sure if this means Chromium wastes CPU
time changing a title, but this may introduce better performance.

Signed-off-by: Resynth <resynth1943@tutanota.com>
 2020-09-27 21:14:43 +01:00
David Baker
585c7637d6
Merge pull request #5248 from matrix-org/dbkr/callhandler_to_ts 
Convert CallHandler to typescript
 2020-09-25 15:52:21 +01:00
David Baker
8962f7ae9e Convert CallHandler to typescript 
and remove the old conference call stuff while we're at it: enough
time should have passed since those mistakes that we can move on.
The old conference call rooms will still appear for anyone whose
account dates back to that time, but they've presumably been appearing
in any other matrix client they used too.
 2020-09-24 16:16:20 +01:00
Michael Telatynski
f7959fe64f i18n and delint one last time 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-24 09:55:42 +01:00
Michael Telatynski
c65d8be7d8 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-24 09:49:30 +01:00
Michael Telatynski
f3e6f43c3d Improve maxHeight 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-24 09:34:19 +01:00
Michael Telatynski
956a3bf69d Implement Left Panel User Widget 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-24 09:28:49 +01:00
Michael Telatynski
7fd6d4498f Make bottom sticky room list header dynamic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-23 11:00:19 +01:00
Michael Telatynski
12034411d4 Fix right-alignment between sticky and non-sticky room list headers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-23 10:47:51 +01:00
Travis Ralston
09dd3cea08
Merge pull request #5225 from matrix-org/travis/ft-sep1620/09-enc-files 
Add a note to use the desktop builds when seshat isn't available
 2020-09-22 10:25:34 -06:00
Travis Ralston
d4c14b3399 Don't import things we don't use 2020-09-18 16:11:18 -06:00
Travis Ralston
26b18811ce Add some permission checks to the communities v2 prototype 
Prototype behaviour:
* If you can't create a room in the community, say so.
  * The UX for this could probably be improved, but for now the intention is to not break muscle memory by hiding the create room option.
* If you can't change settings in the community, or can't invite people, don't show those respective options.
  * Breaking muscle memory here is moderately okay.
 2020-09-18 16:04:19 -06:00
Michael Telatynski
8ec7e7c714
Merge pull request #5237 from matrix-org/t3chguy/fix/15126 
Fix New Room List arrow key management
 2020-09-18 22:10:46 +01:00
Michael Telatynski
1b335da1b5
Merge pull request #5235 from matrix-org/t3chguy/15228 
Fix Room Directory View & Preview actions for federated joins
 2020-09-18 22:10:23 +01:00
Travis Ralston
4ef4e67642
Merge pull request #5229 from matrix-org/travis/workflow/design/sep1720 
Adjust layout and formatting of notifications / files cards
 2020-09-18 11:11:35 -06:00
Travis Ralston
870c35be6f Merge branch 'develop' into travis/ft-sep1620/09-enc-files 2020-09-18 10:56:20 -06:00
Michael Telatynski
99d4e538b0 Fix New Room List arrow key management 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 17:13:45 +01:00
Michael Telatynski
004c68b394 Fix Room Directory View & Preview actions for federated joins 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-09-18 15:43:08 +01:00
Michael Telatynski
d267092b19 Make the upload_file dispatch synchronous to make Firefox happy about it 2020-09-18 12:33:25 +01:00
Michael Telatynski
780aea1a36 Mac sends lowercase event.key even when holding Shift unlike Windows 2020-09-18 12:32:33 +01:00
J. Ryan Stinnett
ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup 
Defer encryption setup until first E2EE room
 2020-09-18 10:28:33 +01:00
Travis Ralston
14a7b83988 Don't show a bottom border ahead of the date separator 2020-09-17 10:40:48 -06:00
Michael Telatynski
c904b4f416 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 14:10:51 +01:00
Michael Telatynski
1e9e0dee87
Merge pull request #5227 from matrix-org/t3chguy/fix/15188 
UI Feature Flag: Registration, Password Reset, Deactivate
 2020-09-17 13:40:06 +01:00
Michael Telatynski
5bf6697e48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 13:31:00 +01:00
Michael Telatynski
4213a557f2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15175 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
 2020-09-17 11:58:26 +01:00
Michael Telatynski
d340dd58d1 UI Feature Flag: Registration, Password Reset, Deactivate 2020-09-17 11:55:10 +01:00
Travis Ralston
bfbbf44dfc Add a note to use the desktop builds when seshat isn't available 
Fixes https://github.com/vector-im/element-web/issues/15184

This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.
 2020-09-16 17:23:37 -06:00