Commit graph

4894 commits

Author SHA1 Message Date
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
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
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
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
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
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