OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
9,924 Commits
203 Branches
553 Tags
428 MiB
Commit Graph

9924 Commits (9d5ba25131648ce0121fb15471241eecbbee9a30)

Author SHA1 Message Date
David Baker 2cc50d35c6 Lint 2018-04-27 15:06:36 +01:00
Luke Barnard 7915d97ed7 Also run other tests 2018-04-27 14:56:48 +01:00
Luke Barnard a1c4424224 Add tests for GroupView 2018-04-27 14:28:24 +01:00
David Baker 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
David Baker 75ab618c05 Fix variable scopes 2018-04-27 14:20:09 +01:00
Weblate a968a54be9 Merge remote-tracking branch 'origin/develop' into develop 2018-04-27 12:39:29 +00:00
RainSlide 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
Luke Barnard 4ba8d69af1
Merge pull request #1861 from matrix-org/dbkr/update_hoek 
Update version of hoek
 2018-04-27 13:39:24 +01:00
David Baker bec81d82d2 Update version of hoek 2018-04-27 12:57:01 +01:00
David Baker 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
Michael Telatynski 2e29a0857b
improve stripPlainReply comment and fix leading NewLine 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 12:12:01 +01:00
Michael Telatynski 68dd57f56e
rename two methods 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:47:18 +01:00
Michael Telatynski 3050553fc2
rename and change getInReplyTo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:44:14 +01:00
Michael Telatynski ca766df598
call onWidgetLoad on componentDidUpdate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:32:04 +01:00
Michael Telatynski fdf63fd440
replace concat on comment from review 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:31:04 +01:00
Michael Telatynski 3ba9f560d4
get MatrixClient from context 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:30:47 +01:00
Michael Telatynski 88f48914b4
improve comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:28:17 +01:00
Michael Telatynski 97fecaedc2
improve wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:26:42 +01:00
David Baker 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
Michael Telatynski 4a0a5c6bef
Merge remote-tracking branch 'origin/t3chguy/m.relates_to' into t3chguy/m.relates_to 2018-04-27 11:23:12 +01:00
David Baker 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
Michael Telatynski 82d117974f
Remove unused import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:16:29 +01:00
Michael Telatynski 3de679b084
Add comment to HtmlUtils.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:14:50 +01:00
Michael Telatynski 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
Szimszon 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
Kévin C 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
David Baker 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
Weblate ceb7bfc863 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 14:24:23 +00:00
Luke Barnard 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
Luke Barnard 5da62c6ad9 Fix bug that caused crash when analytics HS/IS whitelists not specified 2018-04-26 15:18:29 +01:00
Luke Barnard 665e052596 Allow debugging of unhandled login errors 2018-04-26 15:09:17 +01:00
Weblate 1845ce29df Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 13:44:18 +00:00
Luke Barnard a17c6e10ff
Merge pull request #1857 from matrix-org/luke/fix-piwik-crash2 
Fix Analytics to not import DEFAULTS, therefore avoiding NPE
 2018-04-26 14:44:13 +01:00
Luke Barnard b1af4ec9fd Fix Analytics to not import DEFAULTS, therefore avoiding NPE 2018-04-26 14:30:27 +01:00
Weblate 333d65c032 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 13:05:50 +00:00
Luke Barnard fba1a0c4c7
Merge pull request #1856 from matrix-org/luke/fix-piwik-crash 
Null check piwik config before using it
 2018-04-26 14:05:46 +01:00
Andrey 5c6b8d748a 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-26 12:46:45 +00:00
Luke Barnard d734a9ba6e Null check piwik config before using it 
to avoid crashing at login
 2018-04-26 13:41:43 +01:00
Weblate 7212831722 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 12:14:54 +00:00
Luke Barnard 452bf0bd09
Merge pull request #1853 from matrix-org/luke/fix-piwik-page-url-reporting 
Track actual window location origin and hash
 2018-04-26 13:14:49 +01:00
Luke Barnard 053ef0bc0a PPI->PII 2018-04-26 13:05:59 +01:00
Luke Barnard 6b0af81f71 For paths with variables, insert <redacted> 
To preserve the analytics for these pages we did previously
 2018-04-26 12:22:56 +01:00
David Baker dafa65823c v0.12.3-rc.3 2018-04-26 11:19:48 +01:00
David Baker a290c6f101 Prepare changelog for v0.12.3-rc.3 2018-04-26 11:19:48 +01:00
David Baker 27b7daca5b Replace document.origin with window.location.origin 
document.origin is not a thing on firefox
 2018-04-26 11:14:21 +01:00
Weblate f51211ac93 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 10:05:44 +00:00
Luke Barnard 6c9bf17bfa
Merge pull request #1855 from matrix-org/dbkr/usercontent_replace_document_origin 
Replace document.origin with window.location.origin
 2018-04-26 11:05:39 +01:00
Luke Barnard ff4909e6ab Merge branch 'develop' into luke/fix-piwik-page-url-reporting 2018-04-26 11:03:55 +01:00
Luke Barnard 0614ef6abe i18n 
for new anayltics modal redesign
 2018-04-26 11:00:50 +01:00