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

2812 commits

Author SHA1 Message Date
Luke Barnard
e89371fb1c Add click-to-open-settings functionality to GroupAvatar 2017-10-23 14:54:57 +01:00
Matthew Hodgson
f09fbccc19 WIP 2017-10-23 00:56:15 +01:00
David Baker
cbb36f4780 Lint 2017-10-19 17:31:06 +01:00
David Baker
b9574ff382 Group create dialog: only enter localpart 
Since we currently can only create groups on the local server anyway,
there's no point making the user jump through the hoop of forming the
whole group ID and telling them off if they got the server name wrong.
 2017-10-19 16:47:43 +01:00
David Baker
19173ab4d6 Space, man. 2017-10-19 16:31:45 +01:00
David Baker
4abaa93cf0 Add clientside error for non-alphanumeric group ID 2017-10-19 16:28:02 +01:00
Luke Barnard
ea1dbe1f76 Fix invites to groups without names 2017-10-19 15:47:52 +01:00
Luke Barnard
2be0ebdd1d More Groups->Communities 2017-10-19 15:01:16 +01:00
Luke Barnard
fd65cb1396 Merge pull request #1501 from matrix-org/luke/groups-are-communities 
Groups -> Communities
 2017-10-19 12:16:15 +01:00
Luke Barnard
71443e9b94 Remove logs comments 2017-10-19 10:34:24 +01:00
Luke Barnard
5f3c06b38a Factor out Flair cache into FlairStore 
This will make invalidating the userGroups cache for the user architecturally more sound (the plan is to have GroupStore hit FlairStore as opposed to Flair itself in order to invalidate the cache).
 2017-10-19 10:28:59 +01:00
Luke Barnard
a40704f085 Merge branch 'develop' into luke/groups-are-communities 2017-10-18 15:57:37 +01:00
Stefan Parviainen
7eeed3e093 Simplify MemberEventListSummary by using pluralization provided by the i18n library 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-17 23:46:23 +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
468a05c6f1 Fix SenderProfile 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-17 21:32:35 +02:00
Luke Barnard
1b8c5b50db Don't show room IDs when picking rooms 2017-10-17 18:02:35 +01:00
Luke Barnard
85d99d429d Use correct logic operator 2017-10-17 09:49:39 +01: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
14eee9a37a Only show invited section if there are invited group members 2017-10-16 17:59:53 +01:00
Luke Barnard
0c34e943fb Merge branch 'develop' into luke/groups-are-communities 2017-10-16 17:34:06 +01:00
Luke Barnard
760b3cc60a Merge pull request #1488 from matrix-org/luke/groups-invited-users 
Show "Invited" section in the user list
 2017-10-16 18:29:15 +02:00
Luke Barnard
9b08f4d11f Separate fetching indicator state 2017-10-16 17:21:05 +01:00
Luke Barnard
008e8d4f54 Show "Invited" section in the user list 2017-10-16 16:38:32 +01:00
Luke Barnard
47ac0988ba Refactor class names for an entity tile being hovered over 2017-10-16 16:31:13 +01:00
Luke Barnard
eaa5dd5f22 Groups -> Communities in the UI 
Translation files still need updating, and this would be much simpler with a script that could automate the tedium
 2017-10-16 13:18:39 +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
7307bc412f Respond to updates from presence context menu 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 23:16:12 -06:00
Travis Ralston
c483717282 Make onClick be a context menu for presence 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 21:44:07 -06:00
Travis Ralston
788e16a716 Linting 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 20:23:50 -06:00
Travis Ralston
0b20681f6a Put presence management behind a labs setting 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 19:13:46 -06: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
Matthew Hodgson
f32ba0b54c Merge pull request #1462 from pafcu/translation-fixes 
Use standard subsitution syntax in _tJsx
 2017-10-14 23:43:12 +01:00
Matthew Hodgson
71d25bf787 Merge pull request #1442 from turt2live/travis/no_grey 
Don't suggest grey as a color scheme for a room
 2017-10-14 23:41:32 +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
Matthew Hodgson
0284a582a1 Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist 
T3chguy/fix memberlist
 2017-10-14 22:09:55 +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
c1edc0c32e
add option to disable BigEmoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 19:40:45 +01: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
6e7f0d649b Add option to unset your own avatar 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 21:13:47 -06: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
Stefan Parviainen
3b91ada4c8 Departify sending emails and text messages 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-13 20:44:01 +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
45137f030b Fix merge conflict 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-12 22:18:50 +02: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
Stefan Parviainen
f694fb24ff Fix merge-conflict 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-11 20:02:14 +02: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
Luke Barnard
d2b9fcc7aa Merge pull request #1440 from turt2live/travis/pl_enhancements 
Enhancements to room power level settings
 2017-10-11 17:31:20 +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
