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

13015 commits

Author SHA1 Message Date
Travis Ralston
4688c887c4 Fix GroupAvatar crash 
When we don't have an avatar we shouldn't explode.
 2021-03-10 12:32:18 -07:00
Travis Ralston
2a40bc87cc Fix ResizeMethod usage 2021-03-10 12:32:18 -07: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
f25db38b2b Add tooltips to sent/sending receipts 
Fixes https://github.com/vector-im/element-web/issues/16649
 2021-03-09 21:13:23 -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
71b8959d3c
Apply suggestions from code review 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-03-09 09:36:17 -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
Michael Telatynski
cf2c790699 Pass OOB data for suggested rooms 2021-03-09 13:41:06 +00:00
Michael Telatynski
dd0b0834e6 Fix React warning 2021-03-09 13:40:48 +00: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
Michael Telatynski
81e1f36c4b Tidy up TemporaryTile now that it isn't temporary 2021-03-09 11:19:41 +00:00
Travis Ralston
591ccabab9 Remove a bunch of useless 'use strict' definitions 2021-03-08 20:26:08 -07:00
Travis Ralston
41576954fd Batch of views getting replaceableComponent decorators 2021-03-08 20:23:54 -07:00
Travis Ralston
c5935dbc61 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:46 -07:00
Travis Ralston
fc5b1ed9d6 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:39 -07:00
Travis Ralston
c359dff738 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:34 -07:00
Travis Ralston
3e189d2728 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:29 -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
Panagiotis
7963d7f49e address PR comments 
cleanup, change to isEncrypted, comments
 2021-03-08 21:21:37 +02:00
Matthew Hodgson
14b828ecc6 shorten verify button label 2021-03-08 17:58:30 +00:00
Matthew Hodgson
1629b7e62a s/IP/ip/; s/from/at/ 2021-03-08 16:44:14 +00:00
J. Ryan Stinnett
b12cf7912a
Merge pull request #5624 from SimonBrandner/show-room-name 
Display room name in pills instead of address
 2021-03-08 16:27:43 +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
761ced13f2
Merge pull request #5719 from matrix-org/travis/file-representation 
UI refresh for uploaded files
 2021-03-08 08:52:43 -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
Michael Telatynski
6a5efad142 Show suggested rooms from the selected space 2021-03-08 15:52:21 +00:00
Travis Ralston
fdea45ad74 Add a quick sender check to isLastSuccessful 2021-03-08 08:51:57 -07:00
J. Ryan Stinnett
fca1639e0e
Merge pull request #5725 from HelderFSFerreira/addClipboardWritePermission 
Add clipboard write permission for widgets
 2021-03-08 14:38:23 +00:00
David Baker
0aea8b9efd
Merge pull request #5722 from matrix-org/dbkr/fix_widget_resize 
Fix widget resizing
 2021-03-08 13:47:29 +00:00
David Baker
d71999114b
Merge pull request #5707 from matrix-org/dbkr/audiostream 
Option for audio streaming
 2021-03-08 11:50:45 +00:00
Michael Telatynski
6106e01ab4 Collapse redactions into an event list summary 2021-03-08 09:39:07 +00:00
Helder Ferreira
f545866572
add clipboard write permission 2021-03-08 08:08:02 +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
aa0cca9306 report IP of self-verification reqs 2021-03-08 04:46:47 +00:00
Matthew Hodgson
5b48e13eb9 add explicit link to edit devices from one's own UserInfo 2021-03-08 04:46:15 +00:00
Matthew Hodgson
6df8157a40 cancel VRD at the Modal level, so clicking in the bg cancels it 2021-03-08 04:45:44 +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
Šimon Brandner
35a5442e0d
Increase minHeight 
This is needed for on hold. Otherwise it feels like too much, tbc

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-07 15:05:13 +01: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
Panagiotis
ed6486aabb Merge branch 'improve-view-source' into edit-view-source 2021-03-05 21:44:43 +02: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
Panagiotis
2c64dac514 fix: show decrypted source on EditHistory -> ViewSource 
pass correct props to the component
 2021-03-05 19:57:37 +02:00
