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

285 commits

Author SHA1 Message Date
Michael Telatynski
142a71cc67
Merge pull request #3694 from matrix-org/t3chguy/fix_SpecPermalinkConstructor 
Fix ?via= args in SpecPermalinkConstructor.js
 2019-12-08 10:04:41 +00:00
Michael Telatynski
857f086501 Fix ?via= args in SpecPermalinkConstructor.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-03 00:05:19 +00:00
Travis Ralston
4d5f133b17
Merge pull request #3684 from matrix-org/travis/auto-invite-upgrades 
Add an option to invite users to upgraded private rooms
 2019-12-02 17:03:25 -07:00
Travis Ralston
f020929345 Add an option to invite users to upgraded private rooms 
The option doesn't show up on public room upgrades.
 2019-11-27 20:29:11 -07:00
Travis Ralston
673e6c3162 Don't assume that diffs will have an appropriate child node 
Fixes https://github.com/vector-im/riot-web/issues/11497

This is a regression from react-sdk v1.5.0 where the diff feature was added in the first place. It only affects lists.
 2019-11-27 12:26:43 -07:00
Bruno Windels
4a684d01a4
Merge pull request #3661 from matrix-org/bwindels/verif-toasts 
Show incoming verification requests in in-app notifications
 2019-11-22 16:39:18 +00:00
Bruno Windels
c705752317 add toast for verification requests 
this uses a verification requests as emitted by the js-sdk with
the `crypto.verification.request` rather than a verifier as emitted
by `crypto.verification.start` as this works for both to_device and
timeline events with the changes made in the js-sdk pr.
 2019-11-22 16:08:27 +01:00
Michael Telatynski
d3f872bf7a Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 2019-11-21 11:15:32 +00:00
Michael Telatynski
6121420113
Merge branch 'develop' into t3chguy/remove_bluebird 2019-11-20 15:21:23 +00:00
Travis Ralston
b185eed462 Wire up the widget permission prompt to the cross-platform setting 
This doesn't have any backwards compatibility with anyone who has already clicked "Allow". We kinda want everyone to read the new prompt, so what better way to do it than effectively revoke all widget permissions?

Part of https://github.com/vector-im/riot-web/issues/11262
 2019-11-18 17:56:33 -07:00
Travis Ralston
f5ec9eb8f4 Ensure widgets always have a sender associated with them 
Fixes https://github.com/vector-im/riot-web/issues/11419
 2019-11-18 13:16:36 -07:00
J. Ryan Stinnett
d5d2f7f936
Merge pull request #3588 from matrix-org/jryans/identity-disco-opt 
Relax identity server discovery error handling
 2019-11-18 17:09:08 +00:00
Michael Telatynski
d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Michael Telatynski
54dcaf1302 Replace bluebird specific promise things. Fix uses of sync promise code. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-14 13:52:17 +00:00
Michael Telatynski
5c24547ef5 re-add and actually use promise timeout util 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-14 09:37:26 +00:00
Michael Telatynski
bc90789c71 Remove unused promise utils method 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-14 00:39:48 +00:00
Michael Telatynski
79ebb9091c
Merge branch 'develop' into t3chguy/remove_bluebird_1 2019-11-12 18:16:34 +00:00
Travis Ralston
6d0b388fa2
Merge branch 'develop' into travis/mjolnir 2019-11-12 10:00:01 -07:00
Michael Telatynski
c3df2f941d attach promise utils atop bluebird 2019-11-12 12:30:05 +00:00
Michael Telatynski
2ea239d192 Replace rest of defer usages using small shim. Add homebrew promise utils 
(cherry picked from commit 6850c14739)
 2019-11-12 12:07:56 +00:00
Michael Telatynski
7a512f7299 Revert "Replace rest of defer usages using small shim. Add homebrew promise utils" 
This reverts commit 6850c147
 2019-11-12 11:56:43 +00:00
Michael Telatynski
6850c14739 Replace rest of defer usages using small shim. Add homebrew promise utils 2019-11-12 11:45:28 +00:00
Bruno Windels
0d2f9c4215 add verification request tile + styling 2019-11-07 19:54:56 +01:00
Bruno Windels
9c4470e599 helper class to track the state of the verification 
as we will have 2 tiles, and both need to track
the status of the verification request, I've put
the logic for tracking the state in this helper class
to use from both tiles.
 2019-11-07 19:54:56 +01:00
J. Ryan Stinnett
03c93b5f38
Merge pull request #3595 from N-Pex/linkify-fix 
Fix linkify imports
 2019-11-07 12:28:57 +02:00