Luke Barnard
21a31b02d0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-10-11 16:02:10 +01:00
Luke Barnard
060bf3bdf6 Remove inline CSS 2017-10-11 16:02:01 +01: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
Luke Barnard
ffb9dd844a Merge pull request #868 from psaavedra/set_default_federate_by_settings 
Added TextInputWithCheckbox dialog
 2017-10-11 16:28:03 +02:00
Luke Barnard
f6eca14bee Merge pull request #1456 from matrix-org/dbkr/say_which_homeserver 
Make it clearer which HS you're logging into
 2017-10-11 15:11:22 +02:00
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
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
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
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
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
David Baker
5b312ffb03 Show displayname / avatar in group member info 2017-09-25 14:38:43 +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
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
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
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
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
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
cf23ac5931 Merge branch 'develop' into luke/groups-add-feature-rooms 2017-09-21 17:20:12 +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
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
9cd4cdf6df Filter group users results based on query 2017-09-21 10:52:28 +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
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
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
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
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
Michael Telatynski
f612b1933b
start MELS expanded if it contains a highlighted/permalinked event. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-14 17:53:47 +01:00
turt2live
8dc2604d63 Show who redacted an event on hover 
This should fix #3931 although it's not obvious who actually performed the redaction.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-14 09:03:05 -06:00
Matthew Hodgson
bb8538cd1a Merge pull request #1381 from matrix-org/dbkr/remove_spurious_cancel_button 
Remove spurious cancel button
 2017-09-14 10:38:26 +01: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
081a900524 Merge pull request #1363 from matrix-org/t3chguy/on_copy_tooltip 
respond on copy code block
 2017-09-13 14:27:35 +01:00
Michael Telatynski
fea7af11b4
Merge remote-tracking branch 'origin/t3chguy/on_copy_tooltip' into t3chguy/on_copy_tooltip 2017-09-13 14:18:56 +01:00
Michael Telatynski
d3bfdf495c
initialize value with false to prevent undefined. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-13 14:18:31 +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
Robert Swain
aa82be1fb1 Merge branch 'develop' into rob/electron-screensharing 2017-09-12 10:54:20 +02:00
David Baker
3c70b86668 Merge pull request #1375 from matrix-org/dbkr/active_room_observer 
Avoid re-rendering RoomList on room switch
 2017-09-11 18:52:09 +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
Michael Telatynski
0580d536ad Merge branch 'develop' into t3chguy/on_copy_tooltip 2017-09-10 18:54:52 +01:00
David Baker
7617788345 Merge pull request #1372 from matrix-org/dbkr/emoji_fast_path 
Fast path for emojifying strings
 2017-09-10 17:44:02 +01:00
David Baker
05a986334d Separate function to add code copy button 
For neatness and also so it can show up separately in the profiler.
 2017-09-10 15:58:17 +01:00
David Baker
876257f4e2 Consolidate the code copy button 
Adding the code code button was done by manipulating the HTML of
the event body to add a span tag, then adding the onclick handler
after the thing was mounted. Apart from splitting the code between
two places, adding the span tag was, according to Chrome's
profiler, taking up quite a lot of CPU cycles (apparently as soon
as you set the innerHTML on a div). Instead, just build the whole
lot together after the component mounts.
 2017-09-10 14:23:33 +01:00
David Baker
ea5726aa4e Copyright 2017-09-08 23:14:06 +01:00
David Baker
ec3ff529e7 Fast path for emojifying strings 
Emojione's regex for detecting emoji is *enourmous* and we were
running it on every display name, room name, message etc every time
those components mounted. Add a much simpler regex to rule out the
majority of strings that contain no emoji and fast-path them.

Makes room switching about 10% faster (in my tests with all the
profiling turned on).
 2017-09-08 23:05:27 +01:00