Travis Ralston
ca63e937d3 Fix up logic to show sent receipts correctly 2021-03-05 10:56:13 -07:00
David Baker
e5b03488d8 Fix widget resizing 
There was a line of CSS that set pointer-events: none on widget
iframes whilst they were being resized to stop iframes swallowing
the mousemove/up events while dragging the resize handle, but a)
all widgets are now in a persisted element wrapper and therefore
not in the right place in the DOM to get that CSS and b) that only
got set when resizing the whole aps drawer vertically, not dragging
the handle between apps to change the width distribution.

Add a pointer events prop to AppTile to allow the pointer-events
style to be set by the parent, and set it when dragging either
resize handle.

Fixes https://github.com/vector-im/element-web/issues/16473
 2021-03-05 17:52:51 +00:00
Travis Ralston
017c2af663 Merge branch 'develop' into travis/message-states 2021-03-05 09:29:39 -07:00
Will Hunt
35dbc82b87
Add issue comments 2021-03-05 15:01:48 +00:00
David Baker
8bcf0f0838
console.error 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-03-05 10:34:03 +00:00
David Baker
c80cbc38dd
Use helper class 
(It did not need imports)

Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-03-05 10:32:54 +00:00
Clemens Zeidler
efc5d413c4 Fix missing import (from earlier merge conflict) 2021-03-05 22:13:47 +13: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
Travis Ralston
8d143331a8 Appease the linter 2021-03-04 20:10:47 -07:00
Travis Ralston
5d6e3d5711 UI refresh for uploaded files 
Fixes https://github.com/vector-im/element-web/issues/16557
Fixes https://github.com/vector-im/element-web/issues/9482 (technically)

There's two changes in this:
1. The actual file body in the timeline now has a placeholder thing.
2. We're intentionally dropping all the "Travis uploaded a file" sender profile states.
 2021-03-04 20:07:48 -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
David Baker
0f1b7a001e Better error handling for streams 
Also use older youtubeStreamKey as it appears our jitsi doesn't
support the newer one.
 2021-03-04 17:52:49 +00:00
Michael Telatynski
c73ad9e594
Merge pull request #5332 from Transfusion/trim_display_name 
Trim spurious whitespace of nicknames
 2021-03-04 16:26:09 +00: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
Šimon Brandner
c638ced21e
Remove unused consts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-03 16:59:39 +01:00
Šimon Brandner
d244ea3b14
Don't use onResize 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-03 16:42:27 +01:00
Michael Telatynski
77cf4cf7a4
Merge pull request #5706 from matrix-org/t3chguy/spaces4.4 
Space room hierarchies
 2021-03-03 15:25:00 +00:00
Michael Telatynski
73411fa53d tidy code style 2021-03-03 13:42:44 +00:00
Michael Telatynski
a8ff0fa75f
Merge pull request #5705 from matrix-org/t3chguy/spaces4.3 
Iterate Space view and right panel
 2021-03-03 13:37:40 +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
Travis Ralston
c7d4dfa4f5
Merge pull request #5692 from SimonBrandner/scroll-to-bottom-setting 
Add a scroll to bottom on message sent setting
 2021-03-02 17:41:15 -07:00
Šimon Brandner
5877b3e00d
Add resizing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 20:33:19 +01:00
Šimon Brandner
69cdbef3d6
Remove maxHeight prop 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 20:31:39 +01:00
Travis Ralston
08d35073de Improve commentary 2021-03-02 11:04:12 -07:00
Travis Ralston
c74224a1b7 Merge branch 'develop' into travis/message-states 2021-03-02 10:40:49 -07:00
Michael Telatynski
49fc053b94
Merge pull request #5704 from matrix-org/t3chguy/spaces4.2 
Initial Space Room View and Creation UX
 2021-03-02 17:17:39 +00:00
