407be88c92
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:51:39 +01:00
5bb15b1002
simplify logic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:48:44 +01:00
bbf4d3e39f
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-29 00:34:27 +01:00
7f74bfde98
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (1165 of 1165 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-04-28 21:35:42 +00:00
daf4a57a9c
Translated using Weblate (Russian)
...
Currently translated at 100.0% (1165 of 1165 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-28 17:05:14 +00:00
55566b35a2
convert attribute to class
2018-04-28 12:39:25 -04:00
df30471df0
Translated using Weblate (Russian)
...
Currently translated at 100.0% (1165 of 1165 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-28 11:40:18 +00:00
819059e7a5
Translated using Weblate (Russian)
...
Currently translated at 100.0% (1165 of 1165 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-28 06:31:00 +00:00
873993a7ca
Clarify, hopefully
2018-04-27 17:56:33 +01:00
d3c368e19f
typo
2018-04-27 17:53:11 +01:00
0c309c88ad
Bluebird has no need for your .done()
2018-04-27 17:52:25 +01:00
fed74646b0
Rewrite to use async / await
2018-04-27 17:49:53 +01:00
74651b93ab
Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog
2018-04-27 15:57:15 +01:00
27b18c457e
Lint
2018-04-27 15:56:28 +01:00
a89e0f8da6
Merge remote-tracking branch 'origin/develop' into develop
2018-04-27 14:55:19 +00:00
51e5b73ed0
Translated using Weblate (Russian)
...
Currently translated at 100.0% (1165 of 1165 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-27 14:55:19 +00:00
773437b049
Merge pull request #1862 from matrix-org/luke/tests-group-view
...
Add tests for GroupView
2018-04-27 15:55:13 +01:00
efd29193b7
Fix UX issues with bug report dialog
...
* Make it use BaseDialog / DialogButtons (also gives it has a top-right 'x' &
escape to cancel works)
* Stop misusing the 'danger' CSS class on the buttons. There is nothing dangerous
about submitting logs.
* Continued campaign against 'Click here' links.
Fixes https://github.com/vector-im/riot-web/issues/6622
2018-04-27 15:23:35 +01:00
dc06c52985
Merge remote-tracking branch 'origin/dbkr/fix_session_restore_error_handling' into dbkr/fix_session_restore_fail_dialog_ux
2018-04-27 15:12:22 +01:00
2cc50d35c6
Lint
2018-04-27 15:06:36 +01:00
7915d97ed7
Also run other tests
2018-04-27 14:56:48 +01:00
a1c4424224
Add tests for GroupView
2018-04-27 14:28:24 +01:00
2987e2c681
Merge remote-tracking branch 'origin/dbkr/fix_session_restore_error_handling' into dbkr/fix_session_restore_fail_dialog_ux
2018-04-27 14:21:28 +01:00
75ab618c05
Fix variable scopes
2018-04-27 14:20:09 +01:00
a968a54be9
Merge remote-tracking branch 'origin/develop' into develop
2018-04-27 12:39:29 +00:00
8efac6117e
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 97.2% (1133 of 1165 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-04-27 12:39:28 +00:00
4ba8d69af1
Merge pull request #1861 from matrix-org/dbkr/update_hoek
...
Update version of hoek
2018-04-27 13:39:24 +01:00
bec81d82d2
Update version of hoek
2018-04-27 12:57:01 +01:00
6d9e07580b
UI fixes in SessionRestoreErrorDialog
...
* Make the 'delete my data' button not the default
* Make it red
* Give it a confirmation dialog
* Remove the 'cancel' button: what does it mean to cancel an error?
In this case, it tried again and almost certainly got the same error.
* Remove the top-right 'x' and don't cancel on esc for the same reason.
* Move 'send bug report' to a button rather than a 'click here' link
* Add a 'refresh' button which, even if it's no more likely to work,
will at least look like it's doing something (it's mostly so if you
don't have a bug report endpoint, there's still a button other
than the one that deletes all your data).
2018-04-27 12:38:49 +01:00
2e29a0857b
improve stripPlainReply comment and fix leading NewLine
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 12:12:01 +01:00
68dd57f56e
rename two methods
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:47:18 +01:00
3050553fc2
rename and change getInReplyTo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:44:14 +01:00
ca766df598
call onWidgetLoad on componentDidUpdate
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:32:04 +01:00
fdf63fd440
replace concat on comment from review
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:31:04 +01:00
3ba9f560d4
get MatrixClient from context
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:30:47 +01:00
88f48914b4
improve comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:28:17 +01:00
97fecaedc2
improve wording
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:26:42 +01:00
0323f8ed0c
Wrap exception handling around all of loadSession
...
The user might (probably does) have a session even if we haven't actually tried
to load it yet, so wrap the whole loadSession code in the error handler we were
using for restoring sessions so we gracefully handle exceptions that happen
before trying to restore sessions too.
Remove the catch in MatrixChat that sent you to the login screen. This is
never the right way to handle an error condition: we should only display the
login screen if we successfully determined that the user has no session, or
they explicitly chose to blow their sessions away.
2018-04-27 11:25:13 +01:00
4a0a5c6bef
Merge remote-tracking branch 'origin/t3chguy/m.relates_to' into t3chguy/m.relates_to
2018-04-27 11:23:12 +01:00
db1401f484
Pass false to onFinished from BaseDialog
...
Everywhere else, onFinished takes a boolean indicating whether the
dialog was confirmed on cancelled, and had function that were
expecting this variable and getting undefined.
2018-04-27 11:19:14 +01:00
82d117974f
Remove unused import
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:16:29 +01:00
3de679b084
Add comment to HtmlUtils.js
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:14:50 +01:00
71acf87c04
Add comments to _EventTile.scss
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:13:09 +01:00
fad20af51f
Translated using Weblate (Serbian)
...
Currently translated at 100.0% (1165 of 1165 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-04-26 17:07:00 +00:00
64a682ef47
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1165 of 1165 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-04-26 16:19:27 +00:00
18e6d4aea7
Translated using Weblate (French)
...
Currently translated at 100.0% (1165 of 1165 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-26 16:17:37 +00:00
f70096b8fa
Fix error handling on session restore
...
Fix a number of failures that meant the excellent error handling
we had for failing to restore a session didn't work.
1. .catch on the promise rather than try/catch: it's async
2. Explicit cancel method in SessionRestoreErrorDialog that invokes
onFinished with `false` because even with the catch fixed, this
was getting the event as its first arg which is truthy, so
clicking cancel still deleted your data.
3. DialogButtons: Don't pass onCancel straight into the button event
handler as this leaks the MouseEvent through as an argument.
Nothing is using it and it exacerbates failures like this
because there are surprise arguments.
Fixes https://github.com/vector-im/riot-web/issues/6616
2018-04-26 17:07:58 +01:00
ceb7bfc863
Merge remote-tracking branch 'origin/develop' into develop
2018-04-26 14:24:23 +00:00
05f1ca6942
Merge pull request #1858 from matrix-org/luke/fix-piwik-crash3
...
Fix bug that caused crash when analytics HS/IS whitelists not specified
2018-04-26 15:24:18 +01:00
5da62c6ad9
Fix bug that caused crash when analytics HS/IS whitelists not specified
2018-04-26 15:18:29 +01:00
Michael Telatynski