Michael Telatynski
b10b0e573d
i18n and change message depending on success of copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 11:29:55 +01:00
Michael Telatynski
269f1f33e3
show response on copy so you don't mash it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 11:27:25 +01:00
Robert Swain
53574541c3 AppTile: Add Jitsi electron screensharing support 2017-09-04 09:31:25 +02:00
Luke Barnard
0ded4acba0 Mark TODO for https://github.com/vector-im/riot-web/issues/4951 2017-08-31 17:52:53 +01:00
Luke Barnard
d84190f58d Explain Flair debounce 2017-08-31 17:49:19 +01:00
Luke Barnard
e89d52ccbf Do not get avatars when no groups were/could be retrieved 2017-08-31 16:46:39 +01:00
Luke Barnard
86e8a4c7e2 Make componentWillMount not async 
This was left over from a previous refactor
 2017-08-31 16:44:14 +01:00
David Baker
9efa604706 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-30 17:39:47 +01:00
David Baker
cf747fcb57 Lint 2017-08-30 17:34:44 +01:00
Luke Barnard
ebc1993530 Implement Flair 
Add 14x14 group avatars next to sender profiles.
 2017-08-30 11:10:49 +01:00
Richard Lewis
84481f1a1e Merge pull request #1350 from matrix-org/rxl881/scalarTokenFix 
Make staging widgets work with live and vice versa.
 2017-08-30 11:04:50 +01:00
Richard Lewis
2ff1888054 Make staging widgets work with live and vice versa. 2017-08-30 10:36:22 +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
824b29dc1f PR feedback 2017-08-30 09:22:26 +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
edb449dfe5
we need to pass whether it is an invite RoomSubList explicitly (i18n) 2017-08-27 23:38:25 +01:00
Michael Telatynski
cd1e58cb61
_tJsx returns a React Object, the sub fn must return a React Object 
not a string
 2017-08-26 08:18:55 +01:00
David Baker
299db845ff PR feedback 2017-08-25 12:10:13 +01:00
David Baker
5cfec247f0 Merge pull request #1331 from matrix-org/luke/fix-completion-click-to-insert 
Fix click to insert completion
 2017-08-24 14:56:15 +01:00
Michael Telatynski
ec6867dc8b
Fix React crying on machines without internet due to return undefined 2017-08-24 12:32:37 +01:00
David Baker
c11432c3e3 Catch the promise rejection if scalar fails 
Otherwise this is incredibly annoying when developing if you don't
have a scalar that will allow you to register (ie. if you're
testing against an HS on your dev box)
 2017-08-23 19:35:33 +01:00
Luke Barnard
8ed5422a45 Fix click to insert completion 
And remedy weird API in the process. Autocomplete now exposes `onSelectionChange` to indicate that the user has selected another completion, rather than returning the chosen completion via onUpArrow etc.

Fixes vector-im/riot-web#4835
 2017-08-23 16:22:14 +01:00
Richard Lewis
502a0480a0 Merge pull request #1327 from matrix-org/matthew/multiple-widgets 
Matthew/multiple widgets
 2017-08-22 10:53:51 +01:00
David Baker
e72bdffd62 Remove unused import 2017-08-22 10:22:51 +01:00
David Baker
5f816666e1 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-22 10:08:02 +01:00
Richard Lewis
a69cc9169f lint fix. 2017-08-22 10:04:57 +01:00
David Baker
ac64e9b705 Lint 2017-08-21 19:34:07 +01:00
David Baker
b898d15580 Specify default number of members to load 2017-08-21 19:30:28 +01:00
David Baker
e77ea352e4 Support full group membership cycle 
Apart from knocking, ie. Invite / accept / reject / leave
 2017-08-21 19:18:32 +01:00
David Baker
a0fe3d1cb0 Merge pull request #1326 from matrix-org/rav/userpicker_proptypes 
Fix proptypes on UserPickerDialog
 2017-08-21 16:43:15 +01:00
Richard van der Hoff
764d5891ad Fix proptypes on UserPickerDialog 
... so that it doesn't log an error
 2017-08-21 16:30:49 +01:00
Richard Lewis
b7569a9831 Revert auxPanel changes (this should already have been fixed in a separate PR). 2017-08-21 15:29:11 +01:00
Robert Swain
385205471b AppsDrawer: Remove unnecessary bind 2017-08-21 15:34:13 +02:00
Richard Lewis
c0f0425907 Merge pull request #1322 from matrix-org/rxl881/styling 
Position add app widget link
 2017-08-21 14:03:27 +01:00
