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

31488 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
96ebbad959 switch UnverifiedSessionToast to route to check sessions rather than verify the new login 
given the chances are that the new login will be stuck doing initial sync, and won't be in position
to be verified until its finished.
 2021-03-08 04:54:44 +00:00
Matthew Hodgson
c73097a5b0 fix unhelpful 'Review...' toast wording 2021-03-08 04:51:16 +00:00
Matthew Hodgson
d477f964d2 only prompt to verify if we have an MSK or we have devices to verify against 2021-03-08 04:49:59 +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
Matthew Hodgson
1427aa4203 fix mx_EncryptionInfo_spinner padding in dialogs 2021-03-08 04:41:51 +00:00
Will Hunt
d707cf6597
Merge pull request #5576 from matrix-org/hs/blocked-err 
Show a specific error for hs_disabled
 2021-03-05 18:59:16 +00:00
Will Hunt
d07069238f Merge remote-tracking branch 'origin/develop' into hs/blocked-err 2021-03-05 18:50:00 +00:00
Will Hunt
35dbc82b87
Add issue comments 2021-03-05 15:01:48 +00:00
J. Ryan Stinnett
06ad9f0fb8
Merge pull request #5721 from matrix-org/jryans/edge 
Add Edge to the targets list
 2021-03-05 13:31:10 +00:00
J. Ryan Stinnett
1c1d239d5b Add Edge to the targets list 
Part of https://github.com/vector-im/element-web/issues/9175
 2021-03-05 13:19:06 +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
Travis Ralston
65ac063a09
Merge pull request #5715 from 2580ayush2580/ayush258012 
Fix Bottom border of state counters is white on the dark theme
 2021-03-04 20:28:52 -07: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
Jason Robinson
2b2fbabbc0
Merge pull request #5716 from matrix-org/jaywink/host-signup-dialog-borders 
Ensure HostSignupDialog border colour matches light theme
 2021-03-04 13:38:49 +02:00
Jason Robinson
f2d2a048e1 Ensure HostSignupDialog border colour matches light theme 
Ensure dialog borders are always white as the HostSignupDialog
does not yet support dark mode or theming in general.
In the future we might want to pass the theme to the called
iframe, should some hosting provider have that need.
 2021-03-04 11:07:14 +02:00
Ayush Kumar
1cb19554eb Fix Bottom border of state counters is white on the dark theme 2021-03-04 14:03:02 +05:30
David Baker
2f52412834
Merge pull request #5712 from matrix-org/dbkr/dont_place_multiple_calls 
Don't place another call if there's already one ongoing
 2021-03-03 20:36:16 +00:00
David Baker
d8483ddf0d Don't place another call if there's already one ongoing 
The 'call' button doesn't turn into a hangup button as soon as there's
a call in the room, but we should have been doing this anyway.
 2021-03-03 20:23:21 +00: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
85985db441 add comment 2021-03-03 11:50:41 +00: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
Travis Ralston
054330c07b
Merge pull request #5708 from matrix-org/travis/ignore-tmp 
Add .tmp files to gitignore
 2021-03-02 10:51:20 -07:00
Travis Ralston
867ce322e1 Add .tmp files to gitignore 
My git client is convinced that `src/component-index.js.tmp` needs to be checked in, which is nice of it but also wrong.
 2021-03-02 10:47: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
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
831cc7eaa0
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-03-02 12:14:36 +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
178ae2f7bf
Merge pull request #5703 from jaiwanth-v/fix-edit-markdown-image 
Fixed edit for markdown images
 2021-03-01 16:57:08 -07:00