David Baker
20e57d15fd Option for audio streaming 2021-03-02 15:20:54 +00:00
J. Ryan Stinnett
a5ee029c62
Merge pull request #5452 from SimonBrandner/feature-multi-language-spell-check 
Add multi language spell check
 2021-03-02 14:38:21 +00:00
Michael Telatynski
43cc7deeda Show hierarchy of auto_join rooms in the space view 2021-03-02 14:37:28 +00:00
Michael Telatynski
716268b2f9 Add context menu to spaces in the space panel 2021-03-02 14:35:29 +00:00
Travis Ralston
303ea16492
Merge pull request #5697 from matrix-org/travis/fix-tetris 
Fix tetris effect (holes) in read receipts
 2021-03-02 07:35:04 -07:00
Michael Telatynski
ca1bd78921 Add space specific variant of the dropdown on "Rooms +" sublist 2021-03-02 14:20:29 +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
4e9d19d3b0
Pass resizeNotifier into CallViewForARoom 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 14:09:11 +01:00
Šimon Brandner
4476843264
Remove unused _t 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 12:12:10 +01: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
Michael Telatynski
8efe7dcaa1 Decorate Right Panel cards with Space header for when viewing it in that context 2021-03-02 09:54:32 +00:00
Šimon Brandner
ff00683f32
Use === 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-03-02 07:42:07 +01:00
Šimon Brandner
ebedd3cbcb
Remove space 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-03-02 07:41:14 +01:00
Šimon Brandner
6fcb4c7cd2
Fix quote 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-03-02 07:37:00 +01:00
Travis Ralston
db8978580c Improve special read receipt checking 
See comments in code
 2021-03-01 16:25:25 -07:00
Travis Ralston
9cec382865 Change sending->sent state to match new designs 
For https://github.com/vector-im/element-web/issues/16424
 2021-03-01 16:25:19 -07: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
ea61b18c18 Iterate Space Panel alignments 2021-03-01 17:02:02 +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
e43853d6b0 Use a small fractional value instead 2021-02-27 12:02:24 -07:00
David Baker
11ba9e0601
Merge pull request #5690 from matrix-org/dbkr/call_maxheight_nan 
Null check for maxHeight in call view
 2021-02-27 15:05:07 +00:00
Travis Ralston
76ad93b937 Put speed holes in the code 
We can make read receipts more efficient (and avoid double-animation) by using `PureComponent` which no-ops useless updates for us.
 2021-02-26 22:25:50 -07:00
Travis Ralston
b3142d6138 Offset read receipt start positions by 1px 
As mentioned in 208faf6d46, the velocity-animate update causes read receipts to occasionally show up 14px to the right of where they should be. This is because the read receipt width is 14px, and velocity-animate will *not* translate `left` if it isn't changing. Unfortunately, it's smart enough to realize that `-0px` is `0px`, so we end up having to specify `1px`. 

The comment already mentions it, but this should have no perceived effect for the user. During development I could not tell if the 1px was being applied during the animation, implying that it's a meaningless value. It's a bit unfortunate for those who know that it's translating left by 1px, but hopefully they'll be able to unsee that in time.
 2021-02-26 22:24:36 -07:00
Travis Ralston
678ec52035 Merge branch 'develop' into fix-4963 2021-02-26 14:41:28 -07:00
Travis Ralston
855ee068c3 Appease the linter 2021-02-26 13:50:03 -07:00
Travis Ralston
4e27b00cf3 Move call buttons to the room header 
This is to make some room in the composer for voice messages. The hangup behaviour is intentionally lost by this change as the VOIP UX is intended to rely on dedicated hangup buttons instead.
 2021-02-26 13:46:39 -07:00
