Commit graph

445 commits

Author SHA1 Message Date
Robin
30460943b2
Release video rooms as a beta feature (#8431)
* Remove blank header from video room view frame

* Add a beta card for video rooms

* Rename the 'disclaimer' on beta cards to 'FAQ'

Because that's what the section actually gets used as

* Add beta pills to video room creation buttons

* Remove duplicate tooltips from face piles

* Add beta pill to headers of video rooms

* Factor RoomInfoLine out of SpaceRoomView

* Factor RoomPreviewCard out of SpaceRoomView

* Adapt RoomPreviewCard for video rooms

* "New video room" → "Video room"

* Add comment about unused cases in RoomPreviewCard

* Add types

* Clarify !important comments

* Add a reload warning

* Fix the reload warning being the wrong way around

* Fix lints

* Make widgets in video rooms mutable again to de-risk future upgrades

* Ensure that the video channel exists when mounting VideoRoomView

* Fix lint

* Iterate beta reload warning
2022-06-09 13:07:59 -04:00
Germain
f14374a51c
Improve composer visiblity (#8578)
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2022-06-07 07:28:29 +00:00
Kerry
15c2fb6b71
Live location sharing - open location in OpenStreetMap (PSF-1040) (#8695)
* share plain lat,lon string from beacon tooltip and list item

Signed-off-by: Kerry Archibald <kerrya@element.io>

* export makeMapSiteLink helper fn

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use currentColor in external-link.svg

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add open in openstreetmap link

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fussy import ordering

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fix icon color var

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-05-27 11:58:39 +02:00
Travis Ralston
025fb631b7
Update "jump to related event" for design requirements & dev tooling (#8652) 2022-05-20 08:07:00 -06:00
Kerry
804ddbb332
Live location sharing - update live location tiles (PSF-1027) (#8649)
* update map svg

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add map fallback component, update styls

Signed-off-by: Kerry Archibald <kerrya@element.io>

* update purple location icon style

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fussy import ordering

Signed-off-by: Kerry Archibald <kerrya@element.io>

* tidy

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-05-20 09:49:01 +00:00
Germain
3f2f839b3b
Add jump to related event context menu item (#6775) 2022-05-19 14:56:10 +01:00
Janne Mareike Koschinski
6d6cfcde11
registration: redesign email verification page (#8554) 2022-05-13 14:10:22 +00:00
Kerry
661e2c2aa5
Live location sharing - beacon map in timeline (#8286)
* add displaystatus util

Signed-off-by: Kerry Archibald <kerrya@element.io>

* map fallback svg

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add Map to mbeaconbody

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add bubble layout handling

Signed-off-by: Kerry Archibald <kerrya@element.io>

* test beaconbody

Signed-off-by: Kerry Archibald <kerrya@element.io>

* typo

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use randomString from js-sdk

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-04-12 09:13:55 +01:00
Kerry
df20821fd6
Live location sharing - extract zoom buttons into component (#8235)
* extract out zoombuttons component

* newline

Signed-off-by: Kerry Archibald <kerrya@element.io>

* stylelint

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove skinned sdk

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-04-11 10:29:07 +02:00
Robin
6bf7fef92b
Update new room icon (#8239) 2022-04-06 08:49:27 -04:00
Travis Ralston
4057833036 Merge branch 'develop' into travis/remove-skinning 2022-04-05 10:50:37 -06:00
Germain
694c39e72d
Enable threads by default and mark it as a beta feature (#8081) 2022-04-05 17:15:31 +01:00
Robin
4f6b939426
More video rooms design updates (#8222)
* Update video room icon

* Hide room header border in video rooms

* Fix inconsistent padding on AppTile frames
2022-04-05 06:30:57 -04:00
Robin
1f64835fab
Update video rooms to new design specs (#8207)
* Remove radio component

* "Voice room" → "video room"

* Remove interactivity from video room tiles

* Update connection state when joining via widget

* Simplify room header buttons for video rooms

* Split out video room creation into a separate menu option

* Simplify room options for video rooms

* Update video room tile layout

* Tell the Jitsi widget whether it's a video channel

* Update tests

* "Voice" → "video" in more places

* Fix tests

* Re-add frame to immersive Jitsi widgets

* Comment ack

* Make updateDevices more readable

* Type FacePile
2022-04-01 14:36:10 +00:00
Travis Ralston
63091e7b66 Step 10.2: Move matrix logo replacement into react-sdk 2022-03-28 14:33:28 -06:00
Suguru Hirahara
56569dbb63
Readd the group icon on home page (#8145)
Fixes https://github.com/vector-im/element-web/issues/21551

- Replace `community` with `group`

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
2022-03-24 13:51:18 -06:00
Travis Ralston
fce36ec826
Delete groups (legacy communities system) (#8027)
* Remove deprecated feature_communities_v2_prototypes

* Update _components

* i18n

* delint

* Cut out a bit more dead code

* Carve into legacy components

* Carve into mostly the room list code

* Carve into instances of "groupId"

* Carve out more of what comes up with "groups"

* Carve out some settings

* ignore related groups state

* Remove instances of spacesEnabled

* Fix some obvious issues

* Remove now-unused css

* Fix variable naming for legacy components

* Update i18n

* Misc cleanup from manual review

* Update snapshot for changed flag

* Appease linters

* rethemedex

* Remove now-unused AddressPickerDialog

* Make ConfirmUserActionDialog's member a required prop

* Remove useless override from RightPanelStore

* Remove extraneous CSS

* Update i18n

* Demo: "Communities are now Spaces" landing page

* Restore linkify for group IDs

* Demo: Dialog on click for communities->spaces notice

* i18n for demos

* i18n post-merge

* Update copy

* Appease the linter

* Post-merge cleanup

* Re-add spaces_learn_more_url to the new SdkConfig place

* Round 1 of post-merge fixes

* i18n

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2022-03-22 23:07:37 +00:00
Robin
cfabcdda35
Voice rooms prototype (#8084)
* Add voice room labs flag

Signed-off-by: Robin Townsend <robin@robin.town>

* Add more widget actions for interacting with Jitsi

Signed-off-by: Robin Townsend <robin@robin.town>

* Factor out a more generic Jitsi creation utility

Signed-off-by: Robin Townsend <robin@robin.town>

* Add utilities for managing voice channels

Signed-off-by: Robin Townsend <robin@robin.town>

* Enable creation of voice rooms

Signed-off-by: Robin Townsend <robin@robin.town>

* Force a maximized view of voice channel widgets

Signed-off-by: Robin Townsend <robin@robin.town>

* Add voice channel store

Signed-off-by: Robin Townsend <robin@robin.town>

* Factor out a more generic FacePile

Signed-off-by: Robin Townsend <robin@robin.town>

* Implement room tile changes for voice rooms

Signed-off-by: Robin Townsend <robin@robin.town>

* Add interactive radio component to the left panel

Signed-off-by: Robin Townsend <robin@robin.town>

* Test voice rooms

Signed-off-by: Robin Townsend <robin@robin.town>

* Update name of call room type

Signed-off-by: Robin Townsend <robin@robin.town>

* Clarify that voice rooms are under development

Signed-off-by: Robin Townsend <robin@robin.town>

* Use readonly

Signed-off-by: Robin Townsend <robin@robin.town>

* Move acks to the end of handlers

Signed-off-by: Robin Townsend <robin@robin.town>

* Add comment about avatar URLs coming from Jitsi

Signed-off-by: Robin Townsend <robin@robin.town>

* Don't use unicode ellipses

for translation reasons?

Signed-off-by: Robin Townsend <robin@robin.town>

* Fix tests

Signed-off-by: Robin Townsend <robin@robin.town>

* Fix tests, again

Signed-off-by: Robin Townsend <robin@robin.town>

* Remove unnecessary export

Signed-off-by: Robin Townsend <robin@robin.town>

* Ack Jitsi events when we wait for them

Signed-off-by: Robin Townsend <robin@robin.town>
2022-03-22 16:14:11 -06:00
Michael Telatynski
14807de552
Show displayname in non-narrow thread summeries (#8036)
* Show displayname in non-narrow thread summeries

* Iterate PR

* Iterate PR to use line-height based approach

* Fix hover/focus chevron on thread summary relying on font character
2022-03-11 19:24:18 +00:00
Kerry
ebc2267e52
Location sharing > back button (#7958)
* add back/cancel buttons to share dialog

Signed-off-by: Kerry Archibald <kerrya@element.io>

* test buttons

Signed-off-by: Kerry Archibald <kerrya@element.io>

* improve weird indentation

Signed-off-by: Kerry Archibald <kerrya@element.io>

* relint

Signed-off-by: Kerry Archibald <kerrya@element.io>

* PR tweaks

Signed-off-by: Kerry Archibald <kerrya@element.io>

* quotes

Signed-off-by: Kerry Archibald <kerrya@element.io>
2022-03-03 11:30:46 +01:00
Kerry
b480bffab0
Location share type UI (#7924)
* copyright

Signed-off-by: Kerry Archibald <kerrya@element.io>

* empty line

Signed-off-by: Kerry Archibald <kerrya@element.io>

* functional picker

Signed-off-by: Kerry Archibald <kerrya@element.io>

* most style

Signed-off-by: Kerry Archibald <kerrya@element.io>

* nice style for options

Signed-off-by: Kerry Archibald <kerrya@element.io>

* get ShareType test passing

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add maplibre mock

Signed-off-by: Kerry Archibald <kerrya@element.io>

* lint and test

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add section to themes for location sharing cols

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add svg mock

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use same mock string as imageMock

Signed-off-by: Kerry Archibald <kerrya@element.io>

* newline

Signed-off-by: Kerry Archibald <kerrya@element.io>

* lint

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add live location icon

Signed-off-by: Kerry Archibald <kerrya@element.io>

* rename useEnabledShareTypes

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use solid color for live border

* use ternary

Signed-off-by: Kerry Archibald <kerrya@element.io>

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2022-03-02 13:00:40 +00:00
Michael Telatynski
ed185240a5
Move new search experience to a Beta (#7718) 2022-02-08 14:02:36 +00:00
Michael Telatynski
5d89230271
Remove IA 1.1 feedback toast (#7720) 2022-02-07 12:46:48 +00:00
Andy Balaam
2743a75a21
Display general marker on non-self location shares (#7574) 2022-01-19 09:33:49 +00:00
Michael Telatynski
67a4d22e79
Update sidebar icon from Compound (#7572) 2022-01-18 15:29:43 +00:00
Michael Telatynski
d5412e52ed
Replace home icon with new one (#7571) 2022-01-18 15:29:01 +00:00
Šimon Brandner
1f298250b9
Make the Keyboard Shortcuts dialog into a settings tab (#7198) 2022-01-17 11:53:10 +00:00
Andy Balaam
9cb8ce7c20
Add zoom buttons to the location view (#7482) 2022-01-10 09:30:24 +00:00
Andy Balaam
70dc03552c
Display the user's avatar when they shared their location (#7424) 2021-12-21 15:19:27 +00:00
Andy Balaam
2b52e17a80
Allow ending polls (#7305)
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-12-08 14:56:48 +00:00
Michael Telatynski
275e9c1d02
Update space panel expand mechanism (#7230) 2021-12-07 09:32:00 +00:00
Matthew Hodgson
1262021417
Simple static location sharing (#7135)
Adds maplibre as a dependency, and behind a labs flag, lets users send and receive [MSC3488](https://github.com/matrix-org/matrix-doc/blob/matthew/location/proposals/3488-location.md) style location shares - with backwards compatibility with old school `m.location` `msgtype` location shares too.

For this to work, you have to define a valid maptile server and API in your config.json's `map_style_url`.
2021-12-06 09:45:12 +00:00
James Salter
5219b6be80
Analytics opt in for posthog (#6936)
* Add a new flag pseudonymousAnalyticsOptIn replacing analyticsOptIn, stored at account level, so people only need to opt in once.

* Show a toast in login to users that have analyticsOptIn set but not yet pseudonymousAnalyticsOptIn prompting them confirm the new method is okay. Update the copy of the existing opt-in toast. Don't notify users that previously opted out.

* Update the copy in settings

* Add a new learn more dialog

* Support a new config flag analyticsOwner which is used in these toasts when explaining which entity the data is sent to ("Help improve %(analyticsOwner)"). If unset, display brand. This allows deployments whose brand differs from the receiver of the analytics to explain the situation to their users (e.g. AcmeCorp badges their app, but explains the data is sent to Element, not them)

* The new opt-in and flags are only used when posthog is configured; prior to that there are no changes to UX or tracking behaviour.
2021-12-06 09:39:33 +11:00
Michael Telatynski
4a6d46b76a
Replace breadcrumbs with recently viewed menu (#7073) 2021-12-01 10:50:06 +00:00
Michael Telatynski
8fe582b094
Tweaks to informational architecture 1.1 (#7052)
* Move user avatar to Space panel

* Add room list header for 'Home' or 'Space Name' to room list
Add existing Space context menus to room list header

* Re-add pending room join spinner

* Iterate RoomListHeader plus context menu

* Iterate space context menu

* Iterate room list + interactions

* Move DND to new iA model

* Replace composer custom status management with usermenu one

* Cull Quick Actions

* Iterate minimized room list state

* delint

* Merge the RoomListNumResults into the RoomListHeader

* Make the search shortcut prompt semi-bold

* Iterate RoomListHeader based on design review

* Iterate UserMenu based on feedback

* Add name to expanded spacepanel usermenu button

* i18n

* Make room sub list aux button components more generic

* Change left panel explore button to only refer to room directory

* Iterate RoomListHeader

* Fix custom user status input field width in Chrome

* Bring back Notification settings button

* delint

* i18n

* post-merge fix

* iterate pr

* Remove unused state

* update copy

* Apply suggestions from PR review

* delint

* Update invite iconography

* Iterate Space context menu to match Figma

* Fix chevron alignment

* Fix edge case for RoomListHeader on metaspaces

* Wire up general rageshake-driven feedback mechanism

* Add IA1.1 info toast

* add missing alt attribute

* delint

* delint

* tweak ia toast priority

* e2e test account for new toast

* autofocus feedback field and remove old subheading

* tweak copy

* Iterate space panel colours to match Figma

* Iterate PR

* delint

* Fix feedback submission with object setting values

* iterate based on review

* Tweak colours and update splash image

* Tweaks based on review

* Remove room list prompt, made redundant by the big fat `+`

* Fix edge cases around User Menu positioning and dnd

* Add missing import, bad merge?

* Update aria label in e2e test

* Fix room list space rooms context menu explore button behaviour

* Tweak copy

* Revert order of options in the UserMenu

* Tweak copy

* i18n
2021-11-30 18:08:46 +00:00
Travis Ralston
3c06e7f7a0
Add option to change the size of images/videos in the timeline (#7017)
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: Timo K <toger5@hotmail.de>
2021-11-17 15:19:30 +00:00
Timo
556cfc7ed8
Add maximise widget functionality (#7098)
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-11-16 15:43:18 +01:00
Šimon Brandner
bafeb38472
Improve VoIP UI/UX (#7048)
* Remove speaking indicator

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove mic icon for primary feed

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Remove caching as it doesn't seem to be neccessary

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Add call view buttons colors

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Refactor button code

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Update call view button icons

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* i18n

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Add dialpad icon

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix button sizing in PiP

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

* Fix secondary voice video feed color

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-11-15 17:24:11 +00:00
Michael Telatynski
27c3153947
Unified room context menus (#7072) 2021-11-15 11:39:25 +00:00
Michael Telatynski
5ad3261cb2
Implement more meta-spaces (#7077) 2021-11-11 13:07:41 +00:00
Germain
1de9630e44
Fixes following threads design implementation review (#7100) 2021-11-11 11:00:18 +00:00
Andy Balaam
431b69ee49
Display started polls in timeline (without votes) (behind labs setting) (#7088)
* Display started polls in timeline (without votes)

* Update i18n info

* Keep original background colour of poll options, even on hover

* Show full avatar above a poll message
2021-11-10 15:44:57 +00:00
J. Ryan Stinnett
286388bc7b
Remove all unreferenced images (#7103) 2021-11-09 11:28:29 +00:00
Šimon Brandner
f643839a00
Improve the look of the spinner (#6083) 2021-11-02 09:35:06 +00:00
Travis Ralston
73731cc478
Polls: Creation form & start event (#7001)
* PSFD-423: Permission check for polls dialog

* PSFD-423: Implement compound scrollable dialog and skeleton create poll

* PSFD-325: Ask the question

* PSFD-328: Ask for options

* PSFD-423: Ensure form submission semantics work for dialogs

* PSFD-328: Option semantics

* Can delete all option to end up with zero
* Minimum 2 to submit the form

* PSFD-316: Send poll start event

* Appease the linter

* PSFD-328: Reduce padding between options to account for field size

* Iterate per design

* Fix submission
2021-11-01 23:44:42 -06:00
Germain
e649bf5541
Update Thread icon (#7031) 2021-10-26 07:53:36 +01:00
Andy Balaam
70606ffff6
Replace all uses of notice-primary-color with the correct alert colour (#7010) 2021-10-25 10:32:38 +01:00
Dariusz Niemczyk
1d6c9fa8da
Add threads ViewInRoom context button (#18955) (#6947) 2021-10-18 12:09:01 +00:00
Dariusz Niemczyk
f8c516d927
Add new thread message preview (#18958) (#6953)
Closes https://github.com/vector-im/element-web/issues/18958
2021-10-15 14:29:17 +01:00
Dariusz Niemczyk
562a880c7d
Create room threads list view (#6904)
Implement https://github.com/vector-im/element-web/issues/18957 following requirements:
* Create a new right panel view to list all the threads in a given room.
* Change ThreadView previous phase to be ThreadPanel rather than RoomSummary
* Implement local filters for My and All threads

In addition: 
* Create a new TileShape for proper rendering requirements (hiding typing indicator)
* Create new timelineRenderingType for proper rendering requirements
2021-10-14 15:27:35 +02:00
Travis Ralston
71c5b02390 Add feature flag for polls and placeholder dialog
We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted.
2021-10-12 15:13:56 -06:00
Jaiwanth
208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Germain Souquet
160bf8e21f Fix missing prop 2021-09-28 11:06:06 +01:00
Dariusz Niemczyk
0cfa2a58c7
Add ability to expand and collapse long quoted messages (#6701)
In case where we had a very long message the experience of going between 
messages to see the full quote isn't very nice on desktop, therefore this commit
adds a button with additional hotkey to normalize the experience a bit.

Fixes https://github.com/vector-im/element-web/issues/18884
2021-09-27 12:20:37 +02:00
Jaiwanth
94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
Michael Telatynski
a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
2021-09-06 11:41:09 +01:00
Germain Souquet
458f860a26 Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-17 11:14:21 +01:00
Germain Souquet
d1dbfbd014 hide thread events from the timeline 2021-08-17 11:10:02 +01:00
Jaiwanth
0e3ad652af Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-14 00:04:30 +05:30
Šimon Brandner
fa204c4104
Add declined call buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:34:11 +02:00
Michael Telatynski
be85dcd1bf Delabs Spaces, keeping it as a default-on preference for the time being 2021-08-11 14:52:40 +01:00
Jaiwanth
036d8a15c6 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-09 10:36:43 +05:30
Robin Townsend
5e3b79eeca Remove seams from pin icon
Signed-off-by: Robin Townsend <robin@robin.town>
2021-08-04 18:42:47 -04:00
Jaiwanth
46e2f67f54 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-03 10:03:16 +05:30
Jaiwanth
17e9cf4d2a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-30 12:17:31 +05:30
Šimon Brandner
152168ef2d
Add mic mute icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 10:20:59 +02:00
Šimon Brandner
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:25:38 +02:00
Jaiwanth
b04bfeda33 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-07-26 00:18:56 +05:30
Šimon Brandner
4aa8d8ff21
Add missed call icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:36:41 +02:00
Šimon Brandner
b762303102
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:10:01 +02:00
Michael Telatynski
fd64d37305 Add iconography to Create Room Dialog dropdown
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
Jaiwanth
1ed316851a Merge upstream and resolve conflicts 2021-07-21 11:35:27 +05:30
Šimon Brandner
4546df7246
Update sidebar icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 17:13:54 +02:00
Šimon Brandner
e5563ac60b
Update the screen-sharing buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:11:55 +02:00
Šimon Brandner
c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-20 15:48:25 +02:00
Šimon Brandner
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:24:05 +02:00
Jaiwanth
fe2cac56f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-19 12:57:27 +05:30
Šimon Brandner
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:13:51 +02:00
Travis Ralston
942cadc8a3 Merge branch 'develop' into travis/notifications-2 2021-07-16 16:20:23 -06:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
Šimon Brandner
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:37:57 +02:00
Šimon Brandner
375e279825
Add speaker icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 15:15:48 +02:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363)
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
Travis Ralston
3ae76c84f6 Add a simple TagComposer for the keywords entry 2021-07-12 23:55:08 -06:00
Šimon Brandner
fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:53:22 +02:00
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
Jaiwanth
551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30
Michael Telatynski
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
Jaiwanth
637e3afa48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-29 11:31:30 +05:30
Jaiwanth
398d49245f Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-06-26 23:42:42 +05:30
Jaiwanth
4d6ad91e52 Add export option to right panel 2021-06-25 22:45:14 +05:30
Michael Telatynski
1d374f6cbb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731 2021-06-25 14:50:24 +01:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237)
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
2021-06-25 11:45:15 +01:00
Michael Weimann
086042f078
update message context texts and icons
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:53 +02:00
Michael Weimann
6ea79b297f
tweak message context icons
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:51 +02:00
Michael Weimann
62efea7e19
add message context menu icons
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
Michael Telatynski
cdb97d5494 Fix trashcan.svg by exporting it with its viewbox
then fix sizing and alignment of consumers
2021-06-23 12:30:23 +01:00
Michael Telatynski
1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
Šimon Brandner
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 17:07:43 +02:00
Šimon Brandner
65c477f45f
Add sidebar icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 17:17:00 +02:00