Richard Lewis
6c8391e3ea Remove beta tag. 2017-08-21 11:39:06 +01:00
Richard Lewis
e93a1fac3d Position add app widget link 2017-08-21 11:29:42 +01:00
Robert Swain
2eac869e27 Merge branch 'develop' into rob/apps-not-e2ee 2017-08-21 10:30:38 +02:00
Robert Swain
70824960ee AppPermission: Make strings translatable 2017-08-21 10:23:55 +02:00
Matthew Hodgson
d7f5295949 untested WIP for supporting multiple widgets properly 2017-08-18 18:40:00 +01:00
Richard Lewis
1862057695 Only render appTile body (including warnings) if drawer shown. 2017-08-18 18:33:56 +01:00
Luke Barnard
b678c2cf0f Don't bind Pill function, React does this for us 2017-08-18 17:15:27 +01:00
Robert Swain
2e00968bcd AppPermission: Note that apps are not E2E encrypted in E2E rooms 2017-08-18 17:44:33 +02:00
Richard Lewis
1c36e47403 Fix add widget link 2017-08-18 15:59:12 +01:00
Richard Lewis
b7d46d91ed Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes 2017-08-18 15:35:01 +01:00
Luke Barnard
bf07333915 Merge pull request #1316 from matrix-org/luke/fix-app-name-case 
Don't apply case logic to app names
 2017-08-18 15:08:40 +01:00
Luke Barnard
5e0a7212d9 Don't apply case logic to app names 
As they should have the Correct Case in integrations land now
 2017-08-18 14:57:28 +01:00
Luke Barnard
36fffa1696 Stop integ manager opening on every room switch 
This was caused by a broken assumption which was AppsDrawer component mounting === clicking on apps draw toggle.

This was introduced in matrix-org/matrix-react-sdk#1312.

Known issue with this fix: deleting the last app doesn't hide the app drawer.
 2017-08-18 14:48:58 +01:00
Richard Lewis
857a8c9519 Remove empty defaultProps. 2017-08-18 13:28:47 +01:00
Richard Lewis
84f5e5aad2 REmove unused onCancelClick 2017-08-18 12:21:48 +01:00
Luke Barnard
1a1a80b633 Merge branch 'develop' into luke/feature-app-tile-ux 2017-08-18 12:12:00 +01:00
Luke Barnard
cab3123bd8 Merge pull request #1312 from matrix-org/luke/feature-widget-timeline-events 
Implement TextualEvent tiles for im.vector.modular.widgets
 2017-08-18 12:10:22 +01:00
Richard Lewis
96900e76a0 Move error logging to where it is first caught. 2017-08-18 11:51:32 +01:00
Richard Lewis
4b5cdac032 Don't show widget security warning to the person who added it to the room. 2017-08-18 11:41:27 +01:00
David Baker
55998028b4 Show group invites in 'invites' section 2017-08-18 11:22:50 +01:00
Luke Barnard
57505c3a61 Add behaviour to toggle app draw on app tile header click 2017-08-18 10:56:35 +01:00
Luke Barnard
9382689675 Merge branch 'develop' into luke/feature-widget-timeline-events 2017-08-18 10:47:25 +01:00
Luke Barnard
acc54b97f1 Implement TextualEvent tiles for im.vector.modular.widgets 
E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget"

The name is calculated by taking the `name` in the event content, falling back on the `type`, falling back on the previous content `type`. This is then capitalised.
 2017-08-18 10:35:33 +01:00
Matthew Hodgson
bb0845954d improve wording for directory listings 2017-08-17 19:10:45 +01:00
Matthew Hodgson
7c04a6671d expand auxPanel when showing apps 2017-08-17 19:06:19 +01:00
Richard Lewis
120a4f4f44 Check for valid roomId before renering manageIntegsButton. 2017-08-17 18:10:50 +01:00
Richard Lewis
0907fff080 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes 2017-08-17 17:47:46 +01:00
David Baker
91fe308f06 Merge pull request #1310 from matrix-org/t3chguy/hotfix1 
hotfix bad fn signature regression
 2017-08-17 17:31:55 +01:00
Michael Telatynski
766c188a1e
hotfix bad fn signature regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-17 17:15:18 +01:00
Michael Telatynski
bdb2d6b475
Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings 
# Conflicts:
#	src/components/structures/MatrixChat.js
 2017-08-17 13:39:19 +01:00
