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

5034 commits

Author SHA1 Message Date
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
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
David Baker
c64b4e1b1c Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting 2018-01-16 17:38:32 +00:00
Richard Lewis
87d8ed5af8 Add comment 2018-01-16 17:01:25 +00:00
Luke Barnard
62caa4f096
Merge pull request #1705 from matrix-org/luke/tag-panel-beautiful-dnd 
Replace TagPanel react-dnd with react-beautiful-dnd
 2018-01-16 11:26:44 +00:00
lukebarnard
f19dcd8114 Comment workaround to atlassian/react-beautiful-dnd#273 2018-01-16 11:07:25 +00:00
lukebarnard
bda2d6b0a6 Work around atlassian/react-beautiful-dnd#273 
For some reason, after dragging an item
the parent draggable receives a mouse click. The workaround is
to use onMouseDown for deselecting tags
 2018-01-16 10:44:11 +00:00
Richard Lewis
82b9897986 Select apropriate theme colour for popover. 2018-01-15 18:27:14 +00:00
lukebarnard
16c13fb079 Replace TagPanel react-dnd with react-beautiful-dnd 
This new library handles the simple case of an ordered vertical
(or horizontal) list of items that can be reordered.

It provides animations, handles positioning of items mid-drag
and exposes a much simpler API to react-dnd (with a slight loss
of potential function, but we don't need this flexibility here
anyway).

Apart from this, TagOrderStore had to be changed in a highly
coupled way, but arguably for the better. Instead of being
updated incrementally every time an item is dragged over
another and having a separate "commit" action, the
asyncronous action `moveTag` is used to reposition the tag in
the list and both dispatch an optimistic update and carry out
the request as before. (The MatrixActions.accountData is still
used to indicate a successful reordering of tags).

The view is updated instantly, in an animated way, and this
is handled at the layer "above" React by the DND library.
 2018-01-15 18:12:27 +00:00
David Baker
0a6018a945
Merge pull request #1704 from matrix-org/luke/perf-room-list 
Only set selected tags state when updating rooms
 2018-01-15 15:01:57 +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
Michael Telatynski
b526fc057c Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep 2018-01-14 18:32:17 +00:00
David Baker
e42bea6277 Don't paginate whilst decrypting events 
As comment hopefully explains. This meant loading the app on an e2e
room would often be very slow as it tried to pull hundreds of events
into the timeline.
 2018-01-12 18:17:03 +00:00
Richard Lewis
a3c6dd36ef Stickers popover. 2018-01-12 17:38:21 +00:00
David Baker
99a72b5b2b Fix autofocus broken in https://github.com/matrix-org/matrix-react-sdk/pull/1674 
'focus' attribute was on the wrong thing
 2018-01-12 10:52:51 +00:00
David Baker
aa5d42d045 Remove spurious dot 2018-01-12 10:32:36 +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
4f3670941d Bind functions 2018-01-11 12:33:02 +00:00
Michael Telatynski
8ad4da54cb
Fix missing negation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 12:04:53 +00:00
Richard Lewis
d0c16fa7a1 Convert to ES6 class. 2018-01-11 11:49:46 +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
David Baker
b152bd4ab9
Merge pull request #1625 from matrix-org/t3chguy/analytics_info 
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
 2018-01-11 11:02:34 +00:00
David Baker
292a6c5767
Merge pull request #1674 from aidalgol/rebase-dialogs 
Normalise dialogs
 2018-01-11 10:49:40 +00:00
David Baker
efb96cdd2a
Merge pull request #1695 from matrix-org/dbkr/send_without_verifying 
Add 'send without verifying' to status bar
 2018-01-11 10:34:56 +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
1a7dc22a8d
make wantsDateSeparator generic and throw into DateUtils 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:06:24 +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
9e2238e884
remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:56:36 +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
Michael Telatynski
454fd23f25
fix typo shsape->shape 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:51:48 +00:00
Michael Telatynski
a977ab9be4
change handler name to suit convention 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:51:23 +00:00
David Baker
9dd9a5be4b Wording tweak 2018-01-09 17:59:49 +00:00
David Baker
dbb8f878cb Tidy up imports 2018-01-09 17:57:18 +00:00
Richard Lewis
9abb160120 Replace apps button with stickers button in message composer. 2018-01-09 16:02:17 +00:00
David Baker
4c101628b5 Add 'send without verifying' to status bar 
Fixes other part of https://github.com/vector-im/riot-web/issues/5936
 2018-01-09 13:52:37 +00:00
Aidan Gauland
9365860075 Update copyright line 2018-01-09 18:40:12 +13:00
Richard Lewis
0577316c86 Fix duplicate event registration. 2018-01-08 13:40:33 +00:00
Richard Lewis
5df9a01e64 Use m.room.sticker event. 2018-01-08 12:06:32 +00:00
Richard Lewis
486b2cf102 Handle sticker message event. 2018-01-08 11:32:38 +00:00
Richard Lewis
dc1423052f De-register listener. 2018-01-08 11:32:23 +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
Luke Barnard
8c84c3f929
Merge pull request #1680 from matrix-org/t3chguy/hide_roomstatusbar 
Hide status bar on visible->hidden transition
 2018-01-05 15:26:22 +00:00
lukebarnard
8ade357349 Handle newly added rooms and removed rooms. 2018-01-05 12:33:26 +00:00
David Baker
845dda8f48
Merge pull request #1692 from matrix-org/t3chguy/pr-revival/turt2live/single_unsent 
[revived] Singularise unsent message prompt, if applicable
 2018-01-05 12:24:06 +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
9f295b7a86
fix typo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 12:03:46 +00:00
Michael Telatynski
558a90a359
comment out RoomView.onStatusBarHidden 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:58:42 +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
222b01e000
Merge pull request #1691 from matrix-org/t3chguy/lazy_save_relatedGroupSettings 
only save RelatedGroupSettings if it was modified. Otherwise perms issue
 2018-01-05 11:53:30 +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
Michael Telatynski
293bb15ccc
check PL and compare arrays rather than tracking changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 10:53:55 +00:00
Peter Vágner
cf472c791d Consume all combinations of space / enter, keyDown / keyUp presses and 
try to explain this key handling inconsistency with some additional
comments as per the review discussion.
 2018-01-05 11:45:45 +01:00
