mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 19:32:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
10834 commits 219 branches 562 tags 474 MiB
Commit graph

1919 commits

Author SHA1 Message Date
Michael Telatynski
a90bd6cd4f
Allow collapsing ReplyThread from MessageContextMenu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-13 12:28:58 +01:00
Michael Telatynski
8b1e411d6b
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-04-13 10:54:09 +01:00
Matthew Hodgson
40a67ca8fe point imports at the new locations 2018-04-13 00:43:44 +01:00
Michael Telatynski
c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
#	src/i18n/strings/eu.json
#	src/i18n/strings/fr.json
#	src/i18n/strings/lv.json
#	src/i18n/strings/ru.json
#	src/i18n/strings/zh_Hant.json
 2018-04-12 09:48:06 +01:00
Matthew Hodgson
8ab8f76254 move non-Riot-specific components over from riot-web 2018-04-11 23:58:04 +01:00
Travis Ralston
fe2cbc584d Merge branch 'develop' into travis/remove-presence 2018-04-11 15:17:28 -06:00
Luke Barnard
ab578a5c0c
Merge pull request #1819 from pvagner/jump_to_first_unread_a11y 
TopUnreadMessagesBar a11y
 2018-04-11 15:47:43 +01:00
Michael Telatynski
f765db7d16
only clear reply_to_event if there was one to begin with 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-07 12:18:53 +01:00
Luke Barnard
01dd494f50 Make stickers/messages continuations of each other 2018-04-06 17:47:44 +01:00
Luke Barnard
008572afe1 Revert "Handle non-m.room.message event types." 
This reverts commit f8d7ab10fa.
 2018-04-06 16:42:59 +01:00
Richard Lewis
da6c2c51fb Remove left and right menu padding 2018-04-04 13:38:48 +01:00
Michael Telatynski
9df2f7ddc8
Add warning to Upload Confirm prompt if replying, as can't reply with file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-04 11:19:13 +01:00
Michael Telatynski
1d90835de0
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/RoomView.js
 2018-04-04 11:08:34 +01:00
Michael Telatynski
9c2e3e25f0
clear reply_to_event at queue not send time 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-04 10:34:39 +01:00
Richard Lewis
f8f8bc469e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-04-03 11:34:14 +01:00
Richard Lewis
b109c9304c Put stickers behind labs flag. 2018-04-02 22:24:46 +01:00
Richard Lewis
8241afe87d Fix content references 2018-04-02 20:25:24 +01:00
Richard Lewis
49bea1a35b Move stickerpicker content out of state in to generator function. 2018-04-02 10:56:45 +01:00
Richard Lewis
d83b6f1cf8 Use AccessibleButton. 2018-04-02 10:18:35 +01:00
Peter Vágner
778ebe63ff TopUnreadMessagesBar: turn clickables into accessible buttons and fix 
over verbosity for the accessible name.
 2018-03-31 17:42:10 +02:00
Richard Lewis
557a45e890 Remove inline styling. 2018-03-29 22:22:57 +01:00
Richard Lewis
9cc3d3c9bb Move default sticker content into generator function. 2018-03-29 21:48:03 +01:00
Richard Lewis
003cf61388 Handle remove sticker picker errors. 2018-03-29 21:16:35 +01:00
Richard Lewis
6181ca642f "Stickerpack" translation. 2018-03-29 17:47:53 +01:00
Richard Lewis
c8f9586c9b Check for valid reference. 2018-03-29 17:35:21 +01:00
Richard Lewis
67f755efcb Comment. 2018-03-29 17:26:54 +01:00
Richard Lewis
e21cc14e5b Comment. 2018-03-29 17:26:19 +01:00
Richard Lewis
38c8bc7d9a Consistent function naming. 2018-03-29 17:25:07 +01:00
Michael Telatynski
fac89d9c58
Merge branch 'develop' into t3chguy/m.relates_to 2018-03-28 08:38:33 +00:00
Luke Barnard
39e9d52c04 Make sure to proxy special prop ref 2018-03-27 13:04:26 +01:00
Luke Barnard
b80568b1c5 Wrap GeminiScrollbar in a component, enabled forceGemini 
Fixes https://github.com/vector-im/riot-web/issues/6294
 2018-03-27 13:04:26 +01:00