Michael Telatynski
ca5e26744f
Make dialog more specific and hide options behind advanced spoiler 2017-08-17 13:33:07 +01:00
Richard Lewis
02edadbd15 Don't bubble cancel click to room header. 2017-08-17 12:21:44 +01:00
Richard Lewis
d1ee257b5a Pass roomId rather than whole room object. 2017-08-17 12:15:01 +01:00
Richard Lewis
eb77dcc8e3 Camel case variable name 2017-08-17 11:24:25 +01:00
Richard Lewis
2c25639a61 Fix copyright header 2017-08-17 11:22:42 +01:00
Richard Lewis
9111cb421e Merge pull request #1291 from matrix-org/rxl881/maxWidgets 
Show a dialog if the maximum number of widgets allowed has been reached.
 2017-08-17 10:03:42 +01:00
MTRNord
59815359f8 Add misiing _tJsx import 2017-08-16 23:55:43 +02:00
MTRNord
fceccfc503 Add missing Robot string to translation 2017-08-16 23:54:36 +02:00
David Baker
252ab208e4 Merge pull request #1300 from matrix-org/dbkr/userpicker 
Refactor ChatInviteDialog to be UserPickerDialog
 2017-08-16 14:29:07 +01:00
David Baker
e1ddd3781d Merge branch 'dbkr/userpicker' into dbkr/group_userlist 2017-08-15 14:10:45 +01:00
David Baker
81273ec855 Move non-invite specific stuff to UserAddress 2017-08-15 13:42:23 +01:00
David Baker
bbcf7e1d9b s/inviteList/userList/ 2017-08-15 13:30:13 +01:00
David Baker
fa660c8211 PR feedback 2017-08-15 10:57:24 +01:00
David Baker
64f352dda7 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-15 10:49:07 +01:00
Luke Barnard
004cc42cfc Merge pull request #1298 from matrix-org/luke/store-history-as-raw-content 
Store history as raw content
 2017-08-15 09:18:22 +01:00
Luke Barnard
6baca05968 Merge pull request #1297 from matrix-org/luke/fix-user-pill-onclick 
Add onClick to user pills
 2017-08-15 09:15:50 +01:00
David Baker
b7b449434d Lint 2017-08-15 09:10:13 +01:00
David Baker
1b66e88b6e ChatInviteDialog -> UserPickerDialog pt 2 
The other changes I forgot to add
 2017-08-14 17:43:00 +01:00
David Baker
447aa1e5a0 Refactor ChatInviteDialog to be UserPickerDialog 
Now it's just a means of choosing users and all the actual inviting
functionality is moved out to Invite.js. This will allow us to
reuse it for inviting to groups.

Adds the ability to restrict what types of addresses may be chosen,
although this isn;t used yet, it will be necessary for groups
because groups don't support 3pid invites.
 2017-08-14 17:38:59 +01:00
Luke Barnard
6b1b643d41 Merge branch 'develop' into luke/store-history-as-raw-content 2017-08-14 16:42:22 +01:00
Luke Barnard
9742962d61 preventDefault when moving autocomplete selection with vertical arrow 
Otherwise the composer selection updates, in turn hiding the autocomplete box - fixes vector-im/riot-web#4790
 2017-08-14 15:16:13 +01:00
Luke Barnard
bb229d33a4 Add onClick to user pills 
instead of using the converted matrix.to href. This is undesirable and a better solution would be to fix routing in Riot in general and then change user pills to do something like `/room/../member/@userId`.
 2017-08-14 14:44:08 +01:00
Richard Lewis
454ec40b00 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes 2017-08-11 10:35:20 +01:00
Richard Lewis
0323151bee Show a dialog if the maximum number of widgets allowed has been reached. 2017-08-10 23:53:43 +01:00
Michael Telatynski
41843f021d
don't track two more potential risks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:21:01 +01:00
Michael Telatynski
56ea528f43
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:17:52 +01:00
Michael Telatynski
b19c1010aa
Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/Analytics.js
 2017-08-10 13:54:55 +01:00
Michael Telatynski
67f9c3774d
make string more human-friendly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:51:47 +01:00
Michael Telatynski
24599ace32
don't track error messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:49:11 +01:00
Luke Barnard
b2fd4be166 Merge pull request #1289 from matrix-org/luke/fix-quote-innerText 
Quote by taking the innerText of eventTiles
 2017-08-10 10:35:49 +01:00
Luke Barnard
678c472b75 Quote by taking the innerText of eventTiles 
because using `body` gives inconsistent results - sometimes it will contain markdown and sometimes not, and this may not correspond with the `formatted_body`.

TODO: Do quoting proper - using `in_response_to`.
 2017-08-10 10:14:14 +01:00
Luke Barnard
390e77ee22 Merge pull request #1288 from matrix-org/luke/track-richtext-mode 
Track whether the user has richtext mode enabled
 2017-08-10 09:31:09 +01:00