lukebarnard
7606e60188 Merge branch 'develop' into luke/perf-tag-panel-selected 2018-01-05 10:26:03 +00:00
Richard Lewis
54d128658e Comment logging. 2018-01-04 23:00:10 +00:00
Richard Lewis
57247493d9 Remove unused deps. 2018-01-04 22:59:50 +00:00
Richard Lewis
d256e473eb Fix header and remove unused deps. 2018-01-04 22:51:49 +00:00
Richard Lewis
d652f117fb Remove click handlers etc. 2018-01-04 22:36:29 +00:00
Richard Lewis
1c8586e802 Add sticker message rendering. 2018-01-04 22:21:38 +00:00
Richard Lewis
54671ab67e Send m.sticker messages 2018-01-04 21:57:24 +00:00
Richard Lewis
d20aebfbd7 Correctly handle sticker message events. 2018-01-04 18:58:55 +00:00
Richard Lewis
eb4053bc99 Handle sticker message payloads 2018-01-04 18:41:47 +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
lukebarnard
55bfff24c4 Fix forgotten rename during d5e2a73d99 2018-01-04 17:46:44 +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
Michael Telatynski
be48460595
Singularise unsent message prompt, if applicable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-04 15:05:08 +00:00
Michael Telatynski
f5f3c894d7
only save RelatedGroupSettings if it was modified. Otherwise perms issue 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-04 14:24:13 +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
Richard Lewis
b85efa08ce Merge branch 'rxl881/snapshot' of github.com:matrix-org/matrix-react-sdk into rxl881/snapshot 2018-01-04 09:53:29 +00:00
Richard Lewis
e96d199b28 Inject stickers 2018-01-04 09:53:26 +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
Luke Barnard
d3e47fa99d
Merge pull request #1682 from Nostradamos/fix_riot_web_4821 
Make scroll on paste in RTE compatible with https://github.com/vector-im/riot-web/pull/5900
 2018-01-03 15:48:43 +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
David Baker
613e3b7ac1 Remove extra full stop 2018-01-03 11:57:49 +00:00
lukebarnard
d495519986 Fix shift-ctrl-click 
isOnlyCtrlOrCmdKeyEvent is predicated on !shiftKey, so another function was needed for cases where we ignore other keys
 2018-01-03 11:39:15 +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
Luke Barnard
8eef09335a
Merge pull request #1667 from matrix-org/luke/fix-naive-tag-panel-group-profile-requesting 
Get Group profile from TagTile instead of TagPanel
 2018-01-02 19:02:33 +00:00
lukebarnard
874a7bf1de Merge branch 'develop' into luke/fix-room-list-group-store-leak 2018-01-02 16:19:37 +00:00
lukebarnard
133837cdbe Document initial state 2018-01-02 15:59:10 +00:00
lukebarnard
833cd321f3 Log warning in case of failed group profile fetch 2018-01-02 15:58:24 +00:00
lukebarnard
31855f18f8 Initialise profile state 2018-01-02 15:56:32 +00:00
lukebarnard
2cb4c897ce Move getInitialState before componentWillMount 2018-01-02 13:45:19 +00:00
lukebarnard
3cb128094d Add more comments to TagTile to explain what it is 2018-01-02 13:44:22 +00:00
lukebarnard
80f11e5c77 Comment tag PropType 2018-01-02 13:34:47 +00:00
Michael Telatynski
875eb3d34f
Hide status bar on visible->hidden transition 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-01 21:15:26 +00:00
Richard Lewis
a408b98504 Set widget ID on WidgetMessaging instance. 2017-12-29 14:34:52 +00:00
Richard Lewis
7660176079 Fix comment linting errors. 
Stop listening and cleanup endpoints correctly.
 2017-12-28 22:27:12 +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
Aidan Gauland
9531b219d2 Remove unused imports 2017-12-26 12:53:01 +13:00
Aidan Gauland
e4b86f0730 Fix use of deprecated module 
Use PropTypes from "prop-types" instead of the deprecated React.PropTypes
submodule.
 2017-12-26 11:55:15 +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
Aidan Gauland
e6dbc3b863 Use DialogButtons in UnknownDeviceDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
2674fcb6d3 Use DialogButtons in TextInputDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
a11146f39d Use DialogButtons in SessionRestoreErrorDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
93b789438b Use DialogButtons in ConfirmUserActionDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
7a761dbf6b Use DialogButtons in ChatCreateOrReuseDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
aecb4650bc Correct order of buttons in CreateGroupDialog 
We can't use DialogButtons because the primary button is an <input> element.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
c863dbfc76 Use DialogButtons in CreateRoomDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
0f6125e749 Use DialogButtons in AddressSelector 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
3b2c61e456 Use DialogButtons in QuestionDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
45d86ea7ca Add DialogButton component 
A component to normalise the buttons in dialogs.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
9ebd58852c Rebase DeactivateAccountDialog on BaseDialog 2017-12-23 17:02:19 +13:00
Aidan Gauland
c5284eb070 Allow BaseDialog to take a class for the title <div> 
Some dialogs need to set additional classes on the `mx_Dialog_title` `div`
element (for example `danger`).
 2017-12-23 17:02:19 +13:00
Aidan Gauland
8bb16466d6 Rebase AddressSelector on BaseDialog 2017-12-23 17:02:19 +13:00
Peter Vágner
f2ca02eaf8 SetEmailDialog: use autoFocus prop on the EditableText rather than using 
its ref inside onComponentDidMount function. This is shorter better and
has been requested.
 2017-12-20 10:13:37 +01:00
Peter Vágner
20c485d85e Move aria-hidden management from the BaseDialog component to the Modal 2017-12-20 10:09:26 +01:00
Richard Lewis
baf472b4a3 Only show snapshot button when apps are maximised. 2017-12-19 17:16:38 +00:00
Richard Lewis
08bcfc5c4e Make sure that capabilities array is initialised. 2017-12-19 17:15:06 +00:00
Matthew Hodgson
fa14bc9b8d don't gutwrench 2017-12-18 22:49:23 +00:00
Matthew Hodgson
e65c67ca15 fix https://github.com/vector-im/riot-web/issues/5841 2017-12-18 22:47:28 +00: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
Michael Telatynski
47d4e5f8d1
nest quotes, but only when people want to click through them 
loads pre-emptively

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-18 19:28:01 +00:00
Richard Lewis
32bdbdb2f3
Merge pull request #1669 from turt2live/travis/integ-theme 
Give the current theme to widgets and the integration manager
 2017-12-18 17:35:06 +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