David Baker
0a920ae801
Indenting fix 2018-03-26 13:33:47 +01:00
Michael Telatynski
b5ed08eba2
Merge 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-24 17:52:49 +00:00
Aidan Gauland
3d4feac75b Don't try to show unset display name 
In the ReadReceiptMarker title, show the display name only when it is not the
same as the user ID.
 2018-03-23 17:18:44 +13:00
Aidan Gauland
7e1913ef3c Merge branch 'develop' into show-display-name-in-receipts 2018-03-23 15:51:10 +13:00
David Baker
e06783c5c7 Fix PresenceLabel in MemberInfo 
Which crashing when clicking on a member if presence was still
enabled.
 2018-03-21 12:45:09 +00:00
Luke Barnard
856c499541 Fix room tile badge not disappearing when receiving a read receipt 
Fixes https://github.com/vector-im/riot-web/issues/6357
 2018-03-20 17:19:49 +00:00
David Baker
31b772997e Option to remove the presence feature by HS 
Adds a config option that disables showing presence for certain
HS URLs, so we can disable it on matrix.org where the feature is
turned off.
 2018-03-19 16:47:12 +00:00
Michael Telatynski
0ed3563748
clear quoting event even on send fail, as then we can click retry 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-16 00:03:50 +01:00
Luke Barnard
8672b97f9a Improve room list performance when receiving messages 
In summary this makes RoomTiles (and RoomAvatars) do more for
themselves in terms of reacting individually to state changes in
the js-sdk.

Instead of force updating the entire room list for avatar changes
and room name changes, do this in the RoomTile and RoomAvatar
instead. This increases the number of listeners listening to the
matrix client, but allows us to properly implement a
shouldComponentUpdate for RoomTile (because the avatar, name and
notification count are now in component state)
 2018-03-14 14:29:55 +00:00
Richard Lewis
b2d23b6999 Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities. 2018-03-12 13:56:02 +00:00
Michael Telatynski
14f29e4740
fix the bugs Tulir found - THANKS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-09 23:37:42 +00:00
Richard Lewis
e36ae3cede Fix context menu offset. 2018-03-08 17:33:07 +00:00
Richard Lewis
3ab8b1f866 Hide sticker picker delete button and show minimise button. 2018-03-08 17:20:42 +00:00
Luke Barnard
a1d0cf65d6 Fix missing space between "...is a" and user ID 2018-03-08 16:34:19 +00:00
Luke Barnard
5148ca1a88
Merge pull request #1791 from matrix-org/luke/e2e-request-keys-button 
E2E "fudge-button"
 2018-03-08 15:07:58 +00:00
Luke Barnard
3a3cced905 E2E "fudge-button" 
Implement a UI to expose a JS-SDK API for cancelling and resending
a room key request for an event.

This is useful in scenarios where the user has dismissed the request
on their other devices and would like to send the restart the
verification dance manually.

Depends on JS-SDK PR https://github.com/matrix-org/matrix-js-sdk/pull/624
 2018-03-08 14:13:33 +00:00
Richard Lewis
7f91b47598 Move sticker picker icon. 2018-03-07 11:52:42 +00:00
Richard Lewis
e2cedbe9d7 Pull in changes from develop 2018-03-05 16:43:59 +00:00
Luke Barnard
a95f6a9804 Implement transparent RoomTile for use in some places 
where a transparent appearance is required (i.e. in MemberInfo
or ChatCreateOrReuseDialog)
 2018-03-05 12:36:02 +00:00
Michael Telatynski
df56a67fda
Add reply fallback and run gen-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-03-04 12:39:34 +00:00
Luke Barnard
d3dc2a33b4 Fix bug preventing setting room power levels 
- don't use refs, use onChange of PowerSelector
 - store power levels as state in the RoomSetting component
 2018-02-28 16:32:20 +00:00
