Stefan Parviainen
df6d5cc2b4
Pass plain components, rather than functions returning them
2017-11-14 20:09:52 +01:00
Stefan Parviainen
3afbaf61e7
Refactor i18n stuff a bit
2017-11-13 20:19:33 +01:00
Travis Ralston
c5c346f0b7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:18:41 -07:00
David Baker
0659ac1ccb
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-13 17:45:57 +00:00
Luke Barnard
52af7a7659
Attempt to clarify the affect that the users_default has on power levels
...
This modifies displayed power levels such that:
- If users_default is !== 0:
- the power level 0 is displayed as "Restricted (0)"
- the power level users_default is displayed as "Default ({users_default})"
- Otherwise:
- the power level 0 is displayed as "Default (0)"
When changing users_default, to say, 10, when the textual powers are rendered
again, they will take users_default into account. So those previously at 10
and which would have previously have been rendered "Custom of 10" will now
read "Default (10)". Conversely, those that were "Default (0)" will now read
"Restricted (0)".
2017-11-13 17:03:48 +00:00
Luke Barnard
853d33a93a
Make groups a fully-fleged baked-in feature
2017-11-10 15:42:11 +00:00
David Baker
b1ec430523
Remove now-unused dispatches
2017-11-09 16:09:12 +00:00
Travis Ralston
f7da5836e1
Make blacklistUnverifiedDevices override the level order
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-08 17:41:32 -07:00
Travis Ralston
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
Luke Barnard
d777e370f2
Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing
...
Disable RoomDetailList in GroupView when editing
2017-11-07 18:53:04 +00:00
Travis Ralston
e0ddd88ec9
Default to no read pins if there is no applicable account data
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 11:14:27 -07:00
Matthew Hodgson
e14e0bf200
Merge pull request #1486 from turt2live/travis/pinned-notice
...
Add a small indicator for when a new event is pinned
2017-11-07 17:56:12 +00:00
Luke Barnard
80d4873542
Disable RoomDetailList in GroupView when editing
...
Otherwise the rooms can be clicked on.
2017-11-07 16:54:28 +00:00
Travis Ralston
142d23a099
Cap the read pin event IDs to 10
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 09:16:19 -07:00
Luke Barnard
47bf991471
Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills
...
Room notifs in autocomplete & composer
2017-11-07 10:25:48 +00:00
David Baker
df5c6470e8
get dict syntax right
2017-11-06 22:01:23 +00:00
David Baker
029853d379
Merge pull request #1578 from matrix-org/luke/groups-admin-badges
...
Indicate admins in the group member list with a sheriff badge
2017-11-06 17:16:34 +00:00
David Baker
08d006d112
PR feedback
2017-11-06 17:15:09 +00:00
Luke Barnard
d6a6e59d6c
Indicate admins in the group member list with a sheriff badge
2017-11-06 16:37:16 +00:00
David Baker
adc4290451
Pillify room notif pills in composer
2017-11-06 15:11:42 +00:00
Richard Lewis
f1db564506
Merge pull request #1533 from anoadragon453/develop
...
Remember whether widget drawer was hidden per-room
2017-11-06 14:29:25 +00:00
Travis Ralston
ef45d82ec6
Fix URL preview save calls
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:20 -07:00
Travis Ralston
b75be41f94
Fix split-brain for blacklistUnverifiedDevices
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:06 -07:00
Travis Ralston
cb17c0a379
Migrate blacklistUnverifiedDevicesPerRoom
...
This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:15:55 -07:00
Travis Ralston
8282534f87
Add SettingsLevel enum; Move settings to own file.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 23:19:45 -06:00
Travis Ralston
893c39bfbe
Merge branch 'develop' into travis/granular-settings
2017-11-03 22:00:07 -06:00
Travis Ralston
de6fc32a87
Show an indicator when there are any pins in the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 20:00:48 -06:00
Travis Ralston
a2b7f6d30e
Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice
2017-11-03 19:57:39 -06:00
Travis Ralston
5c37155730
Don't assume we have a valid event.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 18:18:09 -06:00
Travis Ralston
3656fdb571
Store read pinned events as an array to avoid racing saves.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 18:12:57 -06:00
Luke Barnard
58f1757f0c
Handle rooms with no aliases or canonical alias
2017-11-03 17:52:36 +00:00
Luke Barnard
98312a4647
Use, if possible, a room's canonical or first alias when viewing the room
...
(Only affects rooms the user has never joined)
2017-11-03 17:37:13 +00:00
David Baker
43a23d7e89
Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room
...
Give autocomplete providers the room they're in
2017-11-03 14:29:59 +00:00
Luke Barnard
151f9917b1
Fix group invites such that they look similar to room invites
...
- Change GroupInviteTile to use RoomTile CSS
- Give group invites their own sub list, with heading "Community Invites"
2017-11-03 12:19:37 +00:00
David Baker
843d797ded
Better type checking
2017-11-02 18:17:57 +00:00
David Baker
7f9967389d
Pass room into Autocompleter
2017-11-02 18:15:26 +00:00
David Baker
498b117d5a
copyrights
2017-11-02 18:01:28 +00:00
David Baker
4953d4de4d
Give autocomplete providers the room they're in
...
Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider.
2017-11-02 17:51:08 +00:00
Luke Barnard
e909d859ab
Merge branch 'develop' into luke/groups-room-info
2017-11-02 10:56:33 +00:00
Luke Barnard
0dcd52d88f
Fix some react warnings firing
2017-11-01 17:12:22 +00:00
Travis Ralston
6f8523081b
Some documentation
...
Far from complete, and probably needs a bit of work, but it's a start.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-30 21:09:24 -06:00
Travis Ralston
0d3f0eaf98
Convert local settings to granular settings
...
This breaks language selection.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 16:53:00 -06:00
Travis Ralston
ae10a11ac4
Convert synced settings to granular settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:43:52 -06:00
Travis Ralston
bf815f4be9
Support labs features
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 20:21:50 -06:00
Stefan Parviainen
95b2392104
Merge branch 'develop' into departify
2017-10-27 19:23:13 +02:00
Andrew (anoa)
b4868a6846
showWidget->hideWidgetDrawer and remove logs
...
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-26 11:27:58 -07:00
Michael Telatynski
1d5b4a9d50
Merge branch 'develop' into t3chguy/mention_user
2017-10-26 18:10:10 +01:00
Luke Barnard
eec6ed36cd
Use correct icon for group room deletion and make themeable
...
Also fix cancel icons to have class mx_filterFlipColor
2017-10-26 14:05:58 +01:00
Travis Ralston
e773585a02
Merge remote-tracking branch 'matrix-org/develop' into travis/presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:21:39 -06:00
Stefan Parviainen
53e983f9c7
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
Michael Telatynski
fd7e057ec0
Merge branch 'develop' into t3chguy/invite_in_memberinfo
2017-10-25 16:33:50 +01:00
David Baker
8ed3474b64
Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists
...
Only show editing UI for aliases/related_groups for users /w power
2017-10-25 15:52:51 +01:00
Luke Barnard
39fa866d68
Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui
...
Swap from `ui_opacity` to `panel_disabled`
2017-10-25 15:47:18 +01:00
Luke Barnard
b1f2a6c1e9
Dramatically simplify use of mx_fadable
...
by applying it to parent elements of things that need to be faded.
2017-10-25 15:15:49 +01:00
Michael Telatynski
f3c8951d4e
remove unused lastPresenceTs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 12:56:23 +01:00
Luke Barnard
2f8f2ce76e
Swap from ui_opacity
to panel_disabled
...
to simplify the process of disabling panels in the UI.
2017-10-25 11:23:51 +01:00
Michael Telatynski
b3463146ba
Add invite button to MemberInfo if user has left or wasn't in room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 01:00:13 +01:00
Andrew (anoa)
9821f0d459
Fix linting
...
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-24 16:42:06 -07:00
Andrew (anoa)
f032284eff
Remember whether widget drawer was hidden per-room
...
Fixes #4850
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-24 16:28:10 -07:00
Michael Telatynski
5514d81683
Add Mention button to MemberInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 23:01:40 +01:00
Michael Telatynski
c896dfb17b
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 22:21:33 +01:00
Michael Telatynski
f813a752e7
only show change power level option in MemberInfo if we can actually
...
send m.room.power_level AND are lower PL than them
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 22:12:48 +01:00
Stefan Parviainen
4ff369c884
Merge branch 'develop' into departify
2017-10-24 18:27:24 +02:00
Luke Barnard
ee7ebc425c
Only show editing UI for aliases/related_groups for users /w power
2017-10-24 16:19:09 +01:00
Luke Barnard
e419446081
Add fields needed by RoomDetailList to groupRoomFromApiObject
...
and also alter props API for RDL to match the returned rooms.
(This doesn't affect RoomDirectory - this does not use RDL (yet))
2017-10-24 10:13:38 +01:00
Stefan Parviainen
115772d526
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-23 19:57:52 +02:00
Stefan Parviainen
fc860c66bc
De-partify RoomPreviewBar
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-17 22:03:49 +02:00
Stefan Parviainen
8083dccfa5
De-partify SenderProfile
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
Also, text does not need to be EmojiText
2017-10-16 20:53:43 +02:00
Luke Barnard
47ac0988ba
Refactor class names for an entity tile being hovered over
2017-10-16 16:31:13 +01:00
David Baker
e4a3309752
Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
...
Modify GroupView UI
2017-10-16 10:17:44 +01:00
Travis Ralston
4f6cd6b23a
Add a small indicator for when a new event is pinned
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-15 21:17:43 -06:00
Stefan Parviainen
ad2f54f8ab
Fix italics and parens
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-15 18:01:57 +02:00
Stefan Parviainen
15d1dc1f3b
Fix indentation
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-15 16:57:22 +02:00
Stefan Parviainen
9a5cffb5eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into departify
2017-10-15 16:49:27 +02:00
Travis Ralston
854394cb2e
Merge branch 'develop' into travis/presence
2017-10-14 18:49:58 -06:00
Matthew Hodgson
1d75d9e90d
yet more horrifically strict linting :/
2017-10-15 01:47:11 +01:00
Matthew Hodgson
635996c083
more bizarrely strict linting :/
2017-10-15 01:19:06 +01:00
Matthew Hodgson
247e32115f
bizarrely strict linting :/
2017-10-15 01:13:52 +01:00
Matthew Hodgson
2b367edccf
Merge pull request #1439 from turt2live/travis/pinned_messages
...
Message/event pinning
2017-10-15 01:03:18 +01:00
Travis Ralston
49c19bc9b4
Merge branch 'develop' into travis/presence
2017-10-14 17:26:54 -06:00
Matthew Hodgson
e57d9e686b
Merge branch 'develop' into t3chguy/jump_to_rr
2017-10-14 23:45:17 +01:00
Travis Ralston
8a641c7173
Hide message pinning behind a labs setting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:40:10 -06:00
Travis Ralston
c34b55c6c7
Merge branch 'develop' into travis/pinned_messages
2017-10-14 16:10:32 -06:00
Matthew Hodgson
3efa0d2a76
Merge pull request #1478 from turt2live/travis/unset-avatar
...
Buttons to remove room/self avatar
2017-10-14 22:13:32 +01:00
Travis Ralston
6cd07731c4
Add MemberPresenceAvatar and control presence ourselves
...
Includes rudimentary support for custom statuses and user-controlled status. Some minor tweaks have also been made to better control how we advertise our presence.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 14:37:47 -06:00
Michael Telatynski
b0b7472901
undo bad merge
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:14:57 +01:00
Michael Telatynski
e79f9ef011
=== > ==
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:10:51 +01:00
Michael Telatynski
6ad8532bed
lowerCase query so that searching for Erik
will actually find Erik
..
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:09:58 +01:00
Michael Telatynski
a000439948
pass search query to filter fn in _updateList
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:09:30 +01:00
Travis Ralston
e5c8e3e7ad
Add option to unset room avatar
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 20:57:15 -06:00
Stefan Parviainen
a84b42bf24
Departify RoomSettings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-13 21:10:50 +02:00
Luke Barnard
6f20445a42
Explain topic click stopPropagation
2017-10-13 17:57:28 +01:00
Luke Barnard
77418f535e
Modify GroupView UI
...
- Remove featured users/rooms
- Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
- Make the group view body scrollable
2017-10-13 16:46:33 +01:00
Stefan Parviainen
9495ccdbb5
Don't hardcode ConfirmUserActionDialog title
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-12 22:15:53 +02:00
Stefan Parviainen
1f44233e05
Better translations in RoomList.js
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-12 21:24:45 +02:00
David Baker
047daec587
Merge pull request #1468 from matrix-org/dbkr/labs_config
...
enable/disable features in config.json
2017-10-12 18:38:18 +01:00
David Baker
e50478aa1d
enable/disable features in config.json
...
As per https://docs.google.com/document/d/1Kn-mz2dDce9Cqc4oUTl5yJXGvmTlky1_KezuwUg58x0/edit#
Replaces:
* enableLabs setting
* 'override' flag in labs
* 'default' flag in labs
Un-feature-flags matrix apps since this was now overidden to be
enabled.
2017-10-12 17:03:38 +01:00
Luke Barnard
36bb8b7dc4
Fix bug that inserted emoji when typing
...
This was quite simple in the end -- the mouse doens't move, but on some browsers, the autocomplete appearing beneath the mouse would cause the `onMouseOver`, which is not `onMouseMove`.
The fix was to use `onMouseMove`.
Fixes vector-im/riot-web#4974
2017-10-12 11:31:31 +01:00
Luke Barnard
d3f9a3aeb5
Run eslint --fix
...
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
2017-10-11 17:56:17 +01:00
Luke Barnard
8958be9321
Merge pull request #1441 from turt2live/travis/who_banned
...
Show who banned the user on hover
2017-10-11 17:33:53 +02:00
Travis Ralston
8a2813ac08
Fallback to MXID instead of relying on the user being in the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 09:08:40 -06:00
Travis Ralston
d1fdd20809
Show who banned the user on hover
...
Fixes https://github.com/vector-im/riot-web/issues/5039
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 09:08:29 -06:00
Travis Ralston
0ab5b1a6af
_td translatable strings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 08:50:28 -06:00
Travis Ralston
f874fc1203
Merge branch 'develop' into travis/pl_enhancements
2017-10-11 08:42:45 -06: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
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
ed74ac394b
Put related groups UI behind groups labs flag
2017-10-04 14:35:13 +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
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
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
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
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
Stefan Parviainen
35cb52febc
Fix merge conflict
2017-09-27 08:41:37 +02: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
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
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
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
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
David Baker
dba48e2f8f
use start, end rather than min, max
2017-09-22 15:07:45 +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
add91f9a7d
Update when a group arrives
2017-09-21 16:28:49 +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
26941e994f
Merge branch 'develop' into luke/feature-flair
2017-09-18 14:46:50 +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
turt2live
2e72d6cd7c
Hide events that were sent by ignored users
...
This code only kicks in if the user was ignored after an event was sent. The homeserver should prevent other events from coming in.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:16:56 -06:00
Travis Ralston
3889df6b08
Add (un)ignore button to MemberInfo
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 19:42:09 -06:00
David Baker
5087da9247
Merge remote-tracking branch 'origin/develop' into luke/feature-flair
2017-09-13 16:52:12 +01:00
David Baker
3c3328c5f1
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-09-13 16:34:39 +01:00
David Baker
8abd35f581
Remove spurious cancel button
...
That appeared if you clicked on a room from the room directory
(it didn't do anything). It's only supposed to be shown when
editing room settings.
2017-09-12 15:48:13 +01:00
David Baker
757bc9fe32
Update roomlist when an event is decrypted
...
Events are now decrypted asynchronously, so are not decrypted
at the time of the Room.timeline which is when our RoomList
got the chance to update. It needs to update once the event has
been decrypted.
Ideally we would not update the whole room list order, but this is
how all the room list re-ordering happens right now, so staying
consistent with this.
Fixes https://github.com/vector-im/riot-web/issues/5020
2017-09-12 14:47:26 +01:00
David Baker
be8f0991a6
Avoid re-rendering RoomList on room switch
...
Introduce a class that consumes updates from the RoomViewStore and
announces to listeners if the active room ID is now or is no longer
the room ID they specified. Naming suggestions welcome: it's
currently called ActiveRoomObserver.
Avoids passing the selectedRoomId down from MatrixChat all the way
through the LeftPanel / RoomList / RoomSubList to the RoomTiles.
Also introduce a CallPreview class that listens directly for
RoomViewStore changes as the call preview in the left panel needs
to know when the room changes, so this allows this component to
update without having to update the entire left panel.
2017-09-11 16:59:09 +01:00
David Baker
9efa604706
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-30 17:39:47 +01:00
Luke Barnard
ebc1993530
Implement Flair
...
Add 14x14 group avatars next to sender profiles.
2017-08-30 11:10:49 +01:00
Richard van der Hoff
b9e047f0ff
Avoid breaking /sync with uncaught exceptions
...
For reasons I don't fully understand, it appears that sometimes the
ReadReceiptMarker has no offsetParent. Rather than dying with an uncaught
exception when that happens (and taking out half of React as well as the /sync
handler), log a warning and suppress the animation.
2017-08-30 10:01:45 +01:00
David Baker
d86fe0df6e
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-29 13:29:55 +01:00
Michael Telatynski
9658efd6d7
add comment and remove redundant logic
2017-08-28 01:04:18 +01:00
Michael Telatynski
21af3fe189
modularize and invert logic, so banned etc will count as left
2017-08-28 00:46:28 +01:00