201d8f04c0
Merge pull request #1671 from oivoodoo/riot-web-issue-1953-multiple-file-upload 
Allow multiple file uploads using drag & drop for RoomView
 2017-12-18 14:56:31 +00:00
Alexandr Korsak
d051a2e0b3 Remove extra space 2017-12-18 15:59:21 +03:00
Alexandr Korsak
78af02b29b Replace lodash/every by Array.prototype.every function 2017-12-18 15:51:01 +03:00
Alexandr Korsak
c07c4fd1cb Allow multiple file uploads on drag & drop 2017-12-18 13:20:18 +03:00
Alexandr Korsak
fddbf3a2a2 Fix issue with preview of phone number on register and waiting for sms code confirmation code 2017-12-18 12:23:54 +03: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
Richard Lewis
83f9a4162b Request capabilities (e.g. ability to take snapshots) from widgets. 2017-12-16 09:16:24 +00:00
Richard Lewis
e63f5696a6 Screenshot handlers 2017-12-15 21:36:02 +00: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
0ad0c0e9f7
finish i18n, and add a Date Sep to quote if it needs it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-15 18:39:01 +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
6f896098e3 Get Group profile from TagTile instead of TagPanel 
So that instead of getting all group profiles everytime the tags
change order, get them when the TagTile mounts for a group tag.
 2017-12-15 17:18:46 +00:00
Richard Lewis
f2ad7be3f3 Add event handlers and comments. 2017-12-15 16:56:02 +00:00
Luke Barnard
8b11b10531 Avoid NPEs by using ref method for collecting loggedInView in MatrixChat 2017-12-15 15:24:37 +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
Richard Lewis
f410112983 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into rxl881/snapshot 2017-12-15 10:18:56 +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
Luke Barnard
9975941f3c
Merge pull request #1653 from matrix-org/luke/feature-ordered-tag-panel 
DnD Ordered TagPanel
 2017-12-14 10:36:16 +00:00
Peter Vágner
9f5857a7cc Merge branch 'develop' into dialog-a11y 2017-12-14 11:04:59 +01:00
Peter Vágner
642675c96d Address review request comments 2017-12-14 10:31:28 +01:00
Luke Barnard
950f591b3f Clarify more docs 2017-12-13 15:50:20 +00:00
lukebarnard
f38690f265 Doc orderedGroupTagProfiles 2017-12-13 10:51:04 +00:00
lukebarnard
a8b245d0cf Add unmounted guard 2017-12-13 10:42:11 +00:00
lukebarnard
42c1f3cfe2 Fix incorrect bind 2017-12-13 10:41:24 +00:00
Richard Lewis
c739269777 Update widget title on edit. 2017-12-13 10:14:26 +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
Michael Telatynski
38e8488c2a
we don't actually use state.room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-12 23:25:38 +00:00
Peter Vágner
ab0ff9b781 BaseDialog: split a very long line 2017-12-12 18:55:57 +01:00
Luke Barnard
13925db251 Refactor to allow dispatching of two kinds of Actions 
They are:
 1. The existing type of Action, Objects with an `action` type.
 1. Asyncronous Actions, functions that accept a `dispatch` argument, which can be used to dispatch Actions asyncronously.
 2017-12-12 17:32:43 +00:00
Luke Barnard
a120335130 Handle groups being joined and left 2017-12-11 18:03:19 +00:00
Luke Barnard
aa914098dc Return null if TagOrderStore is loading 
The view should decide the default state.
 2017-12-11 17:19:29 +00:00
Luke Barnard
991ea4ebe5 Fix a few bugs with TagOrderStore: 
- Have TagOrderStore listen for MatrixSync actions so that it can initialise
   tag ordering state.
 - Expose an empty list until the client has done its first sync and has
   fetched list of joined groups
 2017-12-11 17:17:05 +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
b6182f7e6c
Tidy Quote class, removing comments etc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-10 12:54:19 +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
Richard Lewis
24db57bfb6 Fix api prefix. 2017-12-08 18:47:00 +00:00
Matthew Hodgson
f2d68e4601
Merge pull request #1649 from matrix-org/rxl881/titleBar 
Add maximize / minimize apps drawer icons.
 2017-12-08 19:18:45 +01:00
David Baker
bb9376098a
Merge pull request #1654 from matrix-org/dbkr/crypto_store_migrate_warning 
Warn when migrating e2e data to indexeddb
 2017-12-08 16:52:05 +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
Luke Barnard
8f0774496f Remove redundant MatrixChat 2017-12-08 11:29:21 +00:00
Luke Barnard
72550961e5 Move 'commit_tags' to action creator 2017-12-08 10:52:20 +00:00
Peter Vágner
321b1adb99 Elliminate lint errors and warnings 2017-12-08 07:47:08 +01:00
Richard Lewis
b20667a5a8
Merge pull request #1655 from matrix-org/rxl881/cmc 
Remove logging.
 2017-12-07 15:56:10 +00:00
Luke Barnard
ee6df105fe Introduce action creators 
These can be used to dispatch actions immediately, or after some asynchronous
work has been done. Also, create GroupActions.fetchJoinedGroups as an example.

The concept of async action creators can be used in the following cases:
 - stores or views that do async work, dispatching based on the results
 - actions that have complicated payloads, would make more sense as functions
   with documentation that dispatch created actions.
 2017-12-07 14:17:32 +00:00
Richard Lewis
df438924a7 Remove logging. 2017-12-07 09:57:53 +00:00
Luke Barnard
4603d593de
Merge pull request #1588 from pvagner/develop 
Add some missing translatable strings
 2017-12-07 09:41:39 +00:00
Peter Vágner
839f938c91 Argh! Reworked AccessibleButton key handling again. It turned out by 
fixing behaviour when pressing the enter key breaks behaviour when
pressing space to activate the buttons. So we are now handling enter
onKeyDown and space onKeyUp. Also briefly explained the situation with
comments.
 2017-12-07 10:20:27 +01:00
Peter Vágner
4171675221 Add some comments explaining how we are using aria-hidden property to 
hide content outside of the BaseDialog to screen reader users.
 2017-12-07 09:44:00 +01:00
