Commit Graph

21704 Commits (fada013f9ecfbf47a002df8671458cd0d2871722)

Author SHA1 Message Date
Bruno Windels fada013f9e this isn't doing anything because we don't have a room when the alias is not moderated 2020-02-21 14:06:57 +01:00
Bruno Windels 2b19648786 fix cp error and lint 2020-02-21 13:35:14 +01:00
Bruno Windels 3c3839f863 show a pill as a moderated alias (canonical or alt) if available
otherwise, display as the label in the link
2020-02-21 13:02:41 +01:00
Bruno Windels 4219d2fcf6 style a room pill even if we don't find the room 2020-02-21 13:02:41 +01:00
Bruno Windels f6313b51e6 also look in alt_aliases to match a pill to a room 2020-02-21 13:02:41 +01:00
Bruno Windels 16815a752b use alt_aliases instead of aliases to match a pill to a room
when deserializing a pill
2020-02-21 13:02:41 +01:00
Bruno Windels 8870da6c24 Add alt_aliases to room completion candidates
but don't match on name otherwise you see multiple entries per room
when searching for a room name

Also pass the roomId to the composer autocomplete, so
it's easier to we don't need to loop through all the rooms and
it's also easier accept room with local aliases as well in the future
2020-02-21 13:02:41 +01:00
Bruno Windels 558ae1128b use alt_aliases rather than aliases for the display alias 2020-02-21 13:02:35 +01:00
Bruno Windels 744826db48
Merge pull request #4096 from matrix-org/bwindels/canonicalpill
Accept canonical alias for pills
2020-02-20 17:07:54 +00:00
Bruno Windels d324dfaceb
Merge pull request #4094 from matrix-org/bwindels/dontsaywecanscan
Fix: don't advertise ability to scan a QR code for verification
2020-02-20 16:44:27 +00:00
Bruno Windels fee9c7d21f accept canonical alias for pills 2020-02-20 17:43:33 +01:00
Damir Jelić 81e61d6f9d EventIndexPanel: Move the comments around for the getStats calls. 2020-02-20 14:46:10 +01:00
Damir Jelić a650c47d6b ManageEventIndexDialog: Add a space before the function parenthesis. 2020-02-20 14:46:10 +01:00
Damir Jelić 1897d67818 EventIndexPanel: Catch getStats failures.
Getting the stats can fail when used with Seshat. Tantivy periodically
garbage collects its files. Smaller files are merged and the old ones
are removed.

If garbage collection occurs while we try to get the stats, which go
trough the files and figure out their sizes, we can end up trying to
figure out the file size of a removed file. The getStats call will fail
in this case but we can ignore the failure since we will likely get a
nice result next time we try.
2020-02-20 14:46:10 +01:00
Damir Jelić 9e3b0fdf7c EventIndexPanel: Fix the removal of the updateCurrentRoom listeners.
The event listeners that update the current room and try to get the
current stats from the event index don't seem to be unmounted because
this != this confusion.