Luke Barnard
9a72e69a43 Handle lack of room directory visibility response 2018-02-28 16:14:18 +00:00
Luke Barnard
dd529791fb Remove unused prop 2018-02-28 16:13:01 +00:00
Richard Lewis
57c98d96a5 Update widget type. 2018-02-27 13:40:21 +00:00
Richard Lewis
ef4d13715a Wrap menu close in timeout to avoid element disappearing unexpectedly. 2018-02-27 11:29:14 +00:00
Richard Lewis
8e7564b9a3 Wrap the close menu trigger in a timeout 2018-02-26 17:47:52 +00:00
Richard Lewis
b64736aa44 Add listener to close stickerpicker. 2018-02-26 13:43:16 +00:00
Richard Lewis
e249e3d622 Correct stickerpicker naming, 2018-02-25 22:10:38 +00:00
Richard Lewis
86461bc88f Disable all widget assets on widget removal. 2018-02-24 00:10:28 +00:00
Richard Lewis
332892fee6 Pull in changes from develop 2018-02-23 17:30:42 +00:00
Matthew Hodgson
3552800d19
Merge pull request #1753 from matrix-org/luke/fix-room-list-drop-target-bg 
Give emptySubListTip a container for correct bg colour
 2018-02-23 16:36:10 +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
9b667f2c38 Reduce logging. 2018-02-23 15:26:47 +00:00
Richard Lewis
88288ff3f5 Add error handling for failure to connect to integration manager. 2018-02-23 10:20:16 +00:00
Richard Lewis
9a5c916570 Close modal on integration manager launch. 2018-02-22 15:36:01 +00:00
Richard Lewis
ce560c577f Fix link spacing 2018-02-22 15:20:51 +00:00
Michael Telatynski
665ddccb0d
restrict to m.text for now 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-20 15:45:25 +00:00
Michael Telatynski
90f9badbf3
s/Reply/ReplyThread/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-20 15:40:19 +00:00
David Baker
fd90a8b23c
Merge pull request #1756 from matrix-org/luke/fix-recent-ordering 
Make RoomListStore aware of Room.timeline events
 2018-02-20 10:17:16 +00:00
Michael Telatynski
34b427d15e
s/quote_event/reply_to_event/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-19 23:41:07 +00:00
Michael Telatynski
f1a3592eff
fix 12/24h in Reply/ReplyPreview 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:14:03 +00:00
Michael Telatynski
cb293a852d
reply and reply_preview only differ in whether they contain <Reply /> 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:07:25 +00:00
Michael Telatynski
8062494692
show replies in ReplyPreview 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 20:58:39 +00:00
Travis Ralston
cbeee72062
Don't show empty custom tags when filtering tags 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-02-16 10:11:04 -07:00
Michael Telatynski
2e3cbb309e
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-02-16 14:35:04 +00:00
Luke Barnard
94a0a90457 Make RoomListStore aware of Room.timeline events 
so that we can do reorderings of lists ordered by most recent event.

No optimisations here; we only update for timeline events
on live timelines that could update the "unread count".
 2018-02-16 14:16:50 +00:00
Luke Barnard
57419a7f8d Give emptySubListTip a container for correct bg colour 2018-02-15 14:11:45 +00:00
David Baker
ceec405519 Remove RoomListStore listener 
This caused the the RoomList component to leak (although in practice
only accross logins because that's the only time it's unmounted)
 2018-02-15 11:23:00 +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
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
db0ea9eb0e Merge branch 'develop' into luke/room-list-flux 2018-02-13 10:18:24 +00:00
Luke Barnard
7a4c1994c3 Use Boolean() instead of assuming filter is based on truthiness 2018-02-12 18:35:13 +00:00
Aidan Gauland
0fd9b3e9b2 Avoid doubling up username in read receipt view 
In the ReadReceiptMarker title, use the RoomMember.rawDisplayName because
RoomMember.name may already include the username, which we are going to add
ourselves.
 2018-02-11 16:27:07 +13:00
Aidan Gauland
97ce84c8e3 Add display name to the read receipt view 
Show the user's display name (aka nick) in the ReadReceiptMarker
title (mouseover text), and then the user ID in parentheses.
 2018-02-11 16:14:17 +13:00
