2c1ba6f104
Merge pull request #2124 from matrix-org/dbkr/tombstone
...
Support m.room.tombstone events
2018-08-29 18:38:48 +01:00
37e60e4fc4
wait for members loading to finish to show the avatar in the composer
2018-08-23 00:02:20 +02:00
7f8cd203a8
Support m.room.tombstone events
...
For https://github.com/vector-im/riot-web/issues/7164
2018-08-21 15:56:56 +01:00
8d4cead105
special-case 'inline-code' button because mark is called 'code'
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-17 13:24:28 +01:00
95909de446
fix MessageComposer not marking translatable strings. run gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 11:39:55 +01:00
efdc5430d7
merge develop
2018-07-09 17:50:07 +01:00
8cf17a66e5
Very basic Jitsi integration
...
Replaces the conference calling by adding a Jitsi widget. No support
for continuing the call on room change currently, so hidden behind
a feature flag. Existing behaviour is preserved by default.
2018-06-15 15:12:32 +01:00
864a33f978
switch to using 'code' for both blocks & marks to match md-serializer
2018-05-23 20:12:13 +01:00
e460cf35e0
hide formatting bar for MD editor
2018-05-20 22:48:40 +01:00
f981d7b729
unify buttons on the node type names, and make them work
2018-05-20 22:39:40 +01:00
d799b7e424
refactor roundtripping into a single place
...
and fix isRichTextEnabled to be correctly camelCased everywhere...
2018-05-20 16:30:39 +01:00
7405b49b44
unify setState() and onChange()
...
also make emoji autocomplete work again
also remove the onInputContentChanged prop
also slateify the onInputStateChanged prop
2018-05-13 23:34:00 +01:00
0a326dc6a0
Take feature_sticker_messagse out of labs
2018-05-09 17:28:29 +01:00
e10e659457
Take feature_sticker_messagse out of labs
2018-05-09 14:59:35 +01:00
8b1e411d6b
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to
2018-04-13 10:54:09 +01:00
fe2cbc584d
Merge branch 'develop' into travis/remove-presence
2018-04-11 15:17:28 -06:00
9df2f7ddc8
Add warning to Upload Confirm prompt if replying, as can't reply with file
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 11:19:13 +01:00
b109c9304c
Put stickers behind labs flag.
2018-04-02 22:24:46 +01:00
7f91b47598
Move sticker picker icon.
2018-03-07 11:52:42 +00:00
e249e3d622
Correct stickerpicker naming,
2018-02-25 22:10:38 +00:00
b2bf4d4709
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-02-23 15:37:33 +00:00
38ed01bebd
Pass room to stickerpack
2018-01-16 21:35:25 +00:00
86542d86e9
Move stickers into stand-alone component.
2018-01-16 18:14:32 +00:00
87d8ed5af8
Add comment
2018-01-16 17:01:25 +00:00
82b9897986
Select apropriate theme colour for popover.
2018-01-15 18:27:14 +00:00
5a9a4ead96
Remove arrow opacity.
2018-01-15 14:25:56 +00:00
5e6da4d758
* Fix key error
...
* Remove redundant logging
* Catch error
2018-01-15 14:22:41 +00:00
0fab905a2e
Cleanup styles.
2018-01-15 11:16:07 +00:00
351bbdfd4e
Styling
2018-01-15 10:25:19 +00:00
a3c6dd36ef
Stickers popover.
2018-01-12 17:38:21 +00:00
90b7cb3760
Consistent popover size
2018-01-11 13:41:55 +00:00
1ab71f6f50
Load stickers in AppTile
2018-01-11 13:20:58 +00:00
78bd25eff0
Sticker popover styling
2018-01-11 11:36:19 +00:00
2cf9da8c95
Load user stickerpacks
2018-01-11 11:12:46 +00:00
52f28d09e0
Stickerpack styling
2018-01-10 20:44:14 +00:00
2bb51bafe1
Content placeholder.
2018-01-10 20:29:36 +00:00
53b590f55e
Add stickers popover.
2018-01-10 20:27:43 +00:00
94167e2b8b
Run gen-i18n.js and embed the ellipsis into the base string
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:52:20 +00:00
1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/views/messages/TextualBody.js
2018-01-10 11:54:58 +00:00
9abb160120
Replace apps button with stickers button in message composer.
2018-01-09 16:02:17 +00:00
35780f5ae0
Remove use of deprecated React.PropTypes
...
Replace all uses of React.PropTypes with PropTypes and importing PropTypes from
'prop-types'.
2017-12-26 14:03:18 +13:00
cc5eb77658
Remove presence management
...
The feature is incredibly buggy and doesn't work as expected due to server behaviour and client interaction. One of the major problems is the constantly confused presence state - this is caused by the mobile apps conflicting on the state of the web app, causing it to consider the user offline or online (and rarely away) depending on how riot-android/ios is behaving at the time.
This reverts two PRs:
* https://github.com/matrix-org/matrix-react-sdk/pull/1620
* https://github.com/matrix-org/matrix-react-sdk/pull/1482
The changes to the context menu positioning were not reverted as they are useful outside of presence management.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-25 14:25:13 -07:00
05434e782a
change Composer placeholder text based on replying/rich quoting state
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-18 19:49:38 +00:00
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
8282534f87
Add SettingsLevel enum; Move settings to own file.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 23:19:45 -06:00
ae10a11ac4
Convert synced settings to granular settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:43:52 -06:00
e773585a02
Merge remote-tracking branch 'matrix-org/develop' into travis/presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:21:39 -06:00
b1f2a6c1e9
Dramatically simplify use of mx_fadable
...
by applying it to parent elements of things that need to be faded.
2017-10-25 15:15:49 +01:00
6cd07731c4
Add MemberPresenceAvatar and control presence ourselves
...
Includes rudimentary support for custom statuses and user-controlled status. Some minor tweaks have also been made to better control how we advertise our presence.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 14:37:47 -06:00
David Baker