Šimon Brandner
361420bf68
Use scrollToBottomOnMessageSent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 18:37:30 +01:00
Šimon Brandner
1387c9f94d
Display scrollToBottomOnMessageSent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 18:37:25 +01:00
David Baker
b58ce4ccfc Null check for maxHeight in call view 2021-02-26 14:00:02 +00: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
1a7f9091b4
Animate icon size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-26 07:51:03 +01:00
Robin Townsend
563620484d Support replying with a message command 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-02-25 14:59:47 -05:00
Šimon Brandner
49ea9a4788
Remove sdk import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 20:10:58 +01:00
Šimon Brandner
7277c285a9
Fix weird crash 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 20:10:38 +01:00
Šimon Brandner
43e1144ae7
Don't use TintableSVG 
This seemed to have caused a little lag and it was unnecessary

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 19:36:55 +01:00
Šimon Brandner
1c48804d96
Remove unnecessary class 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-25 19:28:08 +01:00
Šimon Brandner
c1a105f071
Merge branch 'develop' into improve-file-drop-ui 2021-02-25 18:12:37 +01:00
Travis Ralston
fbe5d17785 sanity 2021-02-24 18:27:59 -07:00
Travis Ralston
e2fb9b3ae8 Clean up widgets when leaving the room 2021-02-24 18:10:35 -07:00
Travis Ralston
dee7c7b556
Merge pull request #5567 from SimonBrandner/fix-read-receipts 
Fix read receipts?
 2021-02-24 11:21:42 -07:00
Travis Ralston
83078a67c2
Merge pull request #5678 from matrix-org/hs/fix-usage-alerts 
Fix MAU usage alerts
 2021-02-24 11:21:03 -07:00
Will Hunt
c78d1c49ab Apply changes from review 2021-02-24 17:32:00 +00:00
J. Ryan Stinnett
c57b49a354
Merge pull request #5673 from SimonBrandner/dont-show-copy-button 
Add <code> if it's missing
 2021-02-24 13:33:39 +00:00
Šimon Brandner
986950697b
Rmove unnecessary code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:10:09 +01:00
Šimon Brandner
024871f59d
Merge branch 'dont-show-copy-button' of https://github.com/SimonBrandner/matrix-react-sdk into dont-show-copy-button 2021-02-24 13:41:16 +01:00
Šimon Brandner
363b753306
Avoid innerHTML 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 13:40:37 +01:00
Šimon Brandner
61cd026d7a
Improve comment 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-02-24 13:07:25 +01:00
J. Ryan Stinnett
9a56a2efa5
Merge pull request #5629 from PunitLodha/punit/add_email_bug_fix 
Add email only if the verification is complete
 2021-02-24 11:28:57 +00:00
Šimon Brandner
2f2c5c9081
Merge branch 'develop' into fix-read-receipts 2021-02-23 18:43:58 +01: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
3db6a45010 Revert "Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes" 
This reverts commit 5c1b38a48c, reversing
changes made to ec4a39a694.
 2021-02-23 12:03:08 +00:00
Šimon Brandner
ce1be7a4cd
Use length instead of the first element 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 07:49:26 +01:00
Šimon Brandner
c9baff1e10
Move the _addCodeElement() call down a bit 
We can skip this if the first if statement is true

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 07:46:03 +01:00
Šimon Brandner
c965119410
Add _addCodeElement method 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 07:40:53 +01: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
Šimon Brandner
6149567c62
Add <code> if it's missing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-22 13:43:57 +01:00
Šimon Brandner
87a2454556
Revert "Don't show copy button if there is no <code>" 
This reverts commit c76cc33ebf.
 2021-02-22 13:41:20 +01:00
Šimon Brandner
c76cc33ebf
Don't show copy button if there is no <code> 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-22 13:23:39 +01: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
a794bfdd3e
Merge pull request #5665 from matrix-org/t3chguy/spaces1 
Discard some dead code
 2021-02-19 09:50:04 +00:00