Luke Barnard
fc6977e68d Track RT mode once we've retrieved the setting from account data 2017-08-09 19:00:38 +01:00
Luke Barnard
e121440d05 Track whether the user has richtext mode enabled 2017-08-09 18:39:06 +01:00
David Baker
f4092cc9b4 Merge pull request #1287 from matrix-org/luke/fix-hide-autocomp-on-selection-change 
Hide autocomplete when RTE selection state (cursor) changes
 2017-08-09 18:21:25 +01:00
David Baker
4daf9064d9 Convert to API objects 
& remove redundant power label
 2017-08-09 18:15:31 +01:00
Luke Barnard
794bf820cc Merge pull request #1259 from matrix-org/t3chguy/fix-select-mxid-dialog 
Fix Set MXID Dialog woes
 2017-08-09 17:53:50 +01:00
Luke Barnard
2d47d3d2c3 Hide autocomplete when RTE selection state (cursor) changes 2017-08-09 17:36:35 +01:00
Michael Telatynski
579090a4e3 add comment 2017-08-09 16:37:38 +01:00
Richard Lewis
185379b037 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes 2017-08-09 14:07:45 +01:00
David Baker
c1546ceb59 Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-09 13:46:15 +01:00
Richard Lewis
4bc25f12cb Move manage integrations button in to stand-alone component 2017-08-09 11:44:24 +01:00
Luke Barnard
610b2a3a42 For mentions, always use rawDisplayName and remove (IRC) 2017-08-09 10:40:06 +01:00
David Baker
8426ada24c Merge pull request #1282 from matrix-org/rav/show_unencrypted_messages_as_unencrypted 
Show unencrypted messages as unencrypted
 2017-08-08 18:11:56 +01:00
Richard van der Hoff
da85cb9f45 Show unencrypted messages as unencrypted 
Previously, we were special-casing outgoing messages such that they were shown
as encrypted even when encryption had failed for some reason.

There's no need for this: outgoing messages have a working isEncrypted() method
which we can use to show whether the event has been encrypted yet. Arguably we
could do better than an open padlock for events in the 'encrypting' send state,
but I'm not really sure what.
 2017-08-08 17:49:41 +01:00
David Baker
b76b6791b2 Merge pull request #1279 from matrix-org/luke/fix-quoting-messages-with-mentions 
Always use message `body` when quoting
 2017-08-08 17:47:25 +01:00
Luke Barnard
cb8a66b5a1 When hideing autocomplete, also remove completion state 2017-08-08 17:25:11 +01:00
Luke Barnard
503fa6a7b3 Always use message body when quoting 
(not formatted_body)

This is because draft-js has regressed with a bug that causes some entities to not exist within a given ContentState - see vector-im/riot-web#4756
 2017-08-08 14:59:56 +01:00
David Baker
ca2273519d Merge pull request #1277 from matrix-org/luke/feature-pills-hide-avatar-setting 
Add optional setting for hiding avatars in <Pill>s
 2017-08-08 14:01:34 +01:00
Luke Barnard
91a1cc4431 Mandate ctrl/meta ONLY for a subset of key bindings 
Because by default dratf-js doesn't check that other modifiers are _not_ pressed.
 2017-08-08 13:36:43 +01:00
Luke Barnard
b08d32371d Add optional setting for hiding avatars in <Pill>s 
As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445
 2017-08-08 11:13:29 +01:00
Luke Barnard
7018deee44 Fix ctrl+a, backspace toggling block format 
Now it will delete the selected range (and not toggle the block format). Fixes vector-im/riot-web#4753
 2017-08-07 17:16:42 +01:00
Luke Barnard
641fda0162 Adjust comment 2017-08-07 16:29:22 +01:00
Luke Barnard
d9d8f2055f Allow default for ctrl+shift+b, ctrl+shift+u in RTE 
fixes vector-im/riot-web#4750
 2017-08-07 16:23:37 +01:00