David Baker
0464b094a6 Fix softcrash if editing silly events 
If you sent an event with a body of the empty json object, riot
would then softcrash when you pressed the up arrow because it
would try to treat a json object as a string and run split on it.
 2019-11-06 11:44:32 +00:00
N-Pex
d403ed7513 Fix linkify imports 
VECTOR_URL_PATTERN was 'undefined' inside Permalinks.tryTransformPermalinkToLocalHref()
 2019-11-06 10:41:14 +01:00
J. Ryan Stinnett
446e21c2e1 Relax identity server discovery error handling 
If discovery results in a warning for the identity server (as in can't be found
or is malformed), this allows you to continue signing in and shows the warning
above the form.

Fixes https://github.com/vector-im/riot-web/issues/11102
 2019-11-01 12:27:56 +00:00
Travis Ralston
3e4a721111 Appease the linter 2019-10-31 16:27:45 -06:00
Travis Ralston
b93508728a Add personal list management to Mjolnir section 2019-10-31 14:24:51 -06:00
Travis Ralston
e6e12df82d Add structural base for handling Mjolnir lists 2019-10-31 13:20:18 -06:00
J. Ryan Stinnett
0fc5108817 Add a prompt when interacting with an identity server without terms 
This adds a prompt whenever we are about to perform some action on a default identity
server (from homeserver .well-known or Riot app config) without terms. This
allows the user to abort or trust the server (storing it in account data).

Fixes https://github.com/vector-im/riot-web/issues/10557
 2019-10-31 13:13:13 +00:00
Michael Telatynski
93429d7c2e Break withLegacyMatrixClient into a util module 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-17 19:13:37 +01:00
David Baker
d82a05fbae Fix integration manager not updating when set 
setUserWidget was modifying the content of the old event itself,
so when `waitForUserWidget()` checked the content to see if it was
there yet, it was, but because the echo hadn't come back, the
IntegrationManager hadn't rebuilt its list.

In other news, its terrifying that we can just accidentally modify
the content of an event in the store. I'm going to make a js-sdk
PR that freezes the content and see what breaks...

Fixes https://github.com/vector-im/riot-web/issues/10977
 2019-10-02 15:26:54 +01:00
Travis Ralston
6b09c3e9e6 Appease the linter 2019-09-30 21:03:16 -06:00
Travis Ralston
fc66e69c02 Rename RoomPermalinkCreator -> Permalinks due to scope 
The file handles more than just a RoomPermalinkCreator, so we should name it accordingly.
 2019-09-30 20:39:58 -06:00
Travis Ralston
ce0a534db1 Fix pills for CIDER too 2019-09-30 20:37:24 -06:00
Travis Ralston
2824f468d9 Update pill processing to handle better permalinks 2019-09-30 20:27:51 -06:00
Travis Ralston
2cb0b4903a Converge on permalink processing for HtmlUtils and linkify-matrix 2019-09-30 20:17:54 -06:00
Travis Ralston
ff4eee5239 Minor cleanup of getPermalinkConstructor 2019-09-30 16:09:19 -06:00
Travis Ralston
8acaa3ce95 Update generated Riot permalinks 
Also adds some safety around the Riot URL to ensure it mostly looks like a URL
 2019-09-30 16:05:28 -06:00
Travis Ralston
199dfa7bf9 Always check if the permalink is a spec permalink 
See code for rationale
 2019-09-30 16:04:49 -06:00
Travis Ralston
3e5a39d646 Add utility function for permalink parsing 2019-09-30 16:04:22 -06:00
Travis Ralston
9bb1ebb89d Support riot-level permalink parsing 2019-09-30 16:03:52 -06:00
Travis Ralston
baf78da791 Support spec-level permalink parsing 2019-09-30 16:03:24 -06:00
Travis Ralston
f183e96d66 Introduce a RiotPermalinkConstructor and fix the setting name 
Originally we were planning on using the current location as the permalink prefix, but that doesn't work if the user is a desktop user.
 2019-09-30 13:04:20 -06:00
Travis Ralston
f879185aef Move permalink host check into permalink constructors 
Without the requirement for a room to work
 2019-09-30 12:53:45 -06:00
Travis Ralston
926e1146f9 Move spec permalinks into their own class 
This allows for Riot permalinks to be introduced without if-else ladders everywhere.
 2019-09-30 12:51:17 -06:00
Travis Ralston
f9d5e89017 Move early parts of matrix.to bits into its own class 2019-09-30 12:37:13 -06:00
Travis Ralston
64aa6695f5 Move matrix-to.js to utils/permalinks/RoomPermalinkCreator 
Just a little bit of refactoring to make the feature of custom prefixes a bit easier.
 2019-09-30 12:16:46 -06:00