Travis Ralston
|
862fb16120
|
Send the correct UIA alongside the wrong UIA for backwards comaptibility
Fixes https://github.com/vector-im/riot-web/issues/10312
|
2019-07-11 14:28:10 -06:00 |
|
Weblate
|
3c1935e9a7
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-11 19:01:42 +00:00 |
|
Travis Ralston
|
c89a864a82
|
update copy
|
2019-07-11 12:54:26 -06:00 |
|
Bruno Windels
|
dedf978948
|
prevent inserting parts at index -1 for empty documents
|
2019-07-11 18:46:56 +02:00 |
|
Bruno Windels
|
06fb892df9
|
prevent autocomplete when doing bulk insertion (paste, drop text)
|
2019-07-11 18:46:56 +02:00 |
|
Bruno Windels
|
507b89fc61
|
manually attach input event handler, as React doesn't pass inputType
|
2019-07-11 18:46:56 +02:00 |
|
Travis Ralston
|
000d545ffd
|
Remove misleading text about admins logging people out from soft logout
|
2019-07-11 09:18:33 -06:00 |
|
Travis Ralston
|
5f9a123a80
|
Require an issue URL (or notes) on rageshakes
Fixes https://github.com/vector-im/riot-web/issues/8155
|
2019-07-11 09:14:31 -06:00 |
|
Travis Ralston
|
ed2f88fd79
|
Autojoin rooms when clicking the tombstone
Fixes https://github.com/vector-im/riot-web/issues/10299
|
2019-07-11 08:39:41 -06:00 |
|
Osoitz
|
7c9c94eb27
|
Translated using Weblate (Basque)
Currently translated at 99.5% (1679 of 1687 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
|
2019-07-11 14:20:13 +00:00 |
|
Weblate
|
49853a18f9
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-11 10:33:57 +00:00 |
|
Michael Telatynski
|
56b1775209
|
Merge pull request #3198 from matrix-org/t3chguy/kick
Show anything other than ban/invite -> leave as a kick
|
2019-07-11 11:33:53 +01:00 |
|
Szimszon
|
b3b776e028
|
Translated using Weblate (Hungarian)
Currently translated at 99.0% (1670 of 1687 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
|
2019-07-11 10:04:51 +00:00 |
|
Weblate
|
c470ad8465
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-11 08:38:22 +00:00 |
|
J. Ryan Stinnett
|
9b3848d083
|
Merge pull request #3200 from matrix-org/jryans/stylelint-all-files
Run stylelint on all SCSS files
|
2019-07-11 09:38:18 +01:00 |
|
Weblate
|
fc6793fdf8
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-11 08:10:07 +00:00 |
|
Kévin C
|
54b5e85dfa
|
Translated using Weblate (French)
Currently translated at 100.0% (1687 of 1687 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
|
2019-07-11 08:10:07 +00:00 |
|
Bruno Windels
|
dd12824a52
|
Merge pull request #3195 from matrix-org/bwindels/include-orig-in-history
Show original event in edit history
|
2019-07-11 08:10:01 +00:00 |
|
Weblate
|
84e4d59a52
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-10 18:10:13 +00:00 |
|
Travis Ralston
|
2a54fe321f
|
Use the state variable for the password when deactivating
The Field is controlled, so we should be using the state. Otherwise the value is undefined, which means we don't supply the required auth.
Fixes https://github.com/vector-im/riot-web/issues/10302
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3071
|
2019-07-10 11:26:09 -06:00 |
|
J. Ryan Stinnett
|
38d6953bf6
|
Manually fix remaining stylelint issues
|
2019-07-10 16:56:40 +01:00 |
|
Weblate
|
1dd2f4db3d
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-10 14:15:08 +00:00 |
|
Travis Ralston
|
ce11eff1b8
|
Simplify parameter check
|
2019-07-10 08:01:32 -06:00 |
|
Kévin C
|
7ea8b6d560
|
Translated using Weblate (French)
Currently translated at 100.0% (1686 of 1686 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
|
2019-07-10 13:52:21 +00:00 |
|
Nathan Follens
|
33a01a4f0b
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (1686 of 1686 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
|
2019-07-10 13:52:21 +00:00 |
|
Jeff Huang
|
bad1a48112
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1686 of 1686 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
|
2019-07-10 13:52:20 +00:00 |
|
Michael Telatynski
|
8d4356a5b9
|
Show anything other than ban/invite -> leave as a kick
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-07-10 08:57:00 +01:00 |
|
Travis Ralston
|
2ca6633fda
|
Update copy as per design
|
2019-07-09 23:55:20 -06:00 |
|
Travis Ralston
|
041379fa3c
|
Don't refuse the soft logout page if the user is soft logged out
|
2019-07-09 23:44:14 -06:00 |
|
Travis Ralston
|
1eb60ef1c4
|
Support SSO for rehydrating a soft-logged-out session.
Fixes https://github.com/vector-im/riot-web/issues/10238
|
2019-07-09 20:16:44 -06:00 |
|
Weblate
|
dd0f4cd9dc
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 17:43:47 +00:00 |
|
Travis Ralston
|
6cb148a88a
|
Merge pull request #3190 from matrix-org/travis/soft-logout-design
Dress up the soft logout page to look like the design
|
2019-07-09 11:43:42 -06:00 |
|
Weblate
|
e05e96bbd1
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 17:43:36 +00:00 |
|
Travis Ralston
|
4b1d78e04d
|
Merge branch 'develop' into travis/soft-logout-design
|
2019-07-09 11:35:49 -06:00 |
|
Travis Ralston
|
623b800753
|
Merge branch 'develop' into travis/soft-logout-overwrite
|
2019-07-09 11:35:24 -06:00 |
|
Weblate
|
c539f5c32c
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 17:32:35 +00:00 |
|
Travis Ralston
|
a33e5f1918
|
Merge pull request #3188 from matrix-org/travis/soft-logout-non-default-hs
Fix React crash when using a non-default homeserver on soft logout
|
2019-07-09 11:32:31 -06:00 |
|
Weblate
|
f9491696d9
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 17:32:22 +00:00 |
|
Travis Ralston
|
370fa27de3
|
Merge pull request #3187 from matrix-org/travis/soft-logout-keys
Change soft logout rehydrate text if there's pending key backups
|
2019-07-09 11:32:17 -06:00 |
|
Weblate
|
0afe4a13a8
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 17:31:56 +00:00 |
|
Travis Ralston
|
7b869f2824
|
Merge pull request #3182 from matrix-org/travis/soft-logout-rehydrate
Ask for the user's password to rehydrate their soft logged out session
|
2019-07-09 11:31:51 -06:00 |
|
Bruno Windels
|
11718a982a
|
use originalEvent if present and append it to list
|
2019-07-09 17:54:59 +02:00 |
|
Weblate
|
5666c0db45
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 15:05:08 +00:00 |
|
Bruno Windels
|
31723e9e5b
|
Merge pull request #3194 from matrix-org/bwindels/fix-history-redactions
Don't try to call bodyToHtml with an empty content
|
2019-07-09 15:05:03 +00:00 |
|
Weblate
|
7a7af68413
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 15:03:26 +00:00 |
|
J. A. Durieux
|
87a67df2d0
|
Translated using Weblate (Dutch)
Currently translated at 99.1% (1667 of 1682 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
|
2019-07-09 15:03:25 +00:00 |
|
Bruno Windels
|
7ab665bf31
|
Merge pull request #3193 from matrix-org/bwindels/replace-server-date
Take server-side aggregation into account for timestamp on (edited) tooltip
|
2019-07-09 15:03:21 +00:00 |
|
Bruno Windels
|
f03187190e
|
Don't try to call bodyToHtml with an empty content
with the stripReply flag, this crashes.
|
2019-07-09 15:00:26 +02:00 |
|
Weblate
|
88b91e24a5
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-09 09:59:33 +00:00 |
|
Karol Kosek
|
044d1b8130
|
Translated using Weblate (Polish)
Currently translated at 73.1% (1229 of 1682 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
|
2019-07-09 09:59:33 +00:00 |
|
Michael Telatynski
|
349afb13f3
|
Merge pull request #3164 from matrix-org/t3chguy/fix_proptypes_mismatches
Fix some React errors
|
2019-07-09 10:59:29 +01:00 |
|
Bruno Windels
|
58d7ed02b7
|
use method that also takes server aggregations into account for tooltip date
|
2019-07-09 11:31:29 +02:00 |
|
Travis Ralston
|
8ebc03706a
|
Also clear data when the deviceId doesn't match
When the HS implementation doesn't respect the device_id parameter erroneously
|
2019-07-08 15:35:34 -06:00 |
|
Travis Ralston
|
ab63e8bd04
|
Remove backwards compat function
|
2019-07-08 11:55:00 -06:00 |
|
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 |
|
Weblate
|
c8e0b7b96c
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-08 15:19:40 +00:00 |
|
Kévin C
|
61a7cc17a0
|
Translated using Weblate (French)
Currently translated at 100.0% (1682 of 1682 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
|
2019-07-08 15:19:39 +00:00 |
|
Jeff Huang
|
85e7fd4719
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1682 of 1682 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
|
2019-07-08 15:19:39 +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 |
|
Weblate
|
061bd789cf
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-08 09:23:55 +00: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 |
|
Weblate
|
c9f34a5d5a
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-08 08:19:31 +00: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 |
|
Jeff Huang
|
0b9ab4e566
|
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1681 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
|
2019-07-07 14:50:30 +00: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 |
|
Weblate
|
eb46774437
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-06 07:53:26 +00: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 |
|
Weblate
|
f9fe35dba3
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-06 07:53:03 +00: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 |
|
Weblate
|
89b8ccf471
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-05 16:56:04 +00: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 |
|
Tuomas Hietala
|
11e6a81941
|
Translated using Weblate (Finnish)
Currently translated at 99.6% (1675 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
|
2019-07-05 16:50:17 +00:00 |
|
Weblate
|
acadd624ef
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-05 15:35:11 +00:00 |
|
random
|
6cd2421929
|
Translated using Weblate (Italian)
Currently translated at 100.0% (1681 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
|
2019-07-05 15:35:11 +00:00 |
|
Tuomas Hietala
|
2bf3739af7
|
Translated using Weblate (Finnish)
Currently translated at 99.6% (1675 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
|
2019-07-05 15:35:11 +00: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 |
|
Weblate
|
60a9e39d69
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-05 15:28:16 +00:00 |
|
random
|
02fc3c9b85
|
Translated using Weblate (Italian)
Currently translated at 99.8% (1678 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
|
2019-07-05 15:28:16 +00: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 |
|
Weblate
|
e94b3c2459
|
Merge branch 'origin/develop' into Weblate.
|
2019-07-05 15:25:02 +00:00 |
|
random
|
2ce736f5a7
|
Translated using Weblate (Italian)
Currently translated at 99.6% (1674 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
|
2019-07-05 15:25:02 +00:00 |
|
Tuomas Hietala
|
b742525fbb
|
Translated using Weblate (Finnish)
Currently translated at 99.6% (1675 of 1681 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
|
2019-07-05 15:25:02 +00: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 |
|