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

5071 commits

Author SHA1 Message Date
Clemens Zeidler
be00320def Make use of the KeyBindingsManager in the ScrollPanel 
Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
 2021-03-29 13:38:15 +13:00
Clemens Zeidler
7d087524a5 Make use of the KeyBindingManager in LeftPanel 
LeftPanel was making key action decisions based on the forwarded event.
Use the KeyBindingManager now.

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
 2021-03-28 20:00:53 +13: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
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12 
Fixing spaces papercuts
 2021-03-26 15:01:31 +00:00
Travis Ralston
e48dbef054
Merge pull request #5804 from matrix-org/travis/uploads-fix 
Fix upload bar not populating when starting uploads
 2021-03-26 08:08:21 -06:00
Michael Telatynski
af18019314 Final spaces tweaks for the demo 2021-03-26 13:46:01 +00:00
Michael Telatynski
eff0e6fcc3 Add facepile to Space landing page and tweak layout slightly 2021-03-26 13:11:57 +00:00
J. Ryan Stinnett
5f70c625ab
Merge pull request #5807 from matrix-org/jryans/tweak-cs-text 
Tweak cross-signing copy
 2021-03-26 12:12:25 +00:00
J. Ryan Stinnett
fd59a66523 Tweak cross-signing copy 
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
 2021-03-26 11:13:39 +00:00
Michael Telatynski
a8c1b7abab Hide space room management checkboxes if you don't have permission at the root space 2021-03-26 09:59:02 +00:00
Michael Telatynski
8c6d92cc99 Move space room discovery & management into the space room view 2021-03-26 09:54:15 +00:00
Travis Ralston
76a05eddfa Fix upload bar not populating when starting uploads 
Fixes https://github.com/vector-im/element-web/issues/16713

See diff for more information
 2021-03-25 22:29:21 -06:00
Travis Ralston
318db15e35
Merge pull request #5790 from panoschal/fix/view-source-bug 
View Source: make Event ID go below Event ID
 2021-03-25 19:11:26 -06:00
Michael Telatynski
d5ab7801f7
Merge pull request #5797 from matrix-org/t3chguy/redaction-groupere 
Fix edge case with redaction grouper messing up continuations
 2021-03-25 20:01:32 +00:00
Michael Telatynski
5e3a7c48f4 Fix edge case with redaction grouper messing up continuations 2021-03-25 19:37:55 +00:00
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