Richard Lewis
ed675fe791 Allow bypass of widget loading screen on hide / show. 2017-12-06 22:54:32 +00:00
David Baker
2a01985076 better proptypes 2017-12-06 19:07:12 +00:00
David Baker
0deed4bb88 null guard 2017-12-06 19:05:25 +00:00
David Baker
1a3671d241 remove stray param 2017-12-06 19:04:29 +00:00
David Baker
5bca5a7a8e More underscore 2017-12-06 19:02:26 +00:00
David Baker
aa99b898ce Add that it might not work now either 
also a comma
 2017-12-06 18:57:48 +00:00
Luke Barnard
65d88334a9 Fix linting 
React DnD specifies functions with upper-case first letters
 2017-12-06 16:48:18 +00:00
Richard Lewis
e20db416f2 Add field to bypass riot widget loading screen. 2017-12-06 16:44:41 +00:00
David Baker
4462694438 lint 2017-12-06 16:06:33 +00:00
David Baker
65c210cdde Warn when migrating e2e data to indexeddb 2017-12-06 15:28:20 +00:00
Luke Barnard
7e1f1cdbd9 Move DragDropContext to wrap LoggedInView 
Becuase the tests rely on being able to inspect the state of MatrixChat
 2017-12-06 15:01:16 +00:00
Luke Barnard
35a108eecc Simplify render of TagPanel - remove sorting 2017-12-06 14:17:26 +00:00
Luke Barnard
7aa5dcef69 Move DragDropContext to wrap entire app 2017-12-06 13:10:58 +00:00
Luke Barnard
a8a650c24a Move TagTile to separate file, and make it dragable 2017-12-06 11:25:46 +00:00
Peter Vágner
f9b0243c8e Merge branch 'develop' into dialog-a11y 2017-12-06 11:10:18 +01:00
Peter Vágner
802abe7091 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 2017-12-06 11:07:01 +01:00
Peter Vágner
60ada30680 Forgot to turn div displaying error text into an aria-alert in the 
create group dialog.
 2017-12-05 23:46:02 +01:00
Peter Vágner
eda453bbe5 Fixed an issue where pressing enter key to activate the AccessibleButton 
was also activating normal button that might just have received the
system focus as a result of the key press and the other way round.
The most obvious occurence of this issue is that dialogs were
reappearing when dismissed by pressing the enter key.
 2017-12-05 23:23:40 +01:00
Richard Lewis
3206527d73 Remove logging. 2017-12-05 21:59:44 +00:00
Richard Lewis
7f86ed35a3 Only show custom title if different from app name. 2017-12-05 21:49:11 +00:00
Richard Lewis
1415a83a61 Merge branch 'rxl881/titleBar' of https://github.com/matrix-org/matrix-react-sdk into rxl881/customTitle 2017-12-05 21:42:47 +00:00
Richard Lewis
d5d5397959 Set custom widget title. 2017-12-05 21:41:44 +00:00
Richard Lewis
9fd8deb16d Add maximize / minimize apps drawer icons. 2017-12-05 18:18:51 +00:00
Luke Barnard
8178496457 Implement Store for ordering tags in the tag panel 2017-12-05 14:45:44 +00:00
Peter Vágner
a31af39ca8 Applied aria-describedby to all other dialogs that are using BaseDialog. 
Also added initial focus where it has not been set.
 2017-12-05 13:52:20 +01:00
Richard Lewis
9eb334a1d4
Merge pull request #1640 from matrix-org/rxl881/widgetTitle 
Add widget -> riot postMessage API
 2017-12-05 12:02:57 +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
Peter Vágner
4f83f6cf25 Move keyboard focus management back to the BaseDialog rather than 
leaving it in the Modal manager.
We are using Modal manager to load other components not just BaseDialog
and its subclasses and they might require different keyboard handling.
Also depend on focus-trap-react rather than react-focus-trap for locking
keyboard focus inside the dialog. The experience is much nicer and even
the FocusTrap element it-self no longer gains the focus.
On a side note using the FocusTrap element outside the dialog (on
its parent) stops it from working properly.
 2017-12-05 08:50:40 +01:00
Richard Lewis
49a2985515 Register message endpoints. 
Store endpoint origins only.
 2017-12-05 00:08:17 +00:00
Peter Vágner
5ccbcf02e2 Several changes improving accessibility of the dialogs 
- Wrapped all the modals inside a react-focus-trap component disabling
keyboard navigation outside the modal dialogs
- Disabled our custom key handling at dialog level. Cancelling on esc
key is now handled via FocusTrap component.
- Removed onEnter prop from the BaseDialog component. Dialogs that
submit data all now embed a form with onSubmit handler. And since
keyboard focus is now managed better via FocusTrap it no longer makes
sense for the other dialog types. Fixes
https://github.com/vector-im/riot-web/issues/5736
- Set aria-hidden on the matrixChat outer node when showing dialogs to
disable navigating outside the modals by using screen reader specific
features.
 2017-12-03 21:38:21 +01:00
Richard Lewis
c9b8aab0e0 Workings for future posterity - Can't access iframe content from parent. iframe needs to initiate. Postmessage data up the stack. 2017-12-03 19:44:59 +00:00
Richard Lewis
3a89b90e57 Add stub handler for image snapshot 2017-12-03 11:25:15 +00:00
Luke Barnard
641add4964 Fix one kind of scroll jump 
by calling onWidgetLoad when the <img> in MImageBody loads
 2017-12-01 14:18:13 +00:00
Luke Barnard
b26cf23574
Merge pull request #1641 from matrix-org/luke/tag-panel-shift-click-semantics 
Implement shift-click and ctrl-click semantics for TP
 2017-12-01 12:04:21 +00:00
Luke Barnard
363fe04a10 isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent 2017-12-01 10:44:00 +00:00
Luke Barnard
ddd0e161c0 Fix broken imports 2017-12-01 10:41:56 +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
eaaa9fe747 Don't show group when clicking tag panel 2017-11-30 15:35:40 +00:00
Richard Lewis
5ff5ca4705 Remove logging and broken title fetching functions. 2017-11-30 14:50:30 +00:00
Luke Barnard
3bcb3195c4 Implement shift-click and ctrl-click semantics for TP 2017-11-30 14:48:54 +00:00
Richard Lewis
2cfbbb000e Refactor messaging listerners. 2017-11-30 10:20:29 +00:00
Stefan Parviainen
437a440bdf Add missing id 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-30 08:32:18 +01:00
Richard Lewis
4f5f44ff38 Add widget postmessage API stub. 2017-11-29 22:16:22 +00:00
Stefan Parviainen
cb5c9f2c5a Make Dialogs more accessible 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-29 21:13:48 +01:00
Luke Barnard
f708250d44 Add feature flag for Tag Panel 2017-11-29 18:00:42 +00:00
Luke Barnard
ead30fae9d Use unmounted instead of mounted 2017-11-29 17:07:43 +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
Luke Barnard
ff25c2f329
Merge pull request #1638 from matrix-org/luke/feature-bulk-device-deletion 
Implement UI for using bulk device deletion API
 2017-11-28 16:01:39 +00:00
