Commit Graph

16559 Commits (888e4d1ec258f93f9fdcae94c56379a265b4cf7d)

Author SHA1 Message Date
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 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
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 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
Travis Ralston 5e5bf21281 Remove irrelevant debugging 2019-07-04 09:59:07 -06:00
Bruno Windels 8468f7cdc3 support redactions in edit history dialog 2019-07-04 16:33:05 +02:00
J. Ryan Stinnett b095042084 Upgrade dependencies 2019-07-04 15:08:20 +01:00
David Baker 2b5d9961c0
Merge pull request #3178 from matrix-org/dbkr/delint_scalar_auth_client
De-lint ScalarAuthClient
2019-07-04 13:07:13 +01:00
David Baker 7d40ccfdbe De-lint ScalarAuthClient 2019-07-04 12:59:20 +01:00
Bruno Windels 375976575b add redact button 2019-07-04 11:07:22 +02:00
Bruno Windels 3f28f2e4a6
Merge pull request #3174 from matrix-org/bwindels/edit-history-error
show /relations error in edit history dialog
2019-07-04 09:05:29 +00:00
Travis Ralston 521bc90b5f Appease the linter 2019-07-03 16:51:09 -06:00
Travis Ralston 42e6287bdb Implement basic soft logout handling
Fixes https://github.com/vector-im/riot-web/issues/10235

CSS and copy are left as an exercise for a later iteration.

Login page handling is left for https://github.com/vector-im/riot-web/issues/10236

This implementation reuses as much of the Lifecycle flow as it can without causing problems. Most importantly, it requires https://github.com/matrix-org/matrix-js-sdk/pull/975 to be able to detect a soft logout and react to it. When it comes time to starting/stopping the Lifecycle, additional parameters are provided so that the auxiliary services can (re)start themselves without the client starting to sync.
2019-07-03 16:46:37 -06:00
RiotRobot a36c520362 v1.3.0-rc.1 2019-07-03 16:56:10 +01:00
RiotRobot d3c993543f Prepare changelog for v1.3.0-rc.1 2019-07-03 16:56:10 +01:00
Bruno Windels 4dc8de0e71 log server errors in edit history dialog 2019-07-03 17:53:32 +02:00
Bruno Windels e7e6af2592 use existing strings 2019-07-03 17:51:16 +02:00
RiotRobot 137c531d51 Upgrade to JS SDK 2.1.0-rc.1 2019-07-03 16:45:05 +01:00
David Baker 668d24111c
Merge pull request #3173 from matrix-org/t3chguy/MELS_3pid
MELS handle m.room.third_party_invite
2019-07-03 16:02:10 +01:00
David Baker b43a04634a
Merge pull request #3172 from matrix-org/t3chguy/invites_list
Fix logic around MemberList invites section, specifically regarding 3pid
2019-07-03 16:01:01 +01:00
J. Ryan Stinnett d7cc3159b2
Merge pull request #3176 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-07-03 15:40:23 +01:00
Weblate d22b0e5934 Merge branch 'origin/develop' into Weblate. 2019-07-03 14:33:48 +00:00