Luke Barnard
|
70afce73a7
|
Merge pull request #1726 from matrix-org/t3chguy/fix_usercontent_pointer
This is actually MFileBody not MImageBody, change classname
|
2018-02-05 14:27:17 +00:00 |
|
Richard Lewis
|
992c4771f4
|
Add button to remove all stickerpacks
|
2018-02-05 11:49:44 +00:00 |
|
Luke Barnard
|
ff8fcb3139
|
Merge branch 'develop' into luke/room-list-flux
|
2018-02-05 11:39:39 +00:00 |
|
David Baker
|
ec3a37d9f3
|
Merge pull request #1729 from matrix-org/t3chguy/aliases_null_guard
guard against m.room.aliases events with no keys (redaction?)
|
2018-02-05 10:21:05 +00:00 |
|
David Baker
|
3275a56013
|
Merge pull request #1718 from matrix-org/t3chguy/fix_memberlist_3pid_invites
Fix not showing Invited section if all invites are 3PID
|
2018-02-05 10:14:23 +00:00 |
|
David Baker
|
916ab68506
|
Merge pull request #1720 from matrix-org/t3chguy/nvl/fix_rich_reply_on_image
Fix Rich Replies on files
|
2018-02-05 09:58:37 +00:00 |
|
Michael Telatynski
|
d1a24ac87b
|
guard against m.room.aliases events with no keys (redaction?)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-02-02 08:12:56 +00:00 |
|
David Baker
|
4c17b5f1c7
|
Merge pull request #1724 from matrix-org/t3chguy/nvl/rich_quoting_nullguard
Null guard against falsey (non-null) props.node, to make react happy
|
2018-01-31 18:10:52 +00:00 |
|
Michael Telatynski
|
8a6727ea98
|
This is actually MFileBody not MImageBody, change classname
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-30 10:55:23 +00:00 |
|
lukebarnard
|
c5a3a02e1d
|
Fix order calculation logic when reordering a room
|
2018-01-30 10:14:05 +00:00 |
|
Michael Telatynski
|
6dd63ae644
|
Null guard against falsey (non-null) props.node, to make react happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-29 19:17:46 +00:00 |
|
Michael Telatynski
|
5764280588
|
Persist contentState when sending SlashCommand via MessageComposerInput
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-29 09:09:22 +00:00 |
|
Michael Telatynski
|
56927b23e6
|
pass onWidgetLoad (which is required for SOME EventTileTypes)
XXX: they should follow an interface, this is somewhat nasty
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-28 22:14:22 +00:00 |
|
lukebarnard
|
73e3a594ac
|
Prevent TagTiles from being dragged into other droppables
for the time being at least.
|
2018-01-25 22:52:19 +01:00 |
|
lukebarnard
|
701abb6a21
|
Move management of room lists to RoomListStore
this is part maintenance to make RoomList clearer and part
allowing room list state to be modified via a dispatch.
|
2018-01-25 22:16:03 +01:00 |
|
lukebarnard
|
d0e3319bd9
|
Remove DragDropContext from TagPanel and RoomList
So that we can have one context that can handle DND between
the TagPanel and RoomList.
|
2018-01-25 22:05:20 +01:00 |
|
lukebarnard
|
815f52587b
|
Move TagPanel out of LoggedInView
(...and into LeftPanel in riot-web. Can we merge the projects yet?)
|
2018-01-25 21:53:34 +01:00 |
|
Michael Telatynski
|
56bd4b7d06
|
Fix not showing Invited section if all invites are 3PID
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-25 12:18:02 +00:00 |
|
David Baker
|
ebfdd7c718
|
Merge pull request #1715 from matrix-org/t3chguy/rich_quoting_linear
Linear Rich Quoting
|
2018-01-24 18:53:29 +01:00 |
|
Michael Telatynski
|
e3e3535072
|
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-22 17:02:20 +00:00 |
|
Michael Telatynski
|
4490715b60
|
Merge branch 'develop' into t3chguy/rich_quoting_linear
|
2018-01-22 16:46:20 +00:00 |
|
Michael Telatynski
|
a6cefb83f8
|
basic error handling for malformed quotes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-22 16:41:32 +00:00 |
|
Michael Telatynski
|
3b1d69edbb
|
Change Quotes to be linearly rendered rather than recursively nested
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-22 16:34:47 +00:00 |
|
Michael Telatynski
|
33995b053e
|
Add class to EventTile Line's that are quotes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-22 16:34:14 +00:00 |
|
Richard Lewis
|
0441487e97
|
Manage sticker packs link and add comments
|
2018-01-22 17:00:50 +01:00 |
|
Michael Telatynski
|
61b3d050ab
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/group_create_dialog_fixes
|
2018-01-20 13:39:57 +00:00 |
|
Michael Telatynski
|
2705397bf6
|
Add local GID==='' check, because Synapse says Group rather than Community
Reset createError when doing check because it is now stale
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-20 13:16:33 +00:00 |
|
Will Hunt
|
5206c9d18b
|
Show a warning if the user attempts to leave a room that is invite only
|
2018-01-19 22:52:43 +00:00 |
|
Luke Barnard
|
a8320fe7e2
|
Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd
Swap RoomList to react-beautiful-dnd
|
2018-01-19 14:49:49 +00:00 |
|
lukebarnard
|
6106b3ce44
|
newOrder defaults null, allows check for newOrder on line 357
|
2018-01-19 14:12:27 +00:00 |
|
lukebarnard
|
54f6d305d7
|
Null-guard for newTag
|
2018-01-19 14:11:05 +00:00 |
|
lukebarnard
|
75a1922731
|
Fix linting
|
2018-01-19 14:07:13 +00:00 |
|
lukebarnard
|
00dc077271
|
Remove react-dnd, revert fa14bc9 as no longer needed
|
2018-01-19 13:34:56 +00:00 |
|
Matthew Hodgson
|
6c15bd8599
|
fix NPE when getGroupProfiles returns null
|
2018-01-19 10:39:38 +00:00 |
|
lukebarnard
|
6f0d799912
|
Fix indentation
|
2018-01-18 18:15:34 +00:00 |
|
lukebarnard
|
59f4661bfd
|
Add comment
|
2018-01-18 18:01:31 +00:00 |
|
lukebarnard
|
dfecad181a
|
Swap RoomList to react-beautiful-dnd
|
2018-01-18 17:59:29 +00:00 |
|
Richard Lewis
|
23bef68a8f
|
Fix duplicate message listeners
|
2018-01-18 13:16:06 +00:00 |
|
Richard Lewis
|
910623d287
|
Close context menu on resize.
|
2018-01-18 12:04:00 +00:00 |
|
Richard Lewis
|
917d85d603
|
Refer rest parameters
|
2018-01-18 12:03:24 +00:00 |
|
Richard Lewis
|
1293c53c4b
|
Cleanup
|
2018-01-18 12:02:45 +00:00 |
|
Matthew Hodgson
|
80d3edfbb3
|
simplify the 'send anyway' text, as 'mark devices known' is meaningless to users
|
2018-01-18 09:57:29 +00:00 |
|
Matthew Hodgson
|
d3292d9388
|
fix typos and NPE. fixes #5999
|
2018-01-17 23:28:14 +00:00 |
|
Richard Lewis
|
f8d7ab10fa
|
Handle non-m.room.message event types.
|
2018-01-17 17:19:20 +00:00 |
|
Richard Lewis
|
b6f85fbf92
|
Don't treat sticker messages as info messages.
|
2018-01-17 16:52:10 +00:00 |
|
Richard Lewis
|
aa524c339d
|
Update class names.
|
2018-01-17 15:49:36 +00:00 |
|
Richard Lewis
|
fa336b7a99
|
Bring hide stickers icon to front when menu open.
|
2018-01-17 15:41:15 +00:00 |
|
Richard Lewis
|
5a4271268b
|
Keep reference to stickers menu
|
2018-01-17 15:40:47 +00:00 |
|
Richard Lewis
|
3331c8af27
|
Use dispatcher ref for unregister call.
|
2018-01-17 15:40:04 +00:00 |
|
Richard Lewis
|
614a10c6d3
|
Add manage integration link.
|
2018-01-17 00:04:06 +00:00 |
|