Commit Graph

11673 Commits (67e8a6f9dc329c355081fe894b620f137cb56f39)

Author SHA1 Message Date
David Baker 67e8a6f9dc Recovery key formatting is now done by the js-sdk 2018-10-09 14:01:58 +01:00
David Baker 387128ed1e Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-05 14:01:50 +01:00
David Baker 88f969acdf
Merge pull request #2198 from matrix-org/dbkr/gone_away_is_the_bluebird
Silence bluebird warnings
2018-10-05 13:25:20 +01:00
David Baker a81589ffb5 Silence bluebird warnings 2018-10-05 12:15:03 +01:00
Travis Ralston aea9dbe1b8
Merge pull request #2197 from matrix-org/hs/object-urls-video
Use createObjectURL instead of readAsDataURL for videos
2018-10-04 13:57:50 -06:00
Travis Ralston 93d32f97fc
Merge pull request #2183 from matrix-org/travis/settings-no-sniping
Track how far the user travels before dismissing their user settings
2018-10-04 13:29:00 -06:00
David Baker 21cedbabf2
Merge pull request #2193 from Half-Shot/hs/purge-irc-hack
Drop (IRC) suffix hacks
2018-10-04 10:46:13 +01:00
David Baker 8ceca3abe9
Update Pill.js
Commas are not semicolons
2018-10-04 10:34:34 +01:00
Will Hunt 1e5101aa0c
The comment can go 2018-10-03 19:39:47 +01:00
Will Hunt 17915b5082
Merge branch 'develop' into hs/purge-irc-hack 2018-10-03 19:39:14 +01:00
Will Hunt fe788486b7 Drop (IRC) suffix hacks 2018-10-03 19:34:06 +01:00
David Baker 1189b75409
Merge pull request #2192 from matrix-org/dbkr/remove_migration_code
Remove old migration code
2018-10-03 19:08:44 +01:00
David Baker 1ec0f04baf Remove old migration code
...as instructed!
2018-10-03 18:33:34 +01:00
David Baker 849f0f796a js-sdk now handles recovery key formatting 2018-10-03 12:02:50 +01:00
Will Hunt 259063eda6
Remove useless comment. 2018-10-03 10:39:09 +01:00
Travis Ralston 2f35eded37
Merge pull request #2191 from aaronraimist/brace-style-textforevent
Fix brace style in TextForEvent.js
2018-10-02 21:24:12 -06:00
Aaron Raimist 91e8ee98a1
Fix brace style in TextForEvent.js
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-02 22:12:39 -05:00
David Baker 76f64bf733
Merge pull request #2190 from matrix-org/dbkr/fix_error_printing
Fix error logging
2018-10-02 20:27:32 +01:00
David Baker 56808077d0 js-sdk now handle recovery key formatting 2018-10-02 19:24:39 +01:00
David Baker e1f68551f1 Fix error logging 2018-10-02 19:23:43 +01:00
David Baker fa30707eae Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-02 16:59:15 +01:00
David Baker 3cc4ea5ecb
Merge pull request #2188 from aaronraimist/promise-defer-scalarauthclient
Fix Promise.defer warning in ScalarAuthClient.js
2018-10-02 12:14:18 +01:00
Aaron Raimist ef3d1a611a
Fix Promise.defer warning in ScalarAuthClient.js
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-01 19:57:27 -05:00
Bruno Windels 862d67c0f7 Merge branch 'master' into develop 2018-10-01 16:10:13 +02:00
Bruno Windels c4d39eebe7 v0.13.5 2018-10-01 16:07:31 +02:00
Bruno Windels d2d48a0b20 Prepare changelog for v0.13.5 2018-10-01 15:51:23 +02:00
Bruno Windels f8ffb15577 update matrix-js-sdk version to latest release 2018-10-01 15:49:01 +02:00
Matthew Hodgson bccfb5dafc better englishing 2018-10-01 13:27:32 +01:00
David Baker 3751074244
Merge pull request #2180 from matrix-org/travis/3pid-required
Communicate early that a 3pid is required during registration if needed
2018-10-01 11:55:53 +01:00
Matthew Hodgson df943a79df
Merge pull request #2185 from matrix-org/matthew/reword-rageshake
try to encourage people to attach logs to bugs
2018-09-28 22:19:15 +01:00
Matthew Hodgson 6652d2b0e6 try to encourage people to attach logs to bugs 2018-09-28 21:05:05 +01:00
Travis Ralston a1cb6d64cf
Merge pull request #2182 from matrix-org/travis/warn-disconnect-early
Show the 'homeserver unavailable' warning when the first sync fails
2018-09-28 07:55:07 -06:00
Bruno Windels 5765d59132
Merge pull request #2083 from matrix-org/t3chguy/is_url
allow passing initial is_url like hs_url in query params
2018-09-28 13:20:50 +01:00
Bruno Windels a933bbb2c4
Merge pull request #2177 from matrix-org/dbkr/update_karma
Update karma
2018-09-28 13:01:40 +01:00
Matthew Hodgson c0b89866de
Merge pull request #2184 from matrix-org/matthew/fudge-hangup-reason
fudge hangup reasons
2018-09-28 01:09:55 +01:00
Matthew Hodgson d839629aea fudge hangup reasons 2018-09-27 23:51:33 +01:00
Travis Ralston d74efd09ab Track how far the user travels before dismissing their user settings
Fixes https://github.com/vector-im/riot-web/issues/7158

