mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 20:55:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
7122 commits 208 branches 547 tags 609 MiB
Commit graph

3902 commits

Author SHA1 Message Date
David Baker
0f84216a9f Grey out login form when no valid HS 2017-10-11 14:05:34 +01:00
Luke Barnard
99aabd9025 Merge pull request #1451 from matrix-org/t3chguy/redundant_thing 
Remove redundant stale onKeyDown
 2017-10-11 14:31:08 +02:00
David Baker
fa24b4bd2d Remove this log - it's not an error worth logging 2017-10-11 09:48:12 +01:00
Stefan Parviainen
581abcb4b7 Consistent subsitution variable in translations 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-11 09:15:24 +02:00
David Baker
92be3af990 Make it clearer which HS you're logging into 
Otherwise there's no indication without clicking 'custom server'
 2017-10-10 19:16:42 +01:00
Michael Telatynski
dbb6f5a44d
i18n the Jump to Read Receipt in MemberInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-07 19:27:49 +01:00
Michael Telatynski
d54cea5429
Add a way to jump to a user's Read Receipt from MemberInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-07 19:25:13 +01:00
Luke Barnard
917957c1dc Modify the group store to include group rooms 
and modify components to use this new part of the store such that feedback can be given
when adding or removing a room from the room list.
 2017-10-05 14:30:04 +01:00
Michael Telatynski
a8231f7bf9
Remove redundant stale onKeyDown 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-05 08:26:57 +01:00
Michael Telatynski
c115980f21
remove redundant&stale onKeyDown 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-05 08:08:39 +01:00
Michael Telatynski
38de4ae152
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-05 08:00:22 +01:00
Michael Telatynski
7492f2dffa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings 2017-10-04 22:35:29 +01:00
Luke Barnard
4017fa7f1d Factor-out GroupStore and create GroupStoreCache 
In order to provide feedback when adding a room to a group, the group summarry store needs to be extended to store the list of rooms in a group. This commit is the first step required.

The next step is to get the GroupRoomList listening to updates from GroupStore and expose the list of rooms from GroupStore.