David Baker
a5acc2cfc2
Merge pull request #1637 from matrix-org/luke/replace-IRC-with-flair 
Replace (IRC) with flair
 2017-11-28 16:00:47 +00:00
Luke Barnard
736b8045aa Remove evil auth cache 2017-11-28 15:54:00 +00:00
Luke Barnard
204bbebfca Only calculate displayed groups if flair enabled 2017-11-28 15:49:11 +00:00
Luke Barnard
b32e4a57bc Factor out _getDisplayeDGroups 2017-11-28 15:46:23 +00:00
Luke Barnard
b748c62880 Renames for clarification 2017-11-28 15:40:36 +00:00
Luke Barnard
1c71983610 Implement UI for using bulk device deletion API 2017-11-28 15:32:40 +00:00
Luke Barnard
55b5f2b249
Merge branch 'develop' into luke/allow-guest-view-group 2017-11-28 14:06:43 +00:00
Luke Barnard
3addb924b1 Replace (IRC) with flair 
If a user has public groups that are honoured in their flair, remove the (IRC) to give the appearance that the flair replaces it.
 2017-11-28 13:50:05 +00:00
Luke Barnard
a8594a58e5 Allow guest to see MyGroups, show ILAG when creating a group 2017-11-28 13:32:46 +00:00
Luke Barnard
7ec4010881 Make GroupStore use MatrixClientPeg 
To avoid weirdness with using a cached matrix client
 2017-11-28 11:54:05 +00:00