Michael Telatynski
3ca5632f6a Replace ObjectUtils.js with objects.ts 2021-02-19 00:00:10 +00:00
Travis Ralston
10b0051c02 Appease the linter 2021-02-18 15:30:03 -07:00
Travis Ralston
52c73a7a58 Add developer tool to explore and edit settings 2021-02-18 14:56:19 -07:00
Šimon Brandner
5a6e393fa2
Removed spell-check-languages 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 20:13:55 +01:00
Šimon Brandner
1ba512af2a
Use getSpellCheckLanguages() instead of a setting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 20:12:48 +01:00
Šimon Brandner
305d64cda8
Removed log 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 20:09:39 +01:00
Šimon Brandner
2ebc1252cb
Removed unnecessary functions 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 19:54:54 +01:00
Šimon Brandner
ed02503462
Fix one more license 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 19:41:19 +01:00
Šimon Brandner
5de99c7708
Fix licenses 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 19:40:24 +01:00
Michael Telatynski
50252483c6 Remove stale unused components 2021-02-18 18:05:41 +00:00
Šimon Brandner
bd0e5446c5
Merge branch 'develop' into feature-multi-language-spell-check 2021-02-18 18:16:16 +01:00
Michael Telatynski
0e7a731d61 Make use of new room canInvite helper 2021-02-18 15:19:16 +00:00
Michael Telatynski
e1acf11e67 Create Room Name & Topic HOCs to simplify code elsewhere 2021-02-18 15:16:59 +00:00
Michael Telatynski
354925c2c8 Improve TS definitions 2021-02-18 15:16:07 +00:00
David Baker
68933c1a3d
Merge pull request #5639 from matrix-org/dbkr/virtual_rooms_v2 
VoIP virtual rooms, mk II
 2021-02-18 13:18:34 +00:00
Šimon Brandner
86fe5f778d
Use modal as a param 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-17 13:32:48 +01:00
Šimon Brandner
a7847f2514
onIsEmptyChanged() -> onChange() 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-17 13:25:53 +01:00
Šimon Brandner
9420cc35cc
Added a key 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-17 13:22:19 +01:00
J. Ryan Stinnett
5c1b38a48c
Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes 
Improve URL preview formatting and image upload thumbnail size
 2021-02-17 11:37:37 +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
Clemens Zeidler
54c38844d2 Use key bindings in BasicMessageComposer 2021-02-17 22:00:48 +13: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
David Baker
e787d11c73 Merge remote-tracking branch 'origin/develop' into dbkr/virtual_rooms_v2 2021-02-16 19:41:54 +00:00
Michael Telatynski
b386f0c73b
Merge pull request #5657 from matrix-org/t3chguy/usercontent 
Remove redundant lockOrigin parameter from usercontent
 2021-02-16 18:23:55 +00:00
Michael Telatynski
6cb3381df5 Remove redundant lockOrigin parameter from usercontent 
now that each Element has its own, and not usercontent.riot.im
it only has to permit its own origin
 2021-02-16 18:03:12 +00:00
Jaiwanth
ee54327733 Update src/components/views/rooms/RoomTile.tsx 2021-02-16 18:59:22 +05:30
Clemens Zeidler
c84ad9bedc Use key binding for cancelling a message reply 2021-02-16 19:12:18 +13:00
Clemens Zeidler
ac7963b509 Fix lint and style issues 2021-02-16 19:05:51 +13:00
Clemens Zeidler
12387b4978 Use the KeyBindingsManager in EditMessageComposer 2021-02-16 19:05:39 +13: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
Jaiwanth
04d2bf1d6a Check whether user has permission to invite 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 20:55:15 +05:30
Šimon Brandner
5072fb0608
Merge branch 'develop' into improve-layout-handling 2021-02-15 16:12:08 +01:00
Šimon Brandner
65ef4f2f22
Removed the commented out code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-15 16:05:14 +01:00
Jaiwanth
f420c85985 Added invite option to room's context menu 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 19:21:26 +05:30
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
PunitLodha
0902936d39 Add phone number only if verification is complete 2021-02-14 18:21:39 +05:30
PunitLodha
74a6c1e8d8 Dont clear email if verification cancelled by user 2021-02-14 18:21:12 +05:30
Clemens Zeidler
b4c5dec4e5 Use the KeyBindingsManager for the SendMessageComposer 2021-02-14 15:56:55 +13:00
David Baker
196507a730 VoIP virtual rooms, mk II 
Does a thirdparty protocol lookup to the homeserver to get the
corresponding native/virtual user for a matrix ID. Stores the
mappings in room account data. Involves some slightly nasty workarounds
for that fact that room account data has no local echo.
 2021-02-12 20:55:54 +00:00
