Richard Lewis
38ed01bebd
Pass room to stickerpack
2018-01-16 21:35:25 +00:00
Richard Lewis
7676fc0c10
Handle stickerpack close.
2018-01-16 21:28:15 +00:00
Richard Lewis
9339284090
Stickerpack content placeholder.
2018-01-16 21:06:57 +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
Richard Lewis
9abb160120
Replace apps button with stickers button in message composer.
2018-01-09 16:02:17 +00:00
Richard Lewis
5df9a01e64
Use m.room.sticker event.
2018-01-08 12:06:32 +00:00
Richard Lewis
c93266b6af
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/titleBar
2017-12-11 13:08:49 +00:00
David Baker
0d38e7510d
Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show
...
Don't Auto-show UnknownDeviceDialog
2017-12-08 16:33:25 +00:00
Richard Lewis
a9ae4be74c
Fix page title variable name.
2017-12-08 15:27:14 +00:00
Richard Lewis
20917e1a07
Set page title from widget data, if available.
2017-12-08 15:12:48 +00:00
Richard Lewis
df438924a7
Remove logging.
2017-12-07 09:57:53 +00:00
Richard Lewis
e20db416f2
Add field to bypass riot widget loading screen.
2017-12-06 16:44:41 +00:00
Luke Barnard
363fe04a10
isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent
2017-12-01 10:44:00 +00:00
Luke Barnard
fe81fcb8c6
Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
...
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
Luke Barnard
45bcb6f2ed
Implement TagPanel (or LeftLeftPanel) for group filtering
...
This allows for filtering of the RoomList by group. When a group is selected, the room list will show:
- Rooms in the group
- Direct messages with members in the group
A button at the bottom of the TagPanel allows for creating new groups, which will appear in the panel following creation.
2017-11-29 16:53:43 +00:00
David Baker
a784abd57f
Comment typo
2017-11-22 17:13:18 +00:00
Stefan Parviainen
df921438f3
Make PresenceLabel more easily translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-16 18:36:54 +01:00
David Baker
196eafdc7f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 15:59:16 +00:00
Luke Barnard
b54e563cb6
Merge branch 'develop' into luke/linting-keyword-spacing
2017-11-16 13:23:42 +00:00
Luke Barnard
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
Luke Barnard
f99755378a
Merge pull request #1612 from matrix-org/t3chguy/state_events
...
differentiate between state events and message events
2017-11-16 13:06:36 +00:00
Stefan Parviainen
2c1618bc10
Fix conflict and update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
Michael Telatynski
c0002e7778
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events
2017-11-15 16:03:07 +00:00
Michael Telatynski
5563b71c47
differentiate between state events and message events
...
so that people can't fake state event types and have them rendered.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-15 15:56:54 +00:00
David Baker
f8fc6dc83e
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-15 12:11:33 +00:00
Travis Ralston
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
Matthew Hodgson
f05958e334
Merge pull request #1482 from turt2live/travis/presence
...
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
Stefan Parviainen
df6d5cc2b4
Pass plain components, rather than functions returning them
2017-11-14 20:09:52 +01:00
Stefan Parviainen
3afbaf61e7
Refactor i18n stuff a bit
2017-11-13 20:19:33 +01:00
Travis Ralston
c5c346f0b7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:18:41 -07:00
David Baker
0659ac1ccb
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-13 17:45:57 +00:00
Luke Barnard
52af7a7659
Attempt to clarify the affect that the users_default has on power levels
...
This modifies displayed power levels such that:
- If users_default is !== 0:
- the power level 0 is displayed as "Restricted (0)"
- the power level users_default is displayed as "Default ({users_default})"
- Otherwise:
- the power level 0 is displayed as "Default (0)"
When changing users_default, to say, 10, when the textual powers are rendered
again, they will take users_default into account. So those previously at 10
and which would have previously have been rendered "Custom of 10" will now
read "Default (10)". Conversely, those that were "Default (0)" will now read
"Restricted (0)".
2017-11-13 17:03:48 +00:00
Luke Barnard
853d33a93a
Make groups a fully-fleged baked-in feature
2017-11-10 15:42:11 +00:00
David Baker
b1ec430523
Remove now-unused dispatches
2017-11-09 16:09:12 +00:00
Travis Ralston
f7da5836e1
Make blacklistUnverifiedDevices override the level order
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-08 17:41:32 -07:00
Travis Ralston
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
