Richard Lewis
b109c9304c
Put stickers behind labs flag.
2018-04-02 22:24:46 +01:00
Richard Lewis
7f91b47598
Move sticker picker icon.
2018-03-07 11:52:42 +00:00
Richard Lewis
e249e3d622
Correct stickerpicker naming,
2018-02-25 22:10:38 +00:00
Richard Lewis
b2bf4d4709
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot
2018-02-23 15:37:33 +00:00
Richard Lewis
38ed01bebd
Pass room to stickerpack
2018-01-16 21:35:25 +00:00
Richard Lewis
86542d86e9
Move stickers into stand-alone component.
2018-01-16 18:14:32 +00:00
Richard Lewis
87d8ed5af8
Add comment
2018-01-16 17:01:25 +00:00
Richard Lewis
82b9897986
Select apropriate theme colour for popover.
2018-01-15 18:27:14 +00:00
Richard Lewis
5a9a4ead96
Remove arrow opacity.
2018-01-15 14:25:56 +00:00
Richard Lewis
5e6da4d758
* Fix key error
...
* Remove redundant logging
* Catch error
2018-01-15 14:22:41 +00:00
Richard Lewis
0fab905a2e
Cleanup styles.
2018-01-15 11:16:07 +00:00
Richard Lewis
351bbdfd4e
Styling
2018-01-15 10:25:19 +00:00
Richard Lewis
a3c6dd36ef
Stickers popover.
2018-01-12 17:38:21 +00:00
Richard Lewis
90b7cb3760
Consistent popover size
2018-01-11 13:41:55 +00:00
Richard Lewis
1ab71f6f50
Load stickers in AppTile
2018-01-11 13:20:58 +00:00
Richard Lewis
78bd25eff0
Sticker popover styling
2018-01-11 11:36:19 +00:00
Richard Lewis
2cf9da8c95
Load user stickerpacks
2018-01-11 11:12:46 +00:00
Richard Lewis
52f28d09e0
Stickerpack styling
2018-01-10 20:44:14 +00:00
Richard Lewis
2bb51bafe1
Content placeholder.
2018-01-10 20:29:36 +00:00
Richard Lewis
53b590f55e
Add stickers popover.
2018-01-10 20:27:43 +00:00
Michael Telatynski
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
Michael Telatynski
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
Richard Lewis
9abb160120
Replace apps button with stickers button in message composer.
2018-01-09 16:02:17 +00:00
Aidan Gauland
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
Michael Telatynski
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
Luke Barnard
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
Travis Ralston
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
Travis Ralston
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
Travis Ralston
ae10a11ac4
Convert synced settings to granular settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:43:52 -06:00
Travis Ralston
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
Luke Barnard
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
Travis Ralston
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
e50478aa1d
enable/disable features in config.json
...
As per https://docs.google.com/document/d/1Kn-mz2dDce9Cqc4oUTl5yJXGvmTlky1_KezuwUg58x0/edit#
Replaces:
* enableLabs setting
* 'override' flag in labs
* 'default' flag in labs
Un-feature-flags matrix apps since this was now overidden to be
enabled.
2017-10-12 17:03:38 +01:00
Luke Barnard
d3f9a3aeb5
Run eslint --fix
...
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
2017-10-11 17:56:17 +01:00
Richard Lewis
454ec40b00
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-11 10:35:20 +01:00
Richard Lewis
1973b2bbe7
Switch app drawer icons
2017-08-05 00:00:19 +01:00
Michael Telatynski
bf98c0da7c
un-i18n Modal Analytics
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-27 17:19:18 +01:00
David Baker
2a68cce3d5
Merge pull request #1216 from matrix-org/dbkr/history_save_unload_nullcheck
...
Prevent exception on page unload
2017-07-13 12:38:28 +01:00
David Baker
917133219f
Remove sentHistory save altogether
2017-07-13 11:53:22 +01:00
David Baker
1e80edb43c
Prevent exception on page unload
...
Null check when saving sent history
2017-07-13 11:30:25 +01:00
Luke Barnard
04dd98e6e9
Remove references to tabComplete, which are now redundant
...
(since the old composer has been removed)
2017-07-13 10:16:59 +01:00
Luke Barnard
b104228a7b
Remove redundant functions, bindings, props
2017-07-10 14:27:41 +01:00
Luke Barnard
c9df079464
Merge pull request #1176 from matrix-org/luke/feature-enable-RTE
...
Take RTE out of labs! 🎉
2017-07-10 13:56:00 +01:00
Michael Telatynski
fcd8321a63
Allow underline through MD and in RTE (MD) using <u> which works with CM
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-06 13:49:13 +01:00
Luke Barnard
77348e6201
Remove spurious, unused code
2017-07-04 15:20:00 +01:00
Luke Barnard
e3f2eb5232
Take RTE out of labs! 🎉
...
This stops react-sdk from tracking any state previously stored for the purposes of enabling or disabling the lab feature that enabled the new MessageComposer. It is now enabled permanently.
This is being done with the hope that we can get more feedback for it so that when we release we can be confident that people will be OK with the changes it brings.
2017-07-04 14:44:55 +01:00
Richard Lewis
3a10cda2ca
Add translations.
2017-06-28 13:55:18 +01:00
Richard Lewis
3872f0750c
Only show apps button if labs feature enabled.
2017-06-27 17:40:28 +01:00
Richard Lewis
63b1250385
Add comment
2017-06-27 11:39:20 +01:00
Richard Lewis
1f1352786f
Temporarily disable Jitsi default
2017-06-27 11:38:14 +01:00
