Commit Graph

16579 Commits (7c43f0bcef95a139b72962842209909dd9cd5626)

Author SHA1 Message Date
David Baker 7c43f0bcef Don't retry on terms error 2019-07-15 14:05:39 +01:00
David Baker f13dc82d14 getTerms doesn't need an access token 2019-07-11 16:28:24 +01:00
David Baker e6fdff43d8 unsused variable 2019-07-11 16:02:02 +01:00
David Baker 69fa34d71f Fix ScalarAuthClient to refresh tokens if they fail
Also add a test to make sure it does it
2019-07-11 16:00:24 +01:00
David Baker 99d1ed5efe s/terms/policies/ 2019-07-11 14:48:18 +01:00
David Baker 18dde859af
s/terms/policies/
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-11 14:46:20 +01:00
David Baker 6b815327a0 apparently I was doing array bracket spacing wrong 2019-07-11 14:44:45 +01:00
David Baker 3ab5acde9d Add unit test for terms agreement flow 2019-07-11 14:32:04 +01:00
David Baker f77e7fc3e8 Use m.accepted_terms account data
To remember what policies the user has agreed to
2019-07-11 10:53:45 +01:00
David Baker 90a0f93215
jsdoc-ify comment block
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 16:07:31 +01:00
David Baker f4be4ab271 Re-add logic for if no integ url is configured 2019-07-10 15:27:33 +01:00
David Baker 0316aa11b7 Rest of terms/policies renaming 2019-07-10 15:12:05 +01:00
David Baker 8de5c348f3 focus is a bit silly if its starts disabled 2019-07-10 14:33:20 +01:00
David Baker 06c0bce053 These can be pure components 2019-07-10 14:32:37 +01:00
David Baker 72b1ad37a2
Remove random space
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:30:48 +01:00
David Baker 994f8f849b
Remove redundant dict key
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:30:31 +01:00
David Baker c2977ddd8e
More de-overloading of 'terms'
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:28:45 +01:00
David Baker 6fafd208a8 add sample terms response 2019-07-10 14:27:45 +01:00
David Baker f7750d9df0 right doc, wrong function 2019-07-10 14:27:45 +01:00
David Baker 0ec57b58e8
Make 'terms' term less overloaded
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:27:29 +01:00
David Baker 4396e993bf
Missed accessToken
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:20:36 +01:00
David Baker a9619b3c7e missed copyright header 2019-07-10 14:19:14 +01:00
David Baker be7680c065 update i18n strings 2019-07-10 14:18:59 +01:00
David Baker fcf82efc7c
Bots isn't a proper noun so no real reason for it to get a capital
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:17:42 +01:00
David Baker 8a7227f971
Typing
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-10 14:17:15 +01:00
David Baker 189dd4c7b1 SERVICE_TYPES 2019-07-10 12:08:26 +01:00
David Baker fc706e1d47 Missed a file 2019-07-10 10:50:10 +01:00
David Baker 83f697a9a2 lint 2019-07-09 19:01:22 +01:00
David Baker d4af8d4993 Use showIntegrationsManager in other places 2019-07-09 18:56:39 +01:00
David Baker 54aaabac74 Initial support for ToS dialogs for IS/IM
as per MSC2140
2019-07-09 18:51:56 +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 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