Richard Lewis
18ae5fd129 Send messages on widget addition and deletion 2017-08-06 11:01:14 +01:00
Richard Lewis
308d932b2f CancelClick prop. 2017-08-06 10:29:43 +01:00
Richard Lewis
a22e768343 Move room settings button to RoomHeader 2017-08-06 10:01:48 +01:00
Michael Telatynski
c4803c6d89
suppressOnHover for member entity tiles which have no onClick 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-05 13:01:19 +01:00
Richard Lewis
1973b2bbe7 Switch app drawer icons 2017-08-05 00:00:19 +01:00
David Baker
234a88c098 WIP group member list/tiles 2017-08-04 15:00:34 +01:00
Luke Barnard
a27eefd893 Fix a couple of more errors due to API changes 2017-08-03 15:20:44 +01:00
Luke Barnard
901cbf495d Update decorator strategy API in accordance with recent changes to 0.11.0 
See 590cdc6c54, which is a change to the API not mentioned in the migration to v0.10 notes https://draftjs.org/docs/v0-10-api-migration.html
 2017-08-03 12:02:29 +01:00
Luke Barnard
1d1cd5f691 Reflect API change for decorator strategy 2017-08-03 11:36:07 +01:00
Luke Barnard
fb5dc295aa Reflect API change for getting an Entity 2017-08-03 11:29:26 +01:00
Luke Barnard
124795006c Reflect API change for creating an Entity 2017-08-03 11:18:56 +01:00
Richard Lewis
5752345b80 Merge pull request #1263 from matrix-org/rxl881/warnings 
Display warning if widget is mixed content
 2017-08-02 17:30:46 +01:00
Richard Lewis
7599bde1f6 Fix logging line length. 2017-08-02 17:05:46 +01:00
Kegan Dougal
c914f1607b scalar-develop is a scalar URL 2017-08-02 14:35:14 +01:00
Michael Telatynski
6e39e72849
fix m.federate always being false because value is a string. Y HTML... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-02 14:00:24 +01:00
Michael Telatynski
e9afcec5b2
fix m.federate=false warning in room settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-02 13:42:24 +01:00
Michael Telatynski
4b4b730233
fix and i18n the impl 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-02 13:41:26 +01:00
Michael Telatynski
fd454b476a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings 2017-08-02 12:15:00 +01:00
Richard Lewis
48faf72fdc Disable eslint rule 2017-08-01 21:00:18 +01:00
Richard Lewis
2ab6bc84a7 Improve clarity 2017-08-01 17:49:41 +01:00
Richard Lewis
f0224460d2 Fix comparison and handle case where app has permission to load but content is mixed protocol. 2017-08-01 17:48:02 +01:00
Richard Lewis
d29610bdd2 Fix boolean comparison. 2017-08-01 17:45:06 +01:00
Richard Lewis
f57b0d4cc7 Fix invalid translation 2017-08-01 17:43:38 +01:00
Richard Lewis
bc4d979d1e Display warning if widget is mixed content 2017-08-01 17:29:29 +01:00
Luke Barnard
a40a86669a Merge pull request #1260 from matrix-org/luke/fix-rte-pills-not-updating 
Use componentWillReceiveProps to update pill state when props change
 2017-08-01 16:30:25 +01:00
Luke Barnard
630c2968eb Use componentWillReceiveProps 2017-08-01 16:20:32 +01:00
Luke Barnard
71abd3aff8 Revert setting of key 2017-08-01 16:14:12 +01:00
Luke Barnard
7fcb8c5ff0 Merge pull request #1261 from matrix-org/luke/fix-agressive-emoji-auto-replace 
Only auto-replace emoji following ^ or \s
 2017-08-01 15:56:42 +01:00
Richard Lewis
546173d246 Fix scalar token 2017-08-01 15:53:42 +01:00
Luke Barnard
438b63bee2 Only auto-replace emoji following ^ or \s 
So as not to cause issues when typing e.g. `This is what was tested: ` (the "d:" used to be transformed into an emoji)
 2017-08-01 14:26:30 +01:00
Luke Barnard
9e71ba26c4 Add key prop to RTE decorated entities (Pills and links) 
This will cause a re-render when the URL of the pill/link changes.

fixes vector-im/riot-web#4718
 2017-08-01 13:51:08 +01:00
Richard Lewis
abae43b65e Merge pull request #1257 from matrix-org/rxl881/widgetPermissions 
Widget permissions
 2017-08-01 12:13:09 +01:00