Michael Telatynski
fbb950e064
mass s/Quote/Reply 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-10 12:38:25 +00:00
Michael Telatynski
1c3d8cbe6e
initial refactor of Replies to use B explicit over-the-wire format 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-10 11:19:43 +00:00
Richard Lewis
55593416fa Hide apps drawer when viewining room settings. 2018-02-09 13:23:34 +00:00
Richard Lewis
9e3c1fbc7a Pass room name. 2018-02-09 11:44:27 +00:00
Richard Lewis
234ca8b062 Remove top padding from app tile. 2018-02-08 17:50:30 +00:00
Richard Lewis
5e30468a00 Linting 2018-02-07 14:48:43 +00:00
Richard Lewis
7b75dbbd15 Use default AppTile menu bar. 2018-02-07 14:44:01 +00:00
Richard Lewis
f3943bef51 Check for empty user widgets. 2018-02-07 10:05:50 +00:00
Richard Lewis
393236ba34 Update / remove stickerpacks 2018-02-07 09:23:00 +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
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
lukebarnard
c5a3a02e1d Fix order calculation logic when reordering a room 2018-01-30 10:14:05 +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
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
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
Michael Telatynski
4490715b60
Merge branch 'develop' into t3chguy/rich_quoting_linear 2018-01-22 16:46:20 +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
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
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
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
614a10c6d3 Add manage integration link. 2018-01-17 00:04:06 +00:00
Richard Lewis
86da204169 Add manage stickerpacks link 2018-01-16 23:25:07 +00:00
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
lukebarnard
408f13f68c Only set selected tags state when updating rooms 
instead of every time we get an update from a GroupStore/otherwise.

This was leading to many setStates and renders at startup when we
receive many group /members /rooms etc. responses.

Also, use the rate limited version of refreshRoomList.
 2018-01-15 14:42:41 +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
Michael Telatynski
23bd612730
Focus composer when clicking Reply (quote event) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:29:00 +00:00
Michael Telatynski
192cba2b79
allow text&onSenderProfileClick for tileShape===quote 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:25:43 +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
e45fcf10c7
Refactor DateUtils to ES6 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:00:11 +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
Richard Lewis
5df9a01e64 Use m.room.sticker event. 2018-01-08 12:06:32 +00:00
David Baker
587a6f8e2b
Merge pull request #1687 from matrix-org/luke/perf-tag-panel-selected 
Improve performance of tag panel selection (when tags are selected)
 2018-01-05 15:55:24 +00:00
lukebarnard
8ade357349 Handle newly added rooms and removed rooms. 2018-01-05 12:33:26 +00:00
Michael Telatynski
c61d09464a
Merge pull request #1683 from matrix-org/t3chguy/memberinfo_warn_demote_self 
small refactor && warn on self-demotion
 2018-01-05 12:18:15 +00:00
Michael Telatynski
a8bd4bf858
add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:56:18 +00:00
David Baker
5aed77c752
Merge pull request #1677 from aidalgol/PropTypes 
Remove use of deprecated React.PropTypes
 2018-01-05 11:53:55 +00:00
Michael Telatynski
a473971c7b
negate for less indentation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:11:20 +00:00
lukebarnard
7606e60188 Merge branch 'develop' into luke/perf-tag-panel-selected 2018-01-05 10:26:03 +00:00
David Baker
c7accb732c
Merge pull request #1624 from matrix-org/t3chguy/room_dict_refactor 
make RoomDetailRow reusable for the Room Directory
 2018-01-04 18:26:06 +00:00
lukebarnard
f1b60287fb Merge branch 'develop' into luke/fix-get-users-rooms-for-joined-groups 2018-01-04 17:56:34 +00:00
David Baker
b34f360f96
Merge pull request #1690 from matrix-org/luke/remove-selected-room-prop 
Remove unused selectedRoom prop
 2018-01-04 17:33:36 +00:00
David Baker
5961cf3958
Merge pull request #1684 from matrix-org/luke/fix-tag-panel-shift-ctrl-click 
Fix shift and shift-ctrl click in TagPanel
 2018-01-04 17:08:01 +00:00
