Commit Graph

4526 Commits (a34fea8af8dbd5cf46965903a054a3acbda9f18c)

Author SHA1 Message Date
Luke Barnard a34fea8af8 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu 2018-02-13 16:51:00 +00:00
Luke Barnard db0ea9eb0e Merge branch 'develop' into luke/room-list-flux 2018-02-13 10:18:24 +00:00
Luke Barnard 6d3634a06c Move groups button to TagPanel 2018-02-13 09:44:00 +00:00
Luke Barnard 7a4c1994c3 Use Boolean() instead of assuming filter is based on truthiness 2018-02-12 18:35:13 +00:00
Luke Barnard e3f68f12c8 Add context menu to TagTile
With two options: View Community and Remove, which
removes the tag from the panel.
2018-02-12 18:01:08 +00:00
Richard van der Hoff 5823b32ab1
RoomView: guard against unmounting during peeking
it's possible for the user to change room before the peek operation completes. Check if we've been unmounted before setting state.
2018-02-08 10:01:24 +00:00
David Baker d51f6ceea2
Merge pull request #1736 from matrix-org/luke/fix-hs-is-urls-reset
Fix HS/IS URL reset when switching to Registration
2018-02-07 16:09:43 +00:00
lukebarnard 45ad46b468 Fix HS/IS URL reset when switching to Registration 2018-02-07 15:58:29 +00:00
Luke Barnard 9da708335a
Merge pull request #1734 from matrix-org/dbkr/fix_call_buttons_canary_2
Fix the reject/accept call buttons in canary (mk2)
2018-02-07 12:04:34 +00:00
David Baker 8eb4137ec3 missing semicolon 2018-02-07 11:51:41 +00:00
David Baker 2a68e3ea39 import sdk 2018-02-07 11:42:50 +00:00
David Baker 0a5bf07913 Use getComponent 2018-02-07 10:13:19 +00:00
lukebarnard c1649d1b75 Give dialogs a matrixClient context
Dialogs are mounted outside of the main react tree of MatrixChat,
so they won't have its child context.
2018-02-07 09:45:36 +00:00
David Baker 424c367ecc Fix the reject/accept call buttons in canary (mk2)
Fixes https://github.com/vector-im/riot-web/issues/6081 by making
the accept/reject buttons AccessibleButtons which they should be
anyway (presumably the role=button makes chrome do the right thing
with the events). Also swallow the onClick event otherwise that
propagates out to the room header and causes it to expand/collapse.
2018-02-06 18:45:43 +00:00
Luke Barnard cf4ae681f4
Offline mode (#1723)
* Allow the client to run without connection to HS (i.e. using indexeddb)

Allows running without having pushRules (it's safe not to have these 
when running from indexeddb sync.)

This means rooms will be displayed with "unknown" notifcation state.

This assumes anything that uses the push rules will get pushRule state
again when the client starts syncing again.

For recovering from being disconnected, 
* If an avatar has fallen back, try again on reconnection
* If a thumbnail image failed to load, retry on reconnect
* Load joined groups when reconnecting

Update tests to give MELS a context.matrixClient
2018-02-06 17:50:53 +00:00
David Baker 6162c0b360 Fix key bindings in address picker dialog
Another regression from https://github.com/matrix-org/matrix-react-sdk/pull/1674

Fixes https://github.com/vector-im/riot-web/issues/5994
2018-02-06 15:01:14 +00:00
lukebarnard feca1707f1 Remove a factor n complexity during room visibility calc 2018-02-06 09:55:58 +00:00
Luke Barnard 71aa4ee9e1
Merge pull request #1721 from matrix-org/t3chguy/composer_slashcmd_history
Persist contentState when sending SlashCommand via MessageComposerInput
2018-02-06 09:14:36 +00:00
lukebarnard 415da3e6ab Merge branch 'develop' into luke/room-list-flux 2018-02-05 17:57:46 +00:00
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
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
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