Richard Lewis
5f8e86197f Check that wurl is scalar, before checking for curl 2017-08-01 12:00:03 +01:00
Richard Lewis
596efb6062 Fix missing comma 2017-08-01 11:42:50 +01:00
Richard Lewis
15f39040a0 Simplify canUserModifyWidgets API 2017-08-01 11:39:17 +01:00
Michael Telatynski
62af06104d
resolve -> reject because semantics. 2017-07-31 14:22:05 +01:00
Michael Telatynski
f310d4446c
i18n the title of the set mxid dialog 2017-07-31 13:31:07 +01:00
Michael Telatynski
25d1d21d93
copy logic from RegistrationForm to detect invalid localparts 2017-07-31 13:28:43 +01:00
Michael Telatynski
4bdaa15c47
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics 2017-07-28 21:01:59 +01:00
Richard Lewis
a310ff3bab Add ToDo item. 2017-07-28 18:21:23 +01:00
Richard Lewis
6aa1d923ce Add comment 2017-07-28 16:48:13 +01:00
Richard Lewis
9935dd0051 Add comment to explain "fullWidth" component porperty. 2017-07-28 16:46:21 +01:00
Richard Lewis
8529a21f5c Translate "Allow" 2017-07-28 16:42:07 +01:00
Richard Lewis
700ef34e95 Translate warning 2017-07-28 16:39:18 +01:00
Richard Lewis
4308d2c635 Inline setState. 2017-07-28 16:36:06 +01:00
Richard Lewis
50ad80ad86 Use ES6 style import 2017-07-28 16:24:32 +01:00
Richard Lewis
2e6fb1f956 Fix license header 2017-07-28 16:23:49 +01:00
Richard Lewis
6238c1d704 Fix default prop initialisation 2017-07-28 16:23:38 +01:00
Luke Barnard
8a5f2bf2ca Interpret a split-block as format toggle for an empty block 
(`split-block` is emitted when "return" is pressed)

part of fixing https://github.com/vector-im/riot-web/issues/4580
 2017-07-28 14:46:57 +01:00
Richard Lewis
aff1cd9469 Add allow-presentation permission to iframe sandbox permissions 2017-07-28 11:14:04 +01:00
Richard Lewis
11335b1488 Rename variable to curlBase, for clarity 2017-07-28 10:18:06 +01:00
Richard Lewis
e1d9301eb4 Strip query parameters from content URLs 2017-07-28 10:01:58 +01:00
Richard Lewis
d69c9a36b3 Factor out check permissions code. 2017-07-27 23:38:26 +01:00
Richard Lewis
20a1693c71 Only display add app link if user has permission to add widgets in the room. 2017-07-27 23:38:02 +01:00
Richard Lewis
5e23d676b4 Remove comments. 2017-07-27 23:05:43 +01:00
Richard Lewis
51d160e7d6 Hide edit button when user does not have permission to edit. 2017-07-27 20:18:31 +01:00
Luke Barnard
6cb8b12cda Instead of inserting MD for completion, convert the Entity later 
This makes sure that the length of the range for a completed Entity = the length of the text in the decoration, which apparently draftjs assumes when calculating selection state offsets.

Fixes https://github.com/vector-im/riot-web/issues/4666
 2017-07-27 18:17:41 +01:00
Richard Lewis
ab7fcbb5e7 Add function to determine if a user can modify widgets and style UI components as a result. 2017-07-27 18:10:28 +01:00
Richard Lewis
27923e300c Add JSX wrapper. 2017-07-27 17:47:04 +01:00
Michael Telatynski
bf98c0da7c
un-i18n Modal Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-27 17:19:18 +01:00
Richard Lewis
9ee1f3962d Set display URL from wurl if curl not specified. 2017-07-27 16:42:29 +01:00
Richard Lewis
8e4f1f0989 Add message spinner. 2017-07-27 16:41:52 +01:00
Richard Lewis
f2058e0a6c Add message spinner component. 2017-07-27 16:41:20 +01:00
David Baker
92746f8cb5 Merge pull request #1254 from matrix-org/luke/fix-join-command 
Fix /join #alias command in markdown mode
 2017-07-27 15:43:02 +01:00
Luke Barnard
5c7891a25b Remove logs 2017-07-27 15:26:36 +01:00
Luke Barnard
e71df44fc9 Fix /join #alias command in markdown mode 
Tab-completing a room alias inserts a markdown link, which is now stripped before a command is parsed. We also strip the MD links when doing the autocompletion itself (getAutocompleteQuery).

There is still an issue where `/invite` will not work at all with tab-completion - the text of a user Pill is not the userID but rather the display name, which cannot be used as an argument to the command.
 2017-07-27 15:18:06 +01:00
Luke Barnard
dff79c4688 Only apply room pills to matrix.to room links, exclude event links 
This fixes https://github.com/vector-im/riot-web/issues/4680
and fixes https://github.com/vector-im/riot-web/issues/4670
 2017-07-27 13:01:40 +01:00