Michael Telatynski
831a3f7e42
Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo 2018-01-04 16:41:16 +00:00
lukebarnard
2282f5c26f Remove unused selectedRoom prop 2018-01-04 14:19:10 +00:00
lukebarnard
cdd1a57569 Calculate visible rooms when tags change 
instead of every time we getRoomLists
 2018-01-04 11:50:33 +00:00
lukebarnard
5c5307c665 Improve performance of tag panel selection (when tags are selected) 
Deselecting all tags is now slightly less performant than selecting a tag
but mostly due to the number of RoomTiles being rendered.

Swapping between different tags (a supposed common use-case) feels much
more spritely!
 2018-01-03 17:12:31 +00:00
lukebarnard
2baacfa562 Handle case where ordering is not yet known 2018-01-03 14:12:28 +00:00
lukebarnard
a2bb240dcb Fetch group data for all tags instead of those selected 
so that tag switching is not delayed by fetching group data, i.e group members and rooms.
 2018-01-03 14:07:29 +00:00
lukebarnard
85cdd888e8 Combine TagOrderStore and FilterStore 
so that shift-click semantics can work. The store that computes the shift-click
rules has to be aware of the actual order of tags displayed, so they must be done
in the same store.
 2018-01-03 11:33:59 +00:00
nostradamos
2189fe9256 removed console.log 2018-01-03 01:52:02 +01:00
nostradamos
e543f55572 refactored code 2018-01-03 01:50:03 +01:00
Michael Telatynski
f67d405732
small refactor && warn on self-demotion 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-02 23:15:36 +00:00
nostradamos
36df3acf4d Merge remote-tracking branch 'origin/develop' into fix_riot_web_4821 2018-01-02 23:07:47 +01:00
nostradamos
03f88df66e Make the scrolling compatible with our riot-web fix for https://github.com/vector-im/riot-web/issues/4821 2018-01-02 22:44:18 +01:00
lukebarnard
57fb09dfb7 Fix dodgy merge done in 874a7bf 
where develop branch should have been used for a chunk of code
 2018-01-02 19:26:56 +00:00
lukebarnard
874a7bf1de Merge branch 'develop' into luke/fix-room-list-group-store-leak 2018-01-02 16:19:37 +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
Travis Ralston
cc5eb77658 Remove presence management 
The feature is incredibly buggy and doesn't work as expected due to server behaviour and client interaction. One of the major problems is the constantly confused presence state - this is caused by the mobile apps conflicting on the state of the web app, causing it to consider the user offline or online (and rarely away) depending on how riot-android/ios is behaving at the time.

This reverts two PRs:
* https://github.com/matrix-org/matrix-react-sdk/pull/1620
* https://github.com/matrix-org/matrix-react-sdk/pull/1482

The changes to the context menu positioning were not reverted as they are useful outside of presence management.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-25 14:25:13 -07: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
Travis Ralston
e5df0dcf1e
$riot_theme -> $theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-18 09:19:54 -07:00
Michael Telatynski
882068078d
fix missing space 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-17 20:53:53 +00:00
Michael Telatynski
9603b21199
s/Quote/Reply/ and ES6 tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-17 20:20:45 +00:00
Travis Ralston
94ef80c008 Support sending the current theme to widgets 
This is a namespaced variable because some clients may not be able to support themes, or may have varying definitions of what "light" means. Widgets are recommended to opt for per-client checks, or accept that some clients may differ.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-16 20:11:00 -07:00
Michael Telatynski
9baf71c4fc
only pass one child to EmojiText otherwise it cries 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-15 19:52:47 +00:00
Michael Telatynski
4043ea7d57
change CSS classes and i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-15 17:57:24 +00:00
Luke Barnard
adaea9ad5b
Merge pull request #1647 from matrix-org/luke/tag-panel-improve-performance 
Attempt to improve TagPanel performance
 2017-12-15 17:38:15 +00:00
Luke Barnard
71740cc176 Merge branch 'develop' into luke/fix-room-list-group-store-leak 2017-12-15 17:36:36 +00:00
Luke Barnard
d292dab9c6 More doc 2017-12-15 17:30:21 +00:00
Luke Barnard
56affd3d42 Rename for clarity 2017-12-15 17:29:06 +00:00
Luke Barnard
d2066f41d5
Merge pull request #1656 from matrix-org/luke/fix-scroll-jump-on-message-decryption 
Fix one variant of a scroll jump that occurs when decrypting an m.text
 2017-12-15 17:25:21 +00:00
