Travis Ralston
d2ab0a5ca7
Move key backup init to componentDidMount
2019-07-08 11:53:26 -06:00
Travis Ralston
3e0be640fd
Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys
2019-07-08 11:52:58 -06:00
Travis Ralston
c3383e9315
Move _initLogin to componentDidMount
2019-07-08 11:51:22 -06:00
Bruno Windels
cd803617b8
Merge pull request #3192 from matrix-org/bwindels/preserve-reply-fallback-on-edit
...
Preserve reply fallback on edit
2019-07-08 15:19:35 +00:00
Bruno Windels
f6e71b2335
turn flag into options object
2019-07-08 16:55:56 +02:00
Bruno Windels
e601037cd2
don't show reply fallback in edit history
2019-07-08 15:32:38 +02:00
Bruno Windels
888e4d1ec2
preserve reply fallback when editing
2019-07-08 15:25:44 +02:00
RiotRobot
0347c42798
Merge branch 'master' into develop
2019-07-08 10:53:53 +01:00
RiotRobot
61e2d87152
v1.3.0
2019-07-08 10:53:03 +01:00
RiotRobot
6cafcf6408
Prepare changelog for v1.3.0
2019-07-08 10:53:03 +01:00
RiotRobot
33eba0e500
Upgrade to JS SDK 2.1.0
2019-07-08 10:49:43 +01:00
Michael Telatynski
dd27891ee9
Merge pull request #3191 from matrix-org/t3chguy/lightbox_remove_no_pl
...
Don't show Remove button in ImageView if can't redact, delint ImageView
2019-07-08 10:23:51 +01:00
Bruno Windels
7a482461dd
Merge pull request #3180 from matrix-org/bwindels/history-actions
...
Edit history actions
2019-07-08 08:19:27 +00:00
Bruno Windels
1af2ca6b36
constistent jsx bracket and indent styling
2019-07-08 10:12:26 +02:00
Bruno Windels
cf11a3758f
set analyticsInfo for dialogs
2019-07-08 10:12:04 +02:00
Michael Telatynski
c2905bd33b
make things a tad saner
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 11:16:01 +01:00
Michael Telatynski
89ece266c6
Make id used in EditableItemList unique, namespace mx_EditableItemList_*
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 11:15:10 +01:00
Michael Telatynski
6b9c6a31f0
Don't show Remove button in ImageView if can't redact, delint ImageView
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-06 10:42:14 +01:00
Michael Telatynski
040e580cf0
Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying
...
Don't allow editing via up-arrow when Replying
2019-07-06 08:53:22 +01:00
Michael Telatynski
000f7e8007
Merge pull request #3103 from matrix-org/t3chguy/edit_skip_if_no_edit
...
If oldContent matches newContent, skip sending the edit
2019-07-06 08:52:58 +01:00
Travis Ralston
ae79ce97f3
Dress up the soft logout page to look like the design
...
Fixes https://github.com/vector-im/riot-web/issues/10262
Also fixes showing the user ID twice. We might have a User object which helpfully sets the display name to the user ID, so check for that.
2019-07-05 15:05:31 -06:00
Travis Ralston
ca6563dce4
Merge branch 'travis/soft-logout-rehydrate' into t1
2019-07-05 15:03:24 -06:00
Travis Ralston
fca4ebcd72
Overwrite the old session if the new creds are for a different user
...
Fixes https://github.com/vector-im/riot-web/issues/10272
2019-07-05 14:45:34 -06:00
Travis Ralston
8b417f8a60
Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-overwrite
2019-07-05 14:37:04 -06:00
Travis Ralston
1f1a5b2aac
Fix React crash when using a non-default homeserver on soft logout
...
The function used exists on the peg, not the client. This commit also fixes the name of the function in a backwards compatible way.
2019-07-05 14:35:21 -06:00
Travis Ralston
55b4ef2169
Change soft logout rehydrate text if there's pending key backups
...
Fixes https://github.com/vector-im/riot-web/issues/10263
Requires https://github.com/matrix-org/matrix-js-sdk/pull/982
2019-07-05 13:52:14 -06:00
Travis Ralston
d39b4e9c7c
Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys
2019-07-05 13:41:04 -06:00
J. Ryan Stinnett
017fc84862
Merge pull request #3184 from matrix-org/jryans/reactions-send-marks-unread
...
Track live events in timeline and use for read receipts and read markers
2019-07-05 17:55:59 +01:00
J. Ryan Stinnett
480fe44d44
Merge pull request #3179 from matrix-org/jryans/upgrade-deps
...
Upgrade dependencies
2019-07-05 17:50:13 +01:00
J. Ryan Stinnett
74431fe8b1
Merge pull request #3186 from matrix-org/jryans/reactions-allow-text
...
Allow diplayed reaction values to contain anything
2019-07-05 16:35:06 +01:00
J. Ryan Stinnett
87188e9229
Merge pull request #3185 from matrix-org/jryans/tooltip-target-null
...
Fix interactive tooltip null target error
2019-07-05 16:28:12 +01:00
Travis Ralston
9266c797da
Merge pull request #3181 from matrix-org/travis/soft-logout-force
...
Require that users go to the soft logout page if they're soft logged out
2019-07-05 09:24:56 -06:00
J. Ryan Stinnett
eb0e1eade4
Clamp reaction content width to at most 100px
...
Part of https://github.com/vector-im/riot-web/issues/10256
2019-07-05 16:18:16 +01:00
J. Ryan Stinnett
2a8f9a81f7
Allow diplayed reaction values to contain anything
...
Part of https://github.com/vector-im/riot-web/issues/10256
2019-07-05 16:18:06 +01:00
Bruno Windels
70334b69ec
implement view source for edits
2019-07-05 16:11:15 +02:00
J. Ryan Stinnett
3c3426d97e
Update copyright header
2019-07-05 15:08:55 +01:00
Bruno Windels
f4a8314c4f
make dom tree similar to eventtile so red lozenge style applies
2019-07-05 16:05:40 +02:00
Bruno Windels
0aa1252d01
monitor associated send status for edit history events
...
to update local echo if needed
2019-07-05 16:04:34 +02:00
Bruno Windels
2182248d7c
mark events from /relations as locally redacted if any pending redaction
2019-07-05 16:03:34 +02:00
J. Ryan Stinnett
5496a4dce6
Fix interactive tooltip null target error
...
Fixes https://github.com/vector-im/riot-web/issues/10232
2019-07-05 15:02:09 +01:00
J. Ryan Stinnett
0ae98a5a4d
Track live events in timeline and use for read receipts and read markers
...
This changes the `TimelinePanel` to track live events (that have committed to
the server and been remote echoed) as well as the full list of events (which
includes pending events).
The code paths that advance read receipt and read markers are then changed to
only use the live events so that these cannot advance into pending events.
Fixes https://github.com/vector-im/riot-web/issues/9952
2019-07-05 14:37:19 +01:00
J. Ryan Stinnett
27c79b9504
Merge pull request #3163 from matrix-org/t3chguy/fix_emoji_shortname_tooltip
...
Emojibase data includes blank variations, accept these when searching
2019-07-05 11:50:38 +01:00
Michael Telatynski
ecc672cccc
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-05 08:40:00 +01:00
Michael Telatynski
89d568ce97
Don't allow editing via up-arrow when Replying
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-05 08:36:16 +01:00
Travis Ralston
00973a1ee8
Appease the linter
2019-07-04 17:00:09 -06:00
Travis Ralston
03cbd7e8bb
Ensure links off the forgot password page land you at soft logout
2019-07-04 16:51:55 -06:00
Travis Ralston
93872e6fa5
Ask for the user's password to rehydrate their soft logged out session
...
Fixes https://github.com/vector-im/riot-web/issues/10236
The changes to the MatrixClientPeg (assign/start) are to permit the SoftLogout page to access the MatrixClientPeg reliably. This is why assign() is called by Lifecycle as an alternative to start().
Minimal design work has been done here. The majority is deferred to https://github.com/vector-im/riot-web/issues/10262
2019-07-04 16:51:16 -06:00
Travis Ralston
89131be438
Require that users go to the soft logout page if they're soft logged out
...
Fixes https://github.com/vector-im/riot-web/issues/10234
2019-07-04 15:14:00 -06:00
Travis Ralston
f3c6c73329
Merge pull request #3177 from matrix-org/travis/soft-logout-base
...
Implement basic soft logout handling
2019-07-04 10:22:18 -06:00
Travis Ralston
8ea46a8c4d
Remove unneeded page types
2019-07-04 09:59:20 -06:00