(We're running out of words to describe the hierachy of things that store things)
 2017-10-04 16:56:35 +01:00
Luke Barnard
ed74ac394b Put related groups UI behind groups labs flag 2017-10-04 14:35:13 +01:00
Luke Barnard
a400c03768 Merge pull request #1447 from matrix-org/luke/feature-flair-related-only 
Restrict Flair in the timeline to related groups of the room
 2017-10-04 14:24:59 +01:00
Luke Barnard
0c6b5776ec Remove commented imports 2017-10-04 14:09:51 +01:00
Luke Barnard
02e7287123 Remove constraint on groups being local, remove logging 2017-10-04 14:08:31 +01:00
Luke Barnard
8d46b19916 Restrict Flair in the timeline to related groups of the room 2017-10-04 14:06:49 +01:00
Luke Barnard
7be5e685f7 Implement UI for editing related groups of a room 
(using the new EditableItemList)
 2017-10-04 13:19:57 +01:00
Luke Barnard
9e3954865a Fix a couple of bugs with EditableItemList 
- fix entering the same thing twice (which had the bug of not emptying the "new" field)
 - fix editing items in the list (which would stack overflow because of typo)
 2017-10-04 13:15:38 +01:00
Luke Barnard
28b8582bd6 Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings 2017-10-04 10:37:45 +01:00
Luke Barnard
4e9694be6d Maintain "blur to add" function to match previous UX 2017-10-04 10:28:26 +01:00
Luke Barnard
407a632a8d Fix typo 2017-10-04 10:26:43 +01:00
Luke Barnard
d25ebfb844 Remove cruft from EIL 2017-10-04 10:15:44 +01:00
Luke Barnard
011aadcb94 Merge pull request #1421 from pafcu/develop 
Add dummy translation function to mark translatable strings
 2017-10-04 10:09:09 +01:00
Luke Barnard
8243c39d83 Factor out EditableItemList from AliasSettings 
Such that we can reuse the same UI elsewhere, namely when editing related groups of a room (which is an upcoming feature).
 2017-10-04 10:00:01 +01:00
Luke Barnard
03581adf85 Merge pull request #1438 from matrix-org/luke/groups-remove-room 
Implement button to remove a room from a group
 2017-10-03 11:45:03 +01:00
Luke Barnard
6b834bc72e Add confirmation dialog for removing room from group 2017-10-03 11:16:22 +01:00
Luke Barnard
0116c4b486 Log the error when failing to removie room from group 2017-10-03 10:14:08 +01:00
Luke Barnard
3e34a460a4 Add error dialog for when removing room fails 2017-10-03 10:12:11 +01:00
Stefan Parviainen
a96169e80e Fix merge conflict 2017-10-02 17:57:22 +02:00
David Baker
b202601d65 Fix showing 3pid invites in member list 2017-10-02 15:10:32 +01:00
Travis Ralston
0e2a1c90d5 Don't suggest grey as a color scheme for a room 
Fixes https://github.com/vector-im/riot-web/issues/5045

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 16:08:50 -06:00
Travis Ralston
20798dd2fa Expose power level setting for widgets 
Fixes https://github.com/vector-im/riot-web/issues/4866

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 15:37:32 -06:00
Travis Ralston
8ee9d39ffa Expose option for m.room.topic power level 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 15:12:05 -06:00
Travis Ralston
8ab3d94c1c Always show common events in the PL section of room settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 15:11:48 -06:00
Travis Ralston
614cf950b6 Supply user-friendly labels for common events 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 14:45:00 -06:00
Travis Ralston
2e1b2178a1 Remove assumptions on how languages work in the power levels section 
This does mean that the strings will need to be re-translated, but now they may be more accurate because the comma is not assumed in the code.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 14:35:49 -06:00
Travis Ralston
415693bd83 Support editing power levels of events. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 14:32:40 -06:00
Travis Ralston
a01387f7a6 Use an AccessibleButton for unpinning from the pane. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:32:25 -06:00
Travis Ralston
0f2fd9f698 Move the PinnedEventsPanel to the react-sdk 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:25:29 -06:00
Luke Barnard
955ca6cd2b Implement button to remove a room from a group 
NB: This doesn't provide any feedback to the user. We should use a GroupSummaryStore-style component to refresh the view after a successful hit to the API. This could affect the summary view as well, because when rooms are removed from a group, they are also removed from the summary (if necessary).
 2017-09-29 17:59:24 +01:00
Travis Ralston
f71e07670d Send toggle handler for the cancel button in the pinned events pane 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 08:56:21 -06:00
Travis Ralston
874d383a8f Add dock for pinned messages at the top of the room 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 08:56:21 -06:00
Travis Ralston
3a58e1c066 Show pinned message changes in the timeline 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 08:56:21 -06:00
Luke Barnard
c8b2158156 Lint 2017-09-29 10:42:23 +01:00
Luke Barnard
18e0d8da86 Rename Flair feature to Groups 2017-09-29 10:27:40 +01:00
Luke Barnard
739ddb8410 Merge branch 'develop' into luke/groups-button 2017-09-28 12:11:26 +01:00
Luke Barnard
6b9a2909df Add rule to enforce spacing in curly brackets in JSX children 
This required an updated in version of eslint-plugin-react to 7.4.0.
 2017-09-28 11:21:06 +01:00
Luke Barnard
38fdd155f0 Construct address picker message using provided validAddressTypes 2017-09-28 10:06:51 +01:00
Luke Barnard
929c8627d3 Add button to get to MyGroups (view_my_groups or path #/groups) 2017-09-27 17:45:49 +01:00
Luke Barnard
f3b6b2cc06 Fix GroupView summary rooms displaying without avatars 
- GroupView can now render with rooms in the summary that do not have an avatar
 - RoomAvatar no longer has a redundant fallback avatar (this is handled by BaseAvatar)
 - RoomAvatar was delinted
 2017-09-27 16:18:15 +01:00
Luke Barnard
d52355f80e Implement adding rooms to a group (or group summary) by room ID 2017-09-27 15:30:58 +01:00
David Baker
2d8bc783b0 Merge pull request #1431 from matrix-org/luke/feature-flair-tooltip 
Give flair avatars a tooltip = the group ID
 2017-09-27 14:44:25 +01:00
Luke Barnard
f528e147e3 Give flair avatars a tooltip = the group ID 2017-09-27 14:36:22 +01:00
Luke Barnard
e3405cfd95 shouldOmitSelf -> includeSelf 2017-09-27 11:52:05 +01:00
Luke Barnard
6bc9b32ab7 Fix ability to feature self in a group summary 
By default the AddressPicker would omit the currently logged-in user. This adds a property to override that to allow "self" to be picked.
 2017-09-27 11:04:41 +01:00
Luke Barnard
1ca9102442 Fix spinner appearing above RP header 
By wrapping the spinner in the mx_MemberList class. Also, use mx_RoomHeader_cancelButton for group settings cancel
 2017-09-27 10:36:44 +01:00
Stefan Parviainen
35cb52febc Fix merge conflict 2017-09-27 08:41:37 +02:00
Luke Barnard
1b12602ea5 Merge branch 'develop' into luke/groups-add-rooms 2017-09-26 17:12:52 +01:00
Luke Barnard
20d65535c0 Use all known rooms instead of public rooms 2017-09-26 17:11:54 +01:00
Luke Barnard
ddab8d7b5c Implement "Add room to group" feature 2017-09-26 14:49:13 +01:00
David Baker
8d0983ab02 Fix group membership publicity 
* Read the new flag in the summary API (the one we were reading
   was actually whether the group server listed you as a member to
   non-members).
 * Remove call to now-dead _loadGroupFromServer andf use the store
   instead
 2017-09-26 14:46:57 +01:00
Robert Swain
24de01e21d AppTile: Test if widgetUrl startsWith instead of has a substring 
The event origin should be at the beginning of the URL.
 2017-09-25 17:14:25 +02:00
Robert Swain
6e49926228 AppTile: Do not test for electron platform 
The method platform method is instead stubbed on all other platforms.
 2017-09-25 17:13:18 +02:00
Robert Swain
b047f1caaa Merge branch 'develop' into rob/electron-screensharing 2017-09-25 17:02:30 +02:00
David Baker
2ab860f487 Merge pull request #1427 from matrix-org/luke/feature-flair-cache-bust 
Bust the flair caches after 30mins
 2017-09-25 15:39:06 +01:00
Luke Barnard
20c731f627 Bust the flair caches after 30mins 
Group profile data and the groups a user has publicised will be removed from the cache 30mins after retrieval.

There may be some benefits to caching the group profiles for longer than the group memberships but for now they're naively busted after the same 30mins.
 2017-09-25 15:21:56 +01:00
David Baker
d9c2f6e610 Merge pull request #1426 from matrix-org/dbkr/profile_in_group_member_info 
Show displayname / avatar in group member info
 2017-09-25 15:14:30 +01:00
David Baker
0b96871be4 Lint 2017-09-25 15:07:02 +01:00
David Baker
af2df77b8e Merge pull request #1418 from matrix-org/luke/groups-summary-store 
Create GroupSummaryStore for storing group summary stuff
 2017-09-25 14:59:32 +01:00
Luke Barnard
e42e7bd3ad Merge pull request #1419 from matrix-org/dbkr/publicity_toggle 
Add status & toggle for publicity
 2017-09-25 14:52:57 +01:00
David Baker
58ec732fb3 Add width/height/resizeMethod params 2017-09-25 14:51:21 +01:00
Luke Barnard
1bd200f1b1 Merge pull request #1417 from matrix-org/dbkr/member_list_show_more 
MemberList: show 100 more on overflow tile click
 2017-09-25 14:50:33 +01:00
Luke Barnard
83e6218930 Remove listeners from group summary store on unmount 2017-09-25 14:49:12 +01:00
Luke Barnard
8e7d58797d _loadGroupFromServer -> _initGroupSummaryStore 2017-09-25 14:48:49 +01:00
David Baker
5b312ffb03 Show displayname / avatar in group member info 2017-09-25 14:38:43 +01:00
David Baker
1a82f121c0 lint 2017-09-25 13:17:07 +01:00
Richard van der Hoff
e2f8bb2ec0 Fix NPE in MemberList 
_getChildCountInvited would throw an NPE if invoked before the js-sdk had found
the room. Make sure we initialise the state correctly.
 2017-09-25 10:25:21 +01:00
Luke Barnard
b8dca58f4f Pass matrixClient as an argument to GSS constructor 2017-09-25 10:02:13 +01:00
Stefan Parviainen
2b5b708057 Translate unknown presence label 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-24 10:14:04 +02:00
Stefan Parviainen
dbae5a66e3 Use translation in img alt text 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-24 09:43:52 +02:00
Stefan Parviainen
14bce1119c Make theme names translatable 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 21:36:10 +02:00
Stefan Parviainen
f2f5302a7b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-09-23 09:47:51 +02:00
Stefan Parviainen
cc441f42f9 Some more translatable strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 09:02:51 +02:00
Stefan Parviainen
d4929b558e Add dummy translation function to mark translatable strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-22 21:43:27 +02:00
Michael Telatynski
6d530eeb6e
apply i18n _t to string which has already been translated 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-22 20:04:04 +01:00
David Baker
af73f1c3bb Add status & toggle for publicity 
This doesn't work at the moment because it looks like it's broken
in synapse as per https://github.com/matrix-org/sytest/pull/391

But if it did work, the client side code might look something
like this.
 2017-09-22 19:27:02 +01:00
Luke Barnard
791bc5e7ac Create GroupSummaryStore for storing group summary stuff 
- Acts as a layer between GroupView and the group APIs that modify the summary individually. This allows for abstraction of getting the new summary once a successful API hit has been done.
 - The plan is to also control the avatar, topic, body of the summary via the same class
 2017-09-22 18:52:06 +01:00
David Baker
5004d90a3a Merge remote-tracking branch 'origin/develop' into dbkr/member_list_show_more 2017-09-22 18:03:16 +01:00
David Baker
de43972881 Merge pull request #1416 from matrix-org/dbkr/truncatedlist_invite 
Make the invite section a truncatedlist too
 2017-09-22 18:02:44 +01:00
David Baker
25da0f6a7a MemberList: show 100 more on overflow tile click 
Not the full list because on HQ that causes your browser to implode.

This should really be a decent paginated list at this point, but this is better
for now.
 2017-09-22 17:01:14 +01:00
David Baker
9cbfc22352 Make the invite section a truncatedlist too 
For uniformity and to speed up rooms like HQ with have a lot of
lingering invites.
 2017-09-22 16:50:54 +01:00
Luke Barnard
4c1a85cb71 Merge pull request #1415 from matrix-org/luke/groups-remove-featured-rooms-and-users 
Implement removal function of features users/rooms
 2017-09-22 16:32:40 +01:00
David Baker
a868fa4be9 Merge pull request #1412 from matrix-org/dbkr/truncatedlist_experiment 
Allow TruncatedList to get children via a callback
 2017-09-22 16:25:45 +01:00
Luke Barnard
3f9d20de97 Implement removal function of features users/rooms 
With the appeareance of a "X" in the top right of each featured item when editing.

NB: No reloading of summary is done after adding/removing a user/room. The plan is to better than threading a callback all the way down.
 2017-09-22 15:56:35 +01:00
David Baker
621a108b5e Use flow style function definition for doc 2017-09-22 15:15:10 +01:00
David Baker
dba48e2f8f use start, end rather than min, max 2017-09-22 15:07:45 +01:00
David Baker
0f9f1c85a8 Remove done todo 2017-09-22 14:58:49 +01:00
David Baker
4a36e32c8d Show displayname & avatar url in group member list 2017-09-22 14:52:52 +01:00
David Baker
f1a2b6d327 lint 2017-09-22 13:35:49 +01:00
David Baker
16398fbfc2 Allow TruncatedList to get children via a callback 
And update MemberList to use it as such. This means that the parent
only needs to make react elements for the elements that will
actually be rendered, rather than all of them.

In practive this doesn't make a huge difference as making React
elements is fairly fast, but experimentally (with all profiling
turned on), MemberList went from 25ms in the constructor and
81ms in render to 38ms in constructor but sub 1ms render for
Matrix HQ.
 2017-09-22 13:15:02 +01:00
David Baker
29d8df2c9e De-lint TruncatedList 2017-09-22 10:00:46 +01:00
Luke Barnard
c19ee66565 Merge pull request #1408 from matrix-org/luke/groups-membership-section-redesign 
Redesign membership section in GroupView
 2017-09-21 17:49:47 +01:00
Luke Barnard
3351770b54 Fix dodgy merge 2017-09-21 17:26:16 +01:00
Luke Barnard
d75efb83f1 Merge branch 'develop' into luke/groups-membership-section-redesign 2017-09-21 17:25:12 +01:00
Luke Barnard
cf23ac5931 Merge branch 'develop' into luke/groups-add-feature-rooms 2017-09-21 17:20:12 +01:00
David Baker
3c2e6fdf9e Honour the is_privileged flag in GroupView 2017-09-21 16:55:56 +01:00
Luke Barnard
5f840a3031 Implement adding rooms to the group summary 
This includes making UserPickerDialog more generic such that it can also pick rooms from groups.
 2017-09-21 16:53:10 +01:00
David Baker
add91f9a7d Update when a group arrives 2017-09-21 16:28:49 +01:00
David Baker
5940b11fd2 Merge pull request #1404 from matrix-org/luke/feature-flair-click-for-group 
Implement `view_group` dispatch when clicking flair
 2017-09-21 15:18:28 +01:00
Luke Barnard
16f5a667c6 Redesign membership section in GroupView 2017-09-21 15:03:30 +01:00
Luke Barnard
41a9ff22fb Rename profile object properties to camelCase 
Also, add correct PropTypes for FlairAvatar
 2017-09-21 14:22:43 +01:00
David Baker
60d444b841 Merge pull request #1402 from matrix-org/luke/groups-add-featured-rooms-and-users 
GroupView: Add a User
 2017-09-21 14:19:58 +01:00
Luke Barnard
e64cc3b666 Implement view_group dispatch when clicking flair 2017-09-21 13:25:36 +01:00
Luke Barnard
3f0e596e97 Only show "Add" button when editing the group 2017-09-21 12:44:17 +01:00
Luke Barnard
4d9c43b3c8 Display dialog when errors occur whilst featuring users 2017-09-21 12:34:16 +01:00
Luke Barnard
9cd4cdf6df Filter group users results based on query 2017-09-21 10:52:28 +01:00
Luke Barnard
03ddb63507 Remove redundant slice 2017-09-21 10:34:11 +01:00
Luke Barnard
515222c25f Track action button click event 2017-09-20 17:16:49 +01:00
Luke Barnard
7ef55946da Fix console error log statement 2017-09-20 17:04:05 +01:00
Luke Barnard
5471431ee5 Disable "Add a Room" button for when we have a room picker 2017-09-20 17:02:20 +01:00
Luke Barnard
adf0a79585 Implement avatar, displayname for featured users 
Profile data has been added to the API response for users in the group summary
 2017-09-20 16:54:12 +01:00
Luke Barnard
1c1bf82c2a Add users to group summary using new API 2017-09-20 16:32:02 +01:00
Luke Barnard
44c38652ab Implement UserPickerDialog for adding users 
Also, use AccessibleButtons.
 2017-09-20 15:44:42 +01:00
Luke Barnard
1c6cecbd43 Add "Add a User/Room" buttons and always display default lists 2017-09-20 14:41:29 +01:00
David Baker
6ad4ba767b Merge pull request #1401 from matrix-org/luke/fix-separate-sender-profile 
Separate sender profile into elements with classes
 2017-09-19 17:21:52 +01:00
Luke Barnard
979b580e1f Merge branch 'develop' into luke/fix-ugly-integ-button 2017-09-19 17:04:06 +01:00
Luke Barnard
e2ae6e6235 Separate sender profile into elements with classes 
For separate CSS manipulation so that we can vary opacity independently for flair/name/aux
 2017-09-19 16:56:14 +01:00
Luke Barnard
668e096194 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-09-19 16:36:51 +01:00
Luke Barnard
7414d4d1f9 Fix issue with "props.aux" being inserted instead of e.g. "sent an image" 2017-09-19 16:36:30 +01:00
David Baker
80e0205b78 Fix promise error in flair 
Import bluebird other wise it gets a native promise on my dev box
which does not have a finally method
 2017-09-19 15:53:54 +01:00
Luke Barnard
5295d7f058 Merge branch 'develop' into luke/feature-flair 2017-09-19 14:55:54 +01:00
Luke Barnard
e9fb5712bd Merge branch 'develop' into dbkr/group_userlist 2017-09-19 13:26:55 +01:00
Luke Barnard
61a0f1ef67 Fix ugly integration button, use hover to show error 
This simplifies the implementation of the button but also adjusts the appeareance such that a warning triangle appears in the top-right of button if an error has occured. The error popup will now appear when hovering over the button (with related CSS).
 2017-09-19 11:57:23 +01:00
David Baker
658285ebbf Merge pull request #1396 from matrix-org/dbkr/3pid_invite_update_when_joined 
Fix RoomView stuck in 'accept invite' state
 2017-09-19 10:34:39 +01:00
Luke Barnard
241d442284 Fail gracefully for non-supporting servers 2017-09-18 15:12:38 +01:00
Luke Barnard
6add06db44 Fix big with rejecting promises upon error 2017-09-18 15:11:49 +01:00
Luke Barnard
26941e994f Merge branch 'develop' into luke/feature-flair 2017-09-18 14:46:50 +01:00
Luke Barnard
3476cfca79 getPublicGroups->getPublicisedGroups 
To match dbkrs js-sdk wrappers for flair: matrix-org/matrix-js-sdk/pull#542
 2017-09-18 14:44:35 +01:00
Luke Barnard
548e5f516c Put flair into labs 2017-09-18 14:38:41 +01:00
Luke Barnard
caaf5cca14 Only show the integ management button if user is joined 2017-09-18 13:34:33 +01:00
Matthew Hodgson
09e6ea00c5 Merge pull request #1273 from matrix-org/t3chguy/hide_chevron_memberlist_3pid_notarget 
suppressOnHover for member entity tiles which have no onClick
 2017-09-17 23:19:35 +01:00
Matthew Hodgson
141ae916ce Merge pull request #1387 from turt2live/travis/tooltip_redacter 
Show who redacted an event on hover
 2017-09-17 22:36:18 +01:00
Matthew Hodgson
b06d540f4c Merge pull request #1388 from matrix-org/t3chguy/start_mels_expanded 
start MELS expanded if it contains a highlighted/permalinked event.
 2017-09-17 22:09:44 +01:00
Matthew Hodgson
6a53b7b149 Merge pull request #1389 from turt2live/travis/ignored_users 
Add ignore user API support
 2017-09-17 22:05:02 +01:00
Travis Ralston
2605004edb Update ignored users when js-sdk on UserSettings on change 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-17 15:04:03 -06:00
Matthew Hodgson
bc565ba925 Merge pull request #1392 from turt2live/travis/no_emoji 
Add option to disable Emoji suggestions
 2017-09-17 21:40:43 +01:00
David Baker
c265ec9571 Fix RoomView stuck in 'accept invite' state 
After accepting a 3pid invite.

Rather than clear the joining flag when the join request completes,
leave it so the RoomView can see that we're expecting the user to
be joined in the various stages that might go through (waiting for
join request, waiting for room object, waiting for 'joined' member
event). The problem in this case was that we had to wait a bit for
the last one, and there was no bit of state to represent it.

This hopefully also makes the logic somewhat simpler.

Fixes https://github.com/vector-im/riot-web/issues/5041
 2017-09-15 15:07:09 +01:00
turt2live
b2de016b35 Add option to disable Emoji suggestions 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-14 21:28:12 -06:00