Šimon Brandner
130e4f7bfd
Added some styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 17:06:02 +01:00
Šimon Brandner
97f5b6920c
Check if the method is defined before calling it 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 16:48:46 +01:00
Šimon Brandner
2b4859a858
Merge branch 'develop' into fix-4963 2021-02-12 16:30:01 +01:00
Šimon Brandner
b269517149
Removed wrapper 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:52:42 +01:00
Šimon Brandner
ba2c68819f
Removed showSendButton setting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:45:06 +01:00
Šimon Brandner
35c0cb99d0
Use isComposerEmpty for send button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:45:03 +01:00
Šimon Brandner
50b0a78132
Renamed composerEmpty to isComposerEmpty 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:44:22 +01:00
Šimon Brandner
42a48ee27d
Added composerEmpty property 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:44:22 +01:00
Šimon Brandner
98757bb6cf
Extract send button into a function 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:44:16 +01:00
Šimon Brandner
17f09d3b7a
Added onIsEmptyChanged prop 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:16:07 +01:00
Šimon Brandner
d8a9b84af9
Don't show tooltip if there is nothing to display 
We do this because resource is undefined for @room

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 14:28:39 +01:00
Šimon Brandner
a975de22ef
Fixed buggy tooltip 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 11:27:14 +01:00
Šimon Brandner
f2137fe93f
Merge branch 'develop' into show-room-name 2021-02-12 08:21:40 +01:00
Šimon Brandner
33979b3354
Added a tooltip 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 08:18:27 +01:00
Michael Telatynski
da6f1e559b
Merge pull request #5634 from jaiwanth-v/add-loading-TextInputDialog 
Added loading and disabled the button while searching for server
 2021-02-11 12:22:27 +00:00
Jaiwanth
20dc8dbb32
Update src/components/views/dialogs/TextInputDialog.js 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-02-11 17:39:12 +05:30
Jaiwanth
61c6033de7
Update src/components/views/dialogs/TextInputDialog.js 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-02-11 17:38:58 +05:30
Jaiwanth
6c252a87a1
Update src/components/views/dialogs/TextInputDialog.js 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-02-11 17:38:46 +05:30
Jaiwanth
3fc6d73158 Added loading and disabled the button while searching for server 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-11 17:28:02 +05:30
J. Ryan Stinnett
fa5df314a1
Merge pull request #5450 from matrix-org/jaywink/hosting-provider-iframe 
Add host signup modal with iframe
 2021-02-10 13:53:15 +00:00
Šimon Brandner
6b0b46b917
Fix duplication caused by highlighting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 14:20:19 +01:00
Šimon Brandner
895be6e7a6
Added second comment back 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 14:02:45 +01:00
Šimon Brandner
5cf126dea3
Added comment back 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 13:41:24 +01:00
Šimon Brandner
b97d8979c7
Remove nested for loop 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 13:18:23 +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
dc549a9e4b Address some more pr feedback 2021-02-09 22:41:40 +02:00
Šimon Brandner
4a7bc74e99
Fix duplication of codeblock elements 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-09 19:46:30 +01: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
Michael Telatynski
59069f95e9
Merge pull request #5631 from SimonBrandner/avoid-delay-on-screen-share 
Avoid delayed displaying of sources in source picker
 2021-02-09 12:26:29 +00:00
Šimon Brandner
27b2b5b65d
Make componentDidMount async 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-09 13:19:12 +01:00
Šimon Brandner
98e602f544
Avoid delayed displaying of sources 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-09 13:07:23 +01:00
Jason Robinson
c92a930d0a Fix positioning of minimize action and add titles 2021-02-09 12:40:12 +02:00
Jason Robinson
ad5b40b5ba Allow popups from host signup dialog 2021-02-09 12:29:23 +02:00
Jason Robinson
e31b89b952 Restructure host signup terms dialog documents config and dialog 2021-02-09 12:23:27 +02:00