Commit Graph

8658 Commits (9a72e69a43b092ff4425934cfe10fb1e291500be)

Author SHA1 Message Date
Luke Barnard c8ccbed0b1
Merge pull request #1751 from matrix-org/luke/dnd-group-view-tag-panel
Implement GroupTile avatar dragging to TagPanel
2018-02-15 11:05:28 +00:00
Luke Barnard 3948ee8ca1 Give each GroupTile avatar its own droppable
so that they can be dragged and dropped
without interacting with each other, as
they would do if GroupView contained
one droppable to contain them all.
2018-02-14 17:53:54 +00:00
Luke Barnard 389d96bc46 Use optimistic removedTagsAccountData state in TagOrderStore
when receiving TagOrderActions.moveTag.pending, which now exposes
this state.
2018-02-14 16:47:29 +00:00
Luke Barnard 3850b552a5 Make GroupTile avatar draggable 2018-02-14 16:46:06 +00:00
Luke Barnard 74c8a74e7d Add Droppable to GroupView
to contain the GroupTiles as Draggables
2018-02-14 16:43:01 +00:00
Luke Barnard b626420eb9 Move DND context to LoggedInView
so that we can drag things from any part of the logged in app to
another. (Specifically GroupView and TagPanel).
2018-02-14 16:40:58 +00:00
Luke Barnard db4f0cb0bf Handle adding previously removed tags 2018-02-14 16:40:24 +00:00
David Baker ca763faf96
Merge pull request #1750 from matrix-org/luke/fix-room-list-custom-tag-ordering2
Fix custom tags not being ordered manually
2018-02-14 11:40:59 +00:00
David Baker 46b8fb9a19
Merge pull request #1746 from matrix-org/luke/fix-room-settings-resets
Store component state for editors
2018-02-14 11:33:48 +00:00
Luke Barnard 3020c8cd94 Fix custom tags not being ordered manually
Actually fixes vector-im/riot-web#6135 unlike #1748, which
incorrectly assumed that custom tags would be included in
listOrders.

This fix makes sure that the `default` case in the `switch`
is actually used.
2018-02-14 11:23:29 +00:00
Luke Barnard 47c232b5b3 Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first 2018-02-14 11:00:27 +00:00
David Baker 7cc82a682c
Merge pull request #1745 from matrix-org/luke/fix-login-page-feedback
Give the login page its spinner back
2018-02-14 10:31:36 +00:00
Luke Barnard c670b76ec8
Merge pull request #1743 from matrix-org/luke/feature-tag-panel-tile-context-menu
Add context menu to TagTile
2018-02-13 17:28:43 +00:00
Luke Barnard a34fea8af8 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu 2018-02-13 16:51:00 +00:00
Luke Barnard e0d598fb19
Merge pull request #1748 from matrix-org/luke/fix-manually-ordered-custom-tagged-rooms
If a tag is unrecognised, assume manual ordering
2018-02-13 16:15:49 +00:00
Luke Barnard f16bc93fee If a tag is unrecognised, assume manual ordering
(as we did previously)

Fixes https://github.com/vector-im/riot-web/issues/6135
2018-02-13 16:09:17 +00:00
Luke Barnard 5af560f625 Make removedTags a Set for perf 2018-02-13 14:43:34 +00:00
David Baker a0aa3df893
Merge pull request #1719 from matrix-org/luke/room-list-flux
Move RoomList state to RoomListStore
2018-02-13 14:18:46 +00:00
Luke Barnard 36e8bf1f20 Change CSS class for message panel spinner
to stop scrollbars appearing when we
 - jump to a message or,
 - permalink that is to an not paginated in event
2018-02-13 14:13:47 +00:00
Luke Barnard 8377abcd19 Store component state for editors
to prevent a forceUpdate from /sync causing the editors to revert
before the user had a chance to hit "Save".

Part of fixing https://github.com/vector-im/riot-web/issues/6019
2018-02-13 12:01:36 +00:00
Luke Barnard 493116b17e Give the login page its spinner back 2018-02-13 11:43:22 +00:00
Luke Barnard db0ea9eb0e Merge branch 'develop' into luke/room-list-flux 2018-02-13 10:18:24 +00:00
David Baker 03921bad79
Merge pull request #1744 from matrix-org/luke/move-groups-button-tp
Move groups button to TagPanel
2018-02-13 11:00:49 +01:00
Luke Barnard 6d3634a06c Move groups button to TagPanel 2018-02-13 09:44:00 +00:00
Luke Barnard 322012cf88 Add comment to explain hacky optimism 2018-02-12 18:46:36 +00:00
Luke Barnard 3eeef064bf Remove unused asyncId 2018-02-12 18:37:54 +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
David Baker b4aa9f37f6
Merge pull request #1738 from tulir/timestamp-hover-seconds
Add seconds to timestamp on hover
2018-02-12 11:23:08 +01:00
Matthew Hodgson 40cee9bb02
Merge pull request #1739 from matrix-org/luke/fix-autocomplete-truncated-users
Do not truncate autocompleted users in composer
2018-02-10 18:38:43 +00:00
David Baker 100a5ba96a Merge branch 'master' into develop 2018-02-09 12:34:44 +00:00
David Baker 4bf5e44b20 v0.11.4 2018-02-09 12:34:00 +00:00
David Baker e9e0d65401 Prepare changelog for v0.11.4 2018-02-09 12:33:59 +00:00
David Baker 3d174b0207 Merge branch 'release-v0.11.4' into develop 2018-02-09 12:24:36 +00:00
David Baker 3e4175f3e0 Add isUrlPermitted function 2018-02-09 12:20:05 +00:00
Luke Barnard c5da1015fe Do not truncate autocompleted users in composer
so that disambiguation is possible at a glance.

Fixes https://github.com/vector-im/riot-web/issues/6024
2018-02-08 17:47:36 +00:00
lukebarnard 9b0df19149 Make RoomListStore aware of sub list orderings
so that it can do optimistic updates of ordered lists.
2018-02-08 16:20:37 +00:00
Luke Barnard 21d70125e4 Dispatch MatrixActions synchronously
Otherwise we risk blocking the dispatches on other work, and they
do not need to be done asynchronously.

This emerged as a bug where the room list appeared empty until
MatrixActions.sync dispatches all occured in one big lump, well
after the sync events being emitted by the js-sdk.
2018-02-08 16:17:26 +00:00
Tulir Asokan 7a594ce08d Add seconds to formatFullDate()
Fixes vector-im/riot-web#6055

Signed-off-by: Tulir Asokan <tulir@maunium.net>
2018-02-08 18:09:04 +02:00
Luke Barnard 754b7fbad5
Merge pull request #1737 from matrix-org/rav/roomview_unmounted
RoomView: guard against unmounting during peeking
2018-02-08 10:31:12 +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 383ef8b2ef
Merge pull request #1731 from matrix-org/dbkr/rate_limited_func_time_from_finish
Make ratelimitedfunc time from the function's end
2018-02-07 10:16:36 +00:00
David Baker 0a5bf07913 Use getComponent 2018-02-07 10:13:19 +00:00
Luke Barnard b4896dc108
Merge pull request #1735 from matrix-org/luke/dialog-matrix-context
Give dialogs a matrixClient context
2018-02-07 09:54:31 +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