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

292 commits

Author SHA1 Message Date
Šimon Brandner
9420cc35cc
Added a key 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-17 13:22:19 +01: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
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
J. Ryan Stinnett
15a4032be0
Merge pull request #5530 from aaronraimist/option-hide-stickers 
Add option to hide the stickers button in the composer
 2021-02-04 17:01:23 +00:00
David Baker
0a90c982c7 Add VoIP user mapper 
The accompanying element-web PR with the config documentation should
explain what this is & why. Internally, this breaks the assumption
that call.roomId is the room that the call appears in for the user.
call.roomId may now be a 'virtual' room while the react SDK actually
displays it in a different room. React SDK always stores the calls
under the user-facing rooms, and provides a function to get the
user-facing room for a given call.
 2021-01-21 19:20:35 +00:00
Šimon Brandner
c9f5c90047
Rename method 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-16 16:43:47 +01:00
Šimon Brandner
c61e41ba77
Rename setting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-16 16:37:50 +01:00
Šimon Brandner
9f1113b3bd
Watch setting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-16 16:35:50 +01:00
Šimon Brandner
c64b2a585f
Added option to disable send button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:17:40 +01:00
Šimon Brandner
d589c61000
Added send message button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:09:14 +01:00
Aaron Raimist
b8334bfd4a
Add option to hide the stickers button in the composer 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-01-02 15:31:54 -06:00
Michael Telatynski
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly 
Initial Countly work
 2020-10-30 13:07:58 +00:00
Michael Telatynski
c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Michael Telatynski
e06550b748 Watch replyToEvent at RoomView to prevent races 2020-10-28 12:47:59 +00:00
David Baker
7ad366603a Support rejecting calls 
Use the 'reject' method when we want to reject an incoming call
rather than end one that's in progress. Also get our error messages
right for the other side rejecting the call (albeit still with
placeholder dialog-box UX).

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1510
 2020-10-15 14:54:03 +01:00
David Baker
40ba342aa2
Merge pull request #5308 from matrix-org/dbkr/call_state_machine 
Rewrite call state machine
 2020-10-13 10:39:15 +01:00
David Baker
414901dfae More enums 2020-10-12 11:38:32 +01:00
Michael Telatynski
177b76d882
Merge pull request #5284 from matrix-org/t3chguy/fix/10353 
Track replyToEvent along with Cider state & history
 2020-10-08 14:59:14 +01:00
Michael Telatynski
0e42fc45e2 Resolve couple of React warnings/errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:40:20 +01:00
Michael Telatynski
120f269190 Track replyToEvent along with CIDER state & history 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 14:47:53 +01:00
Travis Ralston
9df175212e Merge branch 'develop' into travis/ft-sep1620/04-jitsi-hangup 2020-09-28 13:43:47 -06:00
David Baker
8962f7ae9e Convert CallHandler to typescript 
and remove the old conference call stuff while we're at it: enough
time should have passed since those mistakes that we can move on.
The old conference call rooms will still appear for anyone whose
account dates back to that time, but they've presumably been appearing
in any other matrix client they used too.
 2020-09-24 16:16:20 +01:00
Travis Ralston
1ffc6d5bd3 Make the hangup button do things for conference calls 
Behaviour constraints:
* If you're not in the conference, use a grey button that does nothing.
* If you're in the conference, show a button:
  * If you're able to modify widgets in the room, annotate it in the context of ending the call for everyone and remove the widget. Use a confirmation dialog.
  * If you're not able to modify widgets in the room, hang up.

For this we know that persistent Jitsi widgets will mean that the user is in the call, so we use that to determine if they are actually participating.
 2020-09-16 14:35:55 -06:00
Michael Telatynski
f4f94e31d1 UI Feature Flag: Disable integrations entry UI 2020-09-16 11:38:50 +01:00
Bruno Windels
5d98805d77 Merge branch 'develop' into bwindels/make-reply-not-overlay 2020-08-18 13:39:06 +02:00
Bruno Windels
fa1e27076d remove dupe method 2020-08-18 12:34:43 +02:00
Bruno Windels
a3ca80b206 move the reply preview one level higher so the buttons and avatar don't get centered with it 2020-07-31 18:27:07 +02:00
Bruno Windels
d24ddc415b Notify the timeline it's height has changed, so it can keep being at the bottom 
this way new messages will appear in the timeline without needing to scroll
 2020-07-31 14:02:40 +02:00
Jorik Schellekens
f64ef65f97 Use StyledRadioGroup 2020-07-28 17:13:58 +01:00
Jorik Schellekens
9cd232617d Unify composer and room header icons 2020-07-28 13:19:11 +01:00
Michael Telatynski
1c205c7704 Add buttons to composer actions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:16:31 +01:00
Michael Telatynski
653b2ff060
Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing 
Remove feature_cross_signing
 2020-06-03 10:42:13 +01:00
Michael Telatynski
3020e395c1 iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 13:48:08 +01:00
Michael Telatynski
f40cfe4a3b Implement new design with new iconography 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 15:00:27 +01:00
Michael Telatynski
ccd0c952e3 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer 
 Conflicts:
	src/components/views/rooms/MessageComposer.js
 2020-05-29 14:53:42 +01:00
Michael Telatynski
2b432b0d82 Remove feature_cross_signing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 10:28:25 +01:00
Jorik Schellekens
323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui 2020-05-19 18:03:44 +01:00
Travis Ralston
798e7a1f86 Merge branch 'develop' into travis/dispatcher-types 2020-05-15 09:56:02 -06:00
Travis Ralston
90a898d03f Move dispatcher into a subdirectory 
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
 2020-05-13 21:07:50 -06:00
Michael Telatynski
d11923e2e3 Add new keyboard shortcuts for jump to unread and upload file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-13 10:38:32 +01:00
Jorik Schellekens
07c2d0cb02 Composer reply previews have group layout 2020-05-07 14:04:34 +01:00
Travis Ralston
b4e2daaf46 Convert cross-signing feature flag to setting 
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
 2020-04-15 13:18:42 -06:00
J. Ryan Stinnett
59b1cbd4b2 Add default on config setting to control call button in composer 
This adds a default on setting that can be used to control whether call buttons
are shown in the composer via `settingDefaults` in config.json. No UI is added
to control it for now.

Fixes https://github.com/vector-im/riot-web/issues/12758
 2020-03-17 11:33:10 +00:00
Michael Telatynski
3308152439 Fix a couple of React warnings/errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-23 14:10:41 +00:00