Because the onClick was on a fullpage div, the browser was firing it regardless of how far the mouse moved. The onClick event itself doesn't give us any sort of travel distance, or a start point we can use to determine if they clicked a scrollbar or something. This means we have to rely on good ol' fashioned mouse down and up events to see if the user moved their mouse during their click. 

If the user's click starts in a valid container, we record the coordinates. This is so we can easily identify when the user clicks inside something like the settings container itself. When the user releases their mouse, we determine how far they moved their mouse - if the distance is within some threshold (~5 pixels in this case) then we can count it as a click. Because we've already filtered on the component they started their click in, we can safely rely on the presence of coordinates as a flag that they are in the right container, combined with the fact that they can't stray too far before their click not counting anyways.
2018-09-27 16:13:51 -06:00
Travis Ralston 16b2fb7fe6 Show the 'homeserver unavailable' warning when the first sync fails
Fixes https://github.com/vector-im/riot-web/issues/7380
2018-09-27 14:31:55 -06:00
Travis Ralston cf0c12f679
Merge pull request #2181 from matrix-org/travis/fix-i18n-script-1
Provide more helpful errors when i18n generation fails
2018-09-27 12:08:12 -06:00
Travis Ralston fb262596b2 Provide more helpful errors when i18n generation fails
Also fix TextForEvent.js so it doesn't break the script. Using a variable here is not recognized, so the object has been moved inline instead.
2018-09-27 11:55:57 -06:00
Travis Ralston de132a8f8e Communicate early that a 3pid is required during registration if needed
Fixes https://github.com/vector-im/riot-web/issues/7297
2018-09-27 11:53:45 -06:00
Bruno Windels 1b224c2205 v0.13.5-rc.1 2018-09-27 13:51:12 +01:00
Bruno Windels bd88bf9303 Prepare changelog for v0.13.5-rc.1 2018-09-27 13:51:11 +01:00
Bruno Windels 99a5989c03 bump matrix-js-sdk 2018-09-27 13:48:36 +01:00
Bruno Windels 1b4570ffa1
Merge pull request #2178 from matrix-org/bwindels/resynconlltoggle
resync when LL is toggled, show message when enabled
2018-09-27 09:49:39 +01:00
Bruno Windels 9c78610c62 Merge branch 'develop' into bwindels/resynconlltoggle 2018-09-26 18:22:24 +01:00
Bruno Windels f4860cfe63 update copyright notice 2018-09-26 18:22:05 +01:00
Bruno Windels b9f57d8f11
Merge pull request #2179 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2018-09-26 18:12:28 +01:00
Bruno Windels 83c2bd7313 Translated using Weblate (English (United States))
Currently translated at 65.0% (819 of 1259 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2018-09-26 16:27:44 +00:00
Bruno Windels e0c5b0d5ed translations 2018-09-26 17:23:51 +01:00