Michael Telatynski
1ffbaee560
update style of imports in all modified files
2021-05-26 14:14:55 +01:00
Michael Telatynski
d8acc0612a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
...
Conflicts:
src/components/views/rooms/EditMessageComposer.js
src/components/views/rooms/SendMessageComposer.js
2021-05-24 21:57:38 +01:00
Travis Ralston
14f1388522
Merge pull request #5830 from SimonBrandner/fix-trailing-colon
...
Fix inserting trailing colon after mention/pill
2021-04-28 09:51:50 -06:00
Travis Ralston
fedb5b9f63
Fix disabled state of the composer
2021-04-14 20:12:10 -06:00
Michael Telatynski
86b6fc3473
delint
2021-04-13 15:15:11 +01:00
Michael Telatynski
4af7935e35
fix typos
2021-04-13 15:12:32 +01:00
Michael Telatynski
5f59e39958
Apply the same to quoting & inserting of emoji then consolidate
2021-04-13 15:09:37 +01:00
Michael Telatynski
ace3a62bac
Allow click inserting mentions into the edit composer too
2021-04-13 14:52:26 +01:00
Šimon Brandner
715fff6f0c
Redo and fix trailing characters in user pills
...
This removes the handling of trailing chars from createMentionParts as we need to determine whether or not to insert the trailing char differently in different situations
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-07 11:52:07 +02:00
Šimon Brandner
c2b66d0dbe
Fix inserting trailing colon after mention/pill
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-06 14:29:20 +02:00
J. Ryan Stinnett
33e8edb3d5
Merge pull request #5720 from czeidler/key-bindings
...
Decouple key bindings from event handling
2021-03-26 15:14:38 +00:00
Panagiotis
97c7f3753b
fix: save editor state when reply is open
2021-03-25 20:58:39 +02:00
Travis Ralston
da7d31aeb6
Merge pull request #5686 from robintown/reply-commands
...
Support replying with a message command
2021-03-24 09:56:56 -06:00
Travis Ralston
b5d32d92f3
Wire up a simple record button
2021-03-16 22:58:44 -06:00
Clemens Zeidler
2a21d45ac0
Merge branch 'develop' into key-bindings
2021-03-12 16:44:12 +13:00
Travis Ralston
c5935dbc61
Batch of views getting replaceableComponent decorators
2021-03-08 20:23:46 -07:00
Clemens Zeidler
efc5d413c4
Fix missing import (from earlier merge conflict)
2021-03-05 22:13:47 +13:00
Clemens Zeidler
4a6f931782
Merge branch 'develop' into key-bindings
2021-03-04 21:10:35 +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
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
Šimon Brandner
361420bf68
Use scrollToBottomOnMessageSent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 18:37:30 +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
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
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
b4c5dec4e5
Use the KeyBindingsManager for the SendMessageComposer
2021-02-14 15:56:55 +13: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
17f09d3b7a
Added onIsEmptyChanged prop
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:16:07 +01:00
Šimon Brandner
69e81119e9
Don't jump to bottom on reaction
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 15:15:20 +01:00
Šimon Brandner
4f065ad822
Fix escape for cancelling replies
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-29 10:31:59 +01:00
J. Ryan Stinnett
70f24baaf1
Merge pull request #5425 from macekj/emoji_quick_shortcut
...
Add keyboard shortcut for emoji reactions
2020-12-14 13:12:49 +00:00
Travis Ralston
550a5220d9
Undocumented linter cleanup
2020-12-07 15:12:26 -07:00
macekj
0c85cb587d
Merge branch 'develop' into emoji_quick_shortcut
2020-12-04 11:05:50 -05:00
macekj
27a853c586
use textSerialize function to get model text
2020-12-02 15:01:44 -05:00
nurjinn jafar
6ce5d3b044
refactored effects dir and changed effects exported name
2020-11-27 16:32:04 +01:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676
2020-11-26 18:21:28 +01:00
czeidler
063b26835e
Fix coding style
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2020-11-20 19:02:52 +13:00
Clemens Zeidler
1346416d20
Merge branch 'develop' into ctrl-enter-send
2020-11-19 19:40:38 +13:00
macekj
ba8d02a808
add quick shortcut emoji feature and tests
...
Signed-off-by: macekj <macekj@umich.edu>
2020-11-17 17:36:58 -05:00
Michael Telatynski
cfb9d0f2d4
Disallow sending of empty messages
2020-11-03 16:06:45 +00:00
Michael Telatynski
c3a355097d
Initial Countly work
2020-10-29 15:57:16 +00:00
Steffen Kolmer
d4ec1dd775
Refactoring
2020-10-21 13:56:58 +02:00
nurjinn jafar
1c6d28b861
refactoring roomView / slashCommands / SendMessageComposer with the new effects configurations and fix confetti animation timeout
2020-10-21 13:37:36 +02:00
Steffen Kolmer
607e33feba
Extensibility, TypeScript and lazy loading
2020-10-19 21:25:01 +02:00
Steffen Kolmer
c86964cd5e
Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676
2020-10-19 13:15:33 +02:00
Michael Telatynski
017d2d40fe
Update CIDER local and session storage keys to unbrick downgrade compat
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-08 09:51:31 +01:00
Michael Telatynski
ab518a469f
Replace MatrixClientPeg with access to context in SendMessageComposer
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:09:09 +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