Luke Barnard
653137f6ec Update comment 2017-12-15 17:21:20 +00:00
Luke Barnard
961d5e1868 Split updatedSelectedTagsRooms 
because we don't need to get the rooms for all groups when
the filtered tags change.
 2017-12-15 14:23:35 +00:00
Luke Barnard
34e455c6fc Fix leaking of GroupStore listeners in RoomList 2017-12-15 14:12:21 +00:00
Luke Barnard
7f551f517b Add comments to _onDecrypted 2017-12-15 14:01:07 +00:00
Luke Barnard
a516c18cc5 Indicate event tile resize after rendering 2017-12-15 13:58:58 +00:00
Luke Barnard
df1134f092 Use "shared" DMRoomMap 2017-12-14 16:34:49 +00:00
Luke Barnard
3732fd29d5 Comments for instance variables 2017-12-14 16:17:06 +00:00
Michael Telatynski
5c229b9ef8
DRY matrix.to link generation so it is all changeable in one class 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-12 23:33:40 +00:00
Michael Telatynski
4666ac7c83
hide rich quoting behind flags, retaining original quoting for now 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-12 23:29:43 +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
Michael Telatynski
0f85391587
Implement Rich Quoting/Replies 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-10 12:50:41 +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
Luke Barnard
196e1a4f66 Fix one variant of a scroll jump that occurs when decrypting an m.text 2017-12-08 15:25: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
aac5bcfe80 Attempt to improve TagPanel performance 
by only recalculating rooms to show (for a given group) when a group updates.
 2017-12-05 11:25:30 +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
Michael Telatynski
4d177626b5
init Linkify properly to make tests happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-19 13:24:18 +00:00
Michael Telatynski
d943807ad1
remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-19 13:18:06 +00:00
Michael Telatynski
f0752572a7
make RoomDetailRow reusable for the Room Directory 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-19 12:49:26 +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
Luke Barnard
d777e370f2
Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing 
Disable RoomDetailList in GroupView when editing
 2017-11-07 18:53:04 +00:00
Travis Ralston
e0ddd88ec9 Default to no read pins if there is no applicable account data 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-07 11:14:27 -07:00
Matthew Hodgson
e14e0bf200
Merge pull request #1486 from turt2live/travis/pinned-notice 
Add a small indicator for when a new event is pinned
 2017-11-07 17:56:12 +00:00
Luke Barnard
80d4873542 Disable RoomDetailList in GroupView when editing 
Otherwise the rooms can be clicked on.
 2017-11-07 16:54:28 +00:00
Travis Ralston
142d23a099
Cap the read pin event IDs to 10 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-07 09:16:19 -07:00
Luke Barnard
47bf991471
Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills 
Room notifs in autocomplete & composer
 2017-11-07 10:25:48 +00:00
David Baker
df5c6470e8 get dict syntax right 2017-11-06 22:01:23 +00:00
David Baker
029853d379
Merge pull request #1578 from matrix-org/luke/groups-admin-badges 
Indicate admins in the group member list with a sheriff badge
 2017-11-06 17:16:34 +00:00
David Baker
08d006d112 PR feedback 2017-11-06 17:15:09 +00:00
Luke Barnard
d6a6e59d6c Indicate admins in the group member list with a sheriff badge 2017-11-06 16:37:16 +00:00
David Baker
adc4290451 Pillify room notif pills in composer 2017-11-06 15:11:42 +00:00
Richard Lewis
f1db564506
Merge pull request #1533 from anoadragon453/develop 
Remember whether widget drawer was hidden per-room
 2017-11-06 14:29:25 +00:00
Travis Ralston
ef45d82ec6 Fix URL preview save calls 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:20 -07:00
Travis Ralston
b75be41f94 Fix split-brain for blacklistUnverifiedDevices 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:06 -07:00
Travis Ralston
cb17c0a379 Migrate blacklistUnverifiedDevicesPerRoom 
This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:15:55 -07:00