Turning them into arrow methods of the react class fixes this.
2020-02-20 14:46:10 +01:00
J. Ryan Stinnett 2dd093de49
Merge pull request #4095 from matrix-org/jryans/rm-release-exec
Remove exec so release script continues
2020-02-20 13:37:44 +00:00
J. Ryan Stinnett 31e82b8050 Remove exec so release script continues
We now want to do post-processing after the JS SDK release script, so we can't
use `exec` here.
2020-02-20 12:05:08 +00:00
Michael Telatynski b1a3d8ad63
Merge pull request #4092 from matrix-org/t3chguy/persist
Use Persistent Storage where possible
2020-02-20 11:56:54 +00:00
J. Ryan Stinnett 766f523c00 Reset matrix-js-sdk back to develop branch 2020-02-20 11:41:53 +00:00
Bruno Windels fb28bbbaa6 dont say we can scan when we dont 2020-02-20 12:06:34 +01:00
Bruno Windels 86c871f55f
Merge pull request #4088 from matrix-org/bwindels/fixuserpage
Fix user page (missing null check)
2020-02-20 11:01:15 +00:00
Bruno Windels 913caf67a9
Merge pull request #4081 from matrix-org/bwindels/cancelondialogclose
Cancel verification request on dialog close
2020-02-20 11:00:00 +00:00
Michael Telatynski b72042496e
Merge pull request #4093 from matrix-org/t3chguy/leaks
Fix various memory leaks due to method re-binding
2020-02-20 03:01:25 +00:00
Michael Telatynski 16bbea0b59 Fix various leaks due to method re-binding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-20 02:35:30 +00:00
Michael Telatynski ffde11ca91 Use Persistent Storage where possible
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-20 00:38:08 +00:00
Michael Telatynski 12eb408c58
Merge pull request #4073 from matrix-org/t3chguy/a11y_share_msg
Fix share message context menu option keyboard a11y
2020-02-19 17:41:28 +00:00
RiotRobot 2d05205c9e v2.1.1 2020-02-19 16:03:58 +00:00
RiotRobot faf8a5c2db Prepare changelog for v2.1.1 2020-02-19 16:03:57 +00:00
RiotRobot a687d158e8 Released js-sdk 2020-02-19 15:59:37 +00:00
Bruno Windels 9ab861121d
Merge pull request #4090 from matrix-org/bwindels/localaliasspinner
show spinner while loading local aliases
2020-02-19 14:34:27 +00:00
Bruno Windels a5b9682572 show spinner while loading local aliases 2020-02-19 15:15:05 +01:00
Damir Jelić 7f71e551da EventIndex: Split out the statements that check for a valid event type. 2020-02-19 14:50:59 +01:00
Damir Jelić 156c6b8db8 EventIndex: Document the return value of the isValidEvent method. 2020-02-19 14:50:59 +01:00
Damir Jelić 59f8b4f6b1 EventIndex: Don't index key verification events.
Since cross-signing is a thing key verification events have become part
of the timeline and room history.

Those events are m.room.message events for backwards compatibility, so
clients that don't support key verification in the timeline print out a
fall-back message.
2020-02-19 14:50:59 +01:00
Michael Telatynski b1b17a313e
Merge pull request #4046 from matrix-org/t3chguy/usercontent
Get rid of dependence on usercontent.riot.im
2020-02-19 12:53:01 +00:00
Michael Telatynski 4da5f32764 get rid of lockOrigin backwards compatibility
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-19 12:44:46 +00:00
Bruno Windels 5b8551df1f
Merge pull request #4089 from matrix-org/bwindels/fixnoaliasesforpublicroom
also detect aliases using new /aliases endpoint for room access settings
2020-02-19 10:28:45 +00:00
Bruno Windels 30ae6dbdbb also detect aliases using new /aliases endpoint for room access settings 2020-02-19 11:18:56 +01:00
Bruno Windels 6118e9621e
Merge pull request #4086 from matrix-org/bwindels/fixaliases
get local aliases from /aliases in room settings
2020-02-19 10:02:50 +00:00
Bruno Windels cb5882d59b add null check 2020-02-19 10:40:00 +01:00
Bruno Windels 4c9c57bfe5 check server feature flag
if not available, revert to old behavior
2020-02-19 10:06:52 +01:00
Bruno Windels e6ca581f10 get local aliases from /aliases in room settings 2020-02-18 16:27:45 +01:00
Michael Telatynski 600cb64d00 don't nest <a> inside <AccessibleButton>
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-18 15:04:57 +00:00
Zoe 27f65c17b5
Merge pull request #4080 from matrix-org/foldleft/12187-e2e-dm
Start verification sessions in an E2E DM where possible
2020-02-18 13:53:56 +00:00
Zoe 0e0aadd3f2 fixed inexplicible scope bug 2020-02-18 11:30:10 +00:00
Zoe 164b355ffe abstract out the check for available target devices 2020-02-18 11:25:19 +00:00
Bruno Windels 1b38827d92
Merge pull request #4077 from matrix-org/bwindels/filterverifmethods
Only show supported verification methods
2020-02-18 10:16:01 +00:00
Bruno Windels 46e63fd571 cancel on dialog close 2020-02-18 11:14:16 +01:00
Bruno Windels 05403eb98c
Merge pull request #4072 from matrix-org/bwindels/localecho2
Use local echo in VerificationRequest for accepting/declining a verification request
2020-02-18 09:55:27 +00:00
Zoe 23596031db rip foldleft, died of lint issues 2020-02-17 16:00:25 +00:00