Luke Barnard
1a3ad5a342 Allow guests to view individual groups 
For homeservers that still disallow guests (running synapse without https://github.com/matrix-org/synapse/pull/2715), start ILAG.
 2017-11-28 11:52:46 +00:00
David Baker
bbaa46f773
Merge pull request #1634 from matrix-org/luke/move-group-flair-toggle-to-user-settings 
Move group publication toggles to UserSettings
 2017-11-28 11:02:45 +00:00
Luke Barnard
d4f5e7e6d7 Deal with errors, lack of groups, loading 2017-11-28 10:46:20 +00:00
Richard van der Hoff
8be3862e68 Merge branch 'master' into develop 2017-11-28 10:29:40 +00:00
Luke Barnard
0d5f7ef246 Avoid NPE 2017-11-28 10:12:46 +00:00
Luke Barnard
3342754a72 Catch and log errors from getting group profile 2017-11-28 10:11:25 +00:00
David Baker
81ae081f15
Merge pull request #1617 from turt2live/travis/granular-theme 
Pull the theme through the default process
 2017-11-27 18:07:09 +00:00
lukebarnard
9ed9422af8 Move group publication toggles to UserSettings 2017-11-27 17:24:42 +00:00
Richard van der Hoff
80b8cbb473 Ignore unrecognised login flows 
Update the Login component so that if it sees an unrecognised login flow, it
just ignores it and uses another one, so that riot can still be used with
homeservers supporting custom login types.
 2017-11-27 16:47:49 +00:00
David Baker
7826d0c61a
Merge pull request #1630 from aidalgol/redact-dialog-fix 
Rebase ConfirmRedactDialog on QuestionDialog
 2017-11-27 14:55:04 +00:00
David Baker
e07c7e404e
Merge pull request #1632 from matrix-org/luke/rename-related-communities 
Rename Related Groups to improve readability
 2017-11-27 14:34:02 +00:00
lukebarnard
3635997090 Rename Related Groups to improve readability 2017-11-27 14:13:44 +00:00
Aidan Gauland
3358fdc906 Address eslint errors 
* Remove space before curly brace.
* Remove unused import.
 2017-11-26 16:04:24 +13:00
Aidan Gauland
aaf8106e9e Rebase ConfirmRedactDialog on QuestionDialog 
Rewrite the ConfirmRedactDialog component to derive from the QuestionDialog component.
 2017-11-26 15:46:24 +13:00
David Baker
c002d3ff99
Merge pull request #1616 from pafcu/fix-presence-i18n 
Make PresenceLabel more easily translatable
 2017-11-22 17:17:52 +00:00
David Baker
a784abd57f
Comment typo 2017-11-22 17:13:18 +00:00
Matthew Hodgson
d4feca5dfb
Merge pull request #1628 from pafcu/label-actionbuttons 
Add aria-labels to ActionButtons
 2017-11-21 18:46:07 +00:00
Richard van der Hoff
b2e80a8ee2
Merge pull request #1620 from matrix-org/rav/fix_memberpresence_avatar 
MemberPresenceAvatar: fix null references
 2017-11-21 17:42:13 +00:00
Travis Ralston
5f3fda2950
Update MemberPresenceAvatar.js 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-21 09:01:56 -07:00
krombel
7c5f74e18a
Fix GroupMemberList search for users without displayname 
When there is a user in a group which has no displayname set
the search failed with "Cannot read property 'toLowerCase' of null"
 2017-11-20 17:02:20 +01:00
David Baker
e2f5e16fa7 Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-20 10:00:47 +00:00
Michael Telatynski
f61f858cf7
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-19 15:33:07 +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
Peter Vágner
093f110199 Make the toggle button on the memberEventListSummary translatable 2017-11-18 17:48:57 +01:00
Peter Vágner
184b29daf8 Revert "Make the disabled PowerSelector element showing custom value translatable. Fixes #5547" 
This reverts commit 681f43913a.
 2017-11-18 16:58:36 +01:00
Travis Ralston
28ff0a4ee7 Disable presence controls if there's no presence 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-17 22:25:15 -07:00
Travis Ralston
d010329f4a Make the room-level URL preview notification explicit 
Fixes https://github.com/vector-im/riot-web/issues/5638

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-17 22:03:06 -07:00
Travis Ralston
cdf5a6fb8a Fix typo that prevented URL previews on a room-account level from being saved 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-17 22:02:33 -07:00
David Baker
1675737e7d Merge remote-tracking branch 'origin/master' into develop 2017-11-17 17:48:42 +00:00
David Baker
6d23182f5f Fix the force TURN option 
The call object is created within the js-sdk for inbound calls, so
we never got the chance to set it.
 2017-11-17 14:54:44 +00:00
Richard van der Hoff
4e7fd55fb4 MemberPresenceAvatar: fix null references 
avoid assuming that `member` has a `user`
 2017-11-17 14:35:33 +00:00
Stefan Parviainen
8090aadb0e Add aria-labels to ActionButtons 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-17 14:33:39 +01:00
Travis Ralston
33a3b07d88 Pull the theme through the default process 
This is to ensure the `config` level is respected.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-16 20:52:12 -07:00
David Baker
65e1d49f37 More sensible buttons in UnknownDeviceDialog 
Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'.
 2017-11-16 17:59:42 +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
3c8645871f Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-16 16:47:15 +00:00
David Baker
196eafdc7f Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-16 15:59:16 +00:00
David Baker
02629d13d9
Merge pull request #1615 from matrix-org/luke/fix-sender-profile-opacity 
Do something more sensible for sender profile name/aux opacity
 2017-11-16 15:35:16 +00:00
Luke Barnard
7ffb542cb5 Do something more sensible for sender profile name/aux opacity 
- If no translation is needed, don't do it.
 - For now, ignore the fact that this doens't allow us easily to put
   Flair into "luke sent an image" but we don't kow where the flair
   should go for this anyway.
 2017-11-16 15:24:36 +00:00
David Baker
6f8427a5af Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584 
Because apparently the revert did not revert this part
 2017-11-16 15:11:47 +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
Matthew Hodgson
f62b04c3be
Merge branch 'develop' into travis/granular_bugs 2017-11-16 13:12:03 +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
Luke Barnard
a80935e181 JSX does not do comments in a way one might expect 2017-11-16 11:45:40 +00:00
Travis Ralston
d0a0a9ce7f Fix URL preview string not being translated 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 22:33:23 -07:00
Travis Ralston
10a1d9cb29 Language is a local setting 
Fixes https://github.com/vector-im/riot-web/issues/5611

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 21:16:12 -07:00
Travis Ralston
022e40a127 Use SettingsStore for default theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 19:04:49 -07: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
David Baker
b0027525f3 Wire up Unknown Devices popup for outbound calls 2017-11-15 17:21:04 +00: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
aeca83ff2e Unused import 2017-11-15 15:20:45 +00:00
Richard Lewis
750e64deee Pass required props to TintableSvg. 2017-11-15 15:17:21 +00:00
David Baker
93800be742 Factor out showing UnknownDeviceDialog 
So we can re-use it for calls that fail due to unknwon devices
 2017-11-15 15:15:21 +00:00
Richard Lewis
7bab7813bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour 2017-11-15 13:26:29 +00:00
Richard Lewis
59d405d4fa Use TintableSvgButtons for widget menubar icons. 2017-11-15 13:24:38 +00:00
Richard Lewis
6c2e9096cd Tintable SVGs that behave like normal image buttons / links. 2017-11-15 13:08:24 +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
Matthew Hodgson
96a3eff5d3 lint hell 2017-11-15 11:25:56 +00:00
Matthew Hodgson
060a890275
Merge pull request #1516 from turt2live/travis/granular-settings 
Granular settings
 2017-11-15 10:55:55 +00:00
David Baker
63919befd0 Catch call failures due to unknown devices 
And show a specific dialog that you can then launch the UDD from
(although currently with a 'Send Anyway' button which makes little
sense for VoIP)
 2017-11-15 10:49:29 +00:00
Matthew Hodgson
e91e94fd42 fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601 2017-11-15 09:56:44 +00:00
Travis Ralston
f58e8826c0 Use the correct settings store for presence 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-14 19:18:04 -07:00
Travis Ralston
bd4102eb3d Merge branch 'develop' into travis/granular-settings 2017-11-14 19:12:48 -07:00
Matthew Hodgson
546b062d82 automatically and correctly retint when changing theme 2017-11-15 01:45:51 +00:00
Matthew Hodgson
f05958e334
Merge pull request #1482 from turt2live/travis/presence 
Implement user-controlled presence
 2017-11-14 23:53:16 +00:00
Richard Lewis
58966c5c3d Make edit icon green by default 2017-11-14 19:53:59 +00:00
Richard Lewis
e87940f63c Make app tile title stronger 2017-11-14 19:53:32 +00:00
Stefan Parviainen
f8660de52d Add note about alternative to opacity 2017-11-14 20:13:00 +01:00
Stefan Parviainen
df6d5cc2b4 Pass plain components, rather than functions returning them 2017-11-14 20:09:52 +01:00
Stefan Parviainen
788be67c75 Clarifications 2017-11-14 20:08:27 +01:00
Matthew Hodgson
7c98558b6a fix neglible race when loading CSS 2017-11-14 16:07:48 +00:00
Matthew Hodgson
1fd7ac30e4 turns out i made up the .complete property on link elements 2017-11-14 16:04:11 +00:00
Matthew Hodgson
8d6e3dd27d fix lint 2017-11-14 15:37:03 +00:00
Matthew Hodgson
dcfbe93409 fix race when loading CSS 
fixes https://github.com/vector-im/riot-web/issues/5590
 2017-11-14 15:28:34 +00:00
Matthew Hodgson
8c218557df fix disable_custom_urls 2017-11-14 15:17:50 +00:00
David Baker
55260becc9 Revert "Lowercase all usernames" 2017-11-14 14:13:22 +00:00
Luke Barnard
12d9f05883 Merge branch 'develop' into luke/fix-restrict-power-level-options 2017-11-14 13:08:31 +00:00
Luke Barnard
3fa1bece0a Simplify further 
Also fix not-i18n-friendly "of" to be "=".
 2017-11-14 13:06:54 +00:00
David Baker
e7c99a71b6
Merge pull request #1606 from matrix-org/luke/fix-member-info-power-level-display 
Determine whether power level is custom once Roles have been determined
 2017-11-14 12:42:55 +00:00
Luke Barnard
c3492634bd Merge branch 'luke/fix-member-info-power-level-display' into luke/fix-restrict-power-level-options 2017-11-14 12:41:36 +00:00
Luke Barnard
d2ef6bffa8 Remove reverseRoles 
This variable seemed redundant in hindsight, it seemed better to remove it than to worry about where it went in the component.
 2017-11-14 12:02:37 +00:00
Travis Ralston
d92cba25ef Use the SettingsStore to get the theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-13 13:14:00 -07:00
Stefan Parviainen
2acd42e7c5 Make eslint happy 2017-11-13 21:10:08 +01:00
Travis Ralston
63bebe9dfd Split out avatar and display name hiding 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-13 12:58:10 -07:00
Travis Ralston
0648b3eae7 Merge branch 'develop' into travis/granular-settings 2017-11-13 12:29:36 -07: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
88010fa26c Determine whether power level is custom once Roles have been determined 
Instead of potentially inspecting an empty {} before mounting.

This fixes an issue where "Custom of N" would appear on the first mount of MemberInfo - part of https://github.com/vector-im/riot-web/issues/5107#issuecomment-331882294
 2017-11-13 11:57:34 +00:00
Matthew Hodgson
46387e135e
Merge branch 'develop' into matthew/status 2017-11-11 23:50:48 +00:00
Matthew Hodgson
2827bc0718 replace some of the status.im theme with general config options 2017-11-11 23:46:43 +00:00
David Baker
39763d668c
Revert "Lowercase all usernames" 2017-11-11 15:59:43 +00:00
David Baker
bce4815851 Initialise unread messages value correctly 2017-11-11 15:57:20 +00:00
Matthew Hodgson
a0cdaf29f9 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:42 -08:00
Luke Barnard
a96bfee9f2 Remove unused UserSettingsStore import 2017-11-10 16:12:27 +00:00
Luke Barnard
ceda5939f9 Remember to import React 2017-11-10 15:55:55 +00:00
Luke Barnard
853d33a93a Make groups a fully-fleged baked-in feature 2017-11-10 15:42:11 +00:00
Luke Barnard
6e1cf6ce17
Merge pull request #1548 from matrix-org/rxl881/widgetrendering 
Improve widget rendering on prop updates
 2017-11-10 12:41:20 +00:00
Luke Barnard
74c6ebc5c6
Merge pull request #1595 from matrix-org/luke/groups-show-user-profile-on-action 
Display group member profile (avatar/displayname) in ConfirmUserActionDialog
 2017-11-10 12:31:47 +00:00
David Baker
d2549b621c
Merge pull request #1602 from matrix-org/dbkr/nullcheck_atroom_rule 
Don't crash if there isn't a room notif rule
 2017-11-10 11:57:43 +00:00
Luke Barnard
981ca458ec
Merge pull request #1596 from matrix-org/luke/groups-show-name-in-flair-tootip 
Show group name in flair tooltip if one is set
 2017-11-10 11:51:45 +00:00
Richard Lewis
ba8a9f2a43 Comment length 2017-11-10 11:50:14 +00:00
David Baker
ff5e00d244 Don't crash if there isn't a room notif rule 2017-11-10 11:50:00 +00:00
Luke Barnard
6deeaf94d6 group name not required 2017-11-10 11:43:05 +00:00
Richard Lewis
d2070a08d8 Replace 'qs' dep. with 'querystring' 2017-11-10 11:42:56 +00:00
Luke Barnard
90a63d78b9
Merge pull request #1597 from matrix-org/luke/groups-fix-invite-avatar 
Convert group avatar URL to HTTP before handing to BaseAvatar
 2017-11-10 11:41:51 +00:00
Luke Barnard
d179267714 Add prop type 2017-11-10 11:41:36 +00:00
Luke Barnard
0d174ffe9a Fix tests 2017-11-10 11:13:52 +00:00
Luke Barnard
f4428267a1 Refactor onboarding redirect, add groups to the onboarding starters 2017-11-10 10:51:28 +00:00
Luke Barnard
266a504981 Use the same MatrixClient for the duration of GroupView lifecycle 
Using the pegged matrix client would lead to trying to call removeListener on `null` when GroupView is unmounted during logout.
 2017-11-10 10:49:14 +00:00
Peter Vágner
681f43913a Make the disabled PowerSelector element showing custom value translatable. Fixes #5547 2017-11-10 11:26:53 +01:00
Richard Lewis
bd6b5c4498 Improve function name. 2017-11-10 10:17:55 +00:00
Richard Lewis
98ac3dd19b Explicitly set initialisation state. 2017-11-10 09:44:58 +00:00
Luke Barnard
31be27515c Modify the group room visibility API to reflect the js-sdk changes 
See https://github.com/matrix-org/matrix-js-sdk/pull/569
 2017-11-09 16:28:21 +00:00
David Baker
b1ec430523 Remove now-unused dispatches 2017-11-09 16:09:12 +00:00
David Baker
820d9c1c25 Show staus bar on Unknown Device Error 
Don't pop up the dialog as soon as we can't send a message.

Also removes dispatches used to keep the RoomStatusBar up to date.
We can get the same events straight from the js-sdk via the
pending events event.
 2017-11-09 15:58:15 +00:00
Luke Barnard
a8487c540f Convert group avatar URL to HTTP before handing to BaseAvatar 
This is yet another component that imports the MatrixClient just for mxcUrlToHttp. It'd be much nicer to have an avatar component that accepted MXCs, e.g. by wrapping or modifying BaseAvatar.
 2017-11-09 14:34:04 +00:00
Richard Lewis
da8b1ff1cd Ensure that loading state is reset when showing app panel. 2017-11-09 14:28:24 +00:00
Luke Barnard
9a6c9594a1 Correctly display group invite 
By making sure the groupName truncates in the right place
 2017-11-09 14:16:54 +00:00
Richard Lewis
f796bc79c3 Fix addition of scalar token to widget URL. 
Add error logging.
 2017-11-09 14:07:29 +00:00
Luke Barnard
9027780215 Show group name in flair tooltip if one is set 
e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver"

Fixes https://github.com/vector-im/riot-web/issues/5341
 2017-11-09 12:38:43 +00:00
Luke Barnard
6eeb91ee2e Display group member profile (avatar/displayname) in ConfirmUserActionDialog 
Fixes https://github.com/vector-im/riot-web/issues/5486
 2017-11-09 12:24:20 +00:00
Travis Ralston
030633fa90 Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings 2017-11-08 17:43:38 -07:00
Travis Ralston
2711da28b4 Use the SettingsStore in the UnknownDeviceDialog 2017-11-08 17:43:06 -07: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
Richard Lewis
8016fb82d7 Fix broken commit. 2017-11-08 20:38:54 +00:00
Richard Lewis
56581ef408 Fix various loadingElement related issues. 2017-11-08 20:38:31 +00:00
Richard Lewis
b2b07d9370 Formatting 2017-11-08 20:17:28 +00:00
David Baker
7b243bf64d
Revert "UnknownDeviceDialog: get devices from SDK" 2017-11-08 18:49:50 +00:00
Richard Lewis
be0a76dbd6 Update variable name and JSdoc for improved clarity. 2017-11-08 17:44:54 +00:00
Matthew Hodgson
58ee4d0a76 rewrite the tinter to be ES6, and correctly cache fixups per theme 2017-11-08 06:55:07 -08:00
David Baker
b575df7da7
Merge pull request #1591 from matrix-org/luke/groups-order-admins-first 
Order users in the group member list with admins first
 2017-11-08 14:04:28 +00:00
Luke Barnard
e2a0cba6cb If group member privilege level is equal, disambiguate with displayname or userId 2017-11-08 13:57:38 +00:00
Matthew Hodgson
e729bc431d Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-08 04:29:52 -08:00
Luke Barnard
e3e161fbea Order users in the group member list with admins first 2017-11-08 11:51:58 +00:00
Luke Barnard
7075931c58
Merge pull request #1589 from matrix-org/luke/improve-room-address-picker 
Improve address picker for rooms
 2017-11-08 11:49:45 +00:00
Luke Barnard
c1d9d3714a Fix not being able to filter community rooms - fixes vector-im/vector-web#5538 2017-11-08 10:55:51 +00:00
Luke Barnard
077ca36b05 Rank rooms with shorter matching aliases first 2017-11-08 10:47:45 +00:00
Luke Barnard
b3674f503d Do not search through room topics 2017-11-08 10:32:48 +00:00
Luke Barnard
120e7b821f
Merge pull request #1585 from matrix-org/luke/groups-inviter-profile 
Use the getProfileInfo API for group inviter profile
 2017-11-08 10:24:00 +00:00
Luke Barnard
10778e075e Merge branch 'develop' into luke/groups-inviter-profile 2017-11-08 10:10:43 +00:00
Luke Barnard
4bb083d959 Style 2017-11-08 10:08:04 +00:00
Luke Barnard
f53f9ed8ca inviterProfile = null initially 2017-11-08 10:07:43 +00:00
Luke Barnard
4c47f75918
Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility 
Add checkbox to GroupAddressPicker for determining visibility of group rooms
 2017-11-08 10:04:41 +00:00
Peter Vágner
a29ab0976b Make the addresses heading on the aliases settings view translatable 2017-11-08 10:23:11 +01:00
Matthew Hodgson
ce6957a288
Merge pull request #1581 from matrix-org/luke/groups-update-group-members-api 
Alter group member api
 2017-11-07 22:46:11 +00:00
Travis Ralston
289b0c2b6a
Merge branch 'develop' into travis/granular-settings 2017-11-07 14:55:12 -07:00
Luke Barnard
8fbe50a1cf
Merge pull request #1580 from matrix-org/luke/groups-new-group-settings 
Improve group creation UX
 2017-11-07 18:55:34 +00: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
Luke Barnard
edc744067f Add checkbox to GroupAddressPicker for determining visibility of group rooms 2017-11-07 18:51:41 +00:00
Matthew Hodgson
3b1726657f
Merge pull request #1586 from turt2live/travis/message-pinning-fix1 
Default to no read pins if there is no applicable account data
 2017-11-07 18:24:21 +00:00
David Baker
49a935881f
Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk 
UnknownDeviceDialog: get devices from SDK
 2017-11-07 18:15:59 +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
David Baker
10f15dfc56 Unmounted guard 2017-11-07 17:10:40 +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
Luke Barnard
ed709f52d1 Use the getProfileInfo API for group inviter profile 2017-11-07 16:42:43 +00:00
David Baker
ec560345c7 UnknownDeviceDialog: get devices from SDK 
rather than having to have the error message passed in.

This is in preparation for not having the dialog pop up straight
away when a message isn't sent so we don't have to keep the error
object knocking around somewhere.
 2017-11-07 16:37:43 +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
646cabf324 Add missing whitespace 2017-11-07 15:15:10 +00:00
Luke Barnard
ddc1ff2f23 Name things in a sane way 2017-11-07 15:13:26 +00:00
Luke Barnard
62305a1ccd Implement tooltip for group rooms 2017-11-07 14:07:31 +00:00
Richard Lewis
96de72ab44 Switch to using existing dep "qs" and record in package.json 2017-11-07 12:45:12 +00:00
Richard Lewis
d3784b4925 Fix URL parameter encoding. 2017-11-07 12:33:38 +00:00
Richard Lewis
eb8c15075a Fix url params parsing. 2017-11-07 11:58:38 +00:00
Luke Barnard
7a09127687 Alter group member api 
To match https://github.com/matrix-org/synapse/pull/2647
 2017-11-07 11:27:42 +00:00
Richard Lewis
70c4100350 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering 2017-11-07 11:04:05 +00:00
Luke Barnard
9019fee49e Adjust long desc placeholder text 2017-11-07 10:48:56 +00: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
Luke Barnard
956c5ff343 Use a constant for easy reading of long desc placeholder 2017-11-06 18:52:55 +00:00
Luke Barnard
477051cfa6 Add placeholder for when a long desc hasn't been set 
this is only visible to group admins.
 2017-11-06 18:35:52 +00:00
Luke Barnard
137f1311b3 Add useful placeholder for the long description textarea 2017-11-06 18:35:23 +00:00
Luke Barnard
36cd22663a Open group settings when the group is created 2017-11-06 18:02:50 +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
781b94c8f4 Appease the linter 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-05 15:37:06 -07:00
Travis Ralston
10519f9465 Fix the tests 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-05 14:56:41 -07:00
Travis Ralston
7ce4316cc8 Initial support for notification settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 21:47:18 -07:00
Travis Ralston
3958e32672 Ensure blacklistUnverifiedDevices persists reloads 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 20:13:23 -07:00
Travis Ralston
45140cab69 Don't assume false means "use state" 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:42 -07: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