OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,292 Commits
205 Branches
546 Tags
417 MiB
Commit Graph

10292 Commits (e79738de8ade80614fb31351bd69103d92e09ab1)

Author SHA1 Message Date
Weblate be1c121e37 Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 16:57:26 +00:00
Luke Barnard 22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons 
Hide inline encryption icons except when hovering over a message
 2018-04-30 17:57:22 +01:00
Weblate c2846a96d7 Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 16:56:23 +00:00
Luke Barnard 80c67ba35d
Merge pull request #1863 from matrix-org/dbkr/bug_report_dialog_basedialog 
Fix UX issues with bug report dialog
 2018-04-30 17:56:19 +01:00
Eric Newport e037cf0063 namespace CSS better and fix bug 2018-04-30 12:22:16 -04:00
Weblate 51db7ddd89 Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 16:12:45 +00:00
Krombel 79491764fe Translated using Weblate (German) 
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/de/
 2018-04-30 16:12:44 +00:00
David Baker 5bacf50001
Merge pull request #1865 from matrix-org/matthew/image_errors 
fix ugly img errors and correctly render SVG thumbnails
 2018-04-30 17:12:40 +01:00
David Baker 025bffb4e9 Merge remote-tracking branch 'origin/dbkr/fix_session_restore_fail_dialog_ux' into dbkr/bug_report_dialog_basedialog 2018-04-30 16:20:12 +01:00
Bamstam 4d15392593 Translated using Weblate (German) 
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/de/
 2018-04-30 15:13:29 +00:00
zottel 3b927a6b93 Translated using Weblate (German) 
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/de/
 2018-04-30 15:12:20 +00:00
Krombel 6ab30e8d88 Translated using Weblate (German) 
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/de/
 2018-04-30 15:10:58 +00:00
Bamstam 461beb6548 Translated using Weblate (German) 
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/de/
 2018-04-30 15:09:43 +00:00
Andreas Marek 73b19dccf9 Translated using Weblate (German) 
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/de/
 2018-04-30 15:08:51 +00:00
Bamstam 8c4a5b15ee Translated using Weblate (German) 
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/de/
 2018-04-30 15:07:59 +00:00
Krombel 005d3efaf9 Translated using Weblate (German) 
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/de/
 2018-04-30 15:02:05 +00:00
Bamstam f1e401bedf Translated using Weblate (German) 
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/de/
 2018-04-30 15:01:21 +00:00
Krombel 485ea635cf Translated using Weblate (German) 
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/de/
 2018-04-30 14:57:47 +00:00
Klaus Marx 9f8abc68f7 Translated using Weblate (German) 
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/de/
 2018-04-30 14:57:09 +00:00
Krombel 60be988025 Translated using Weblate (German) 
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/de/
 2018-04-30 14:54:05 +00:00
David Baker d743e6afe2 Merge branch 'dbkr/bug_report_dialog_basedialog' of github.com:matrix-org/matrix-react-sdk into dbkr/bug_report_dialog_basedialog 2018-04-30 14:41:43 +01:00
David Baker e28a927da9 lint 2018-04-30 14:34:14 +01:00
David Baker c3420c37fd Indentation 2018-04-30 14:25:42 +01:00
David Baker 54cccab0c7 Factor out clearStorageButton 2018-04-30 14:22:18 +01:00
David Baker 5d46efc3e8 Get docs right on hasCancel 2018-04-30 14:17:21 +01:00
David Baker dcaacfd204 Merge remote-tracking branch 'origin/develop' into dbkr/fix_session_restore_fail_dialog_ux 2018-04-30 14:06:32 +01:00
David Baker a9b6db3f2e Lint 2018-04-30 13:41:04 +01:00
David Baker 37cb8abf13 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-30 13:39:46 +01:00
David Baker fc136607f1 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-30 13:39:46 +01:00
David Baker dded89383a v0.12.3 2018-04-30 13:37:57 +01:00
Weblate e936862868 Merge remote-tracking branch 'origin/develop' into develop 2018-04-30 12:37:30 +00:00
Andrey 19d9c62404 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-30 12:37:30 +00:00
Goudarz Jafari 603826b662 Translated using Weblate (Persian) 
Currently translated at 12.7% (148 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fa/
 2018-04-30 12:37:30 +00:00
Luke Barnard fba8a7d7d6
Merge pull request #1859 from matrix-org/dbkr/fix_session_restore_error_handling 
Fix error handling on session restore
 2018-04-30 13:37:25 +01:00
David Baker cb0ae26b54 Prepare changelog for v0.12.3 2018-04-30 13:37:19 +01:00
David Baker 68ca2a9461 Bump js-sdk version 2018-04-30 13:33:57 +01:00
Michael Telatynski 41af9f7a96
fix changed method name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 08:23:35 +01:00
Matthew Hodgson db5fc53853 final comment 2018-04-29 04:53:32 +01:00
Matthew Hodgson 45c0c0eddd add CSS destroyed by stickerpacks 
fixing mangling from 9fc7435ea2 (diff-be2f1d72c9704840ceddf019c825e825)
and 38efebb8d3 (diff-be2f1d72c9704840ceddf019c825e825)

also fixes https://github.com/vector-im/riot-web/issues/6492
 2018-04-29 04:50:44 +01:00
Matthew Hodgson 8538cc1666 fix regressions introduced by 00b7cc512b 2018-04-29 04:41:30 +01:00
Matthew Hodgson be523b3edc lint 2018-04-29 04:31:30 +01:00
Matthew Hodgson 551d3ebda0 correctly fix up thumbnail height onload. 
fixes https://github.com/vector-im/riot-web/issues/6492, although popping is inevitable in
the current implementation as it only fixes up the thumbnail size once the image has loaded.
 2018-04-29 04:28:15 +01:00
Matthew Hodgson 731f1fa7d3 clarify another scrolljump bug 2018-04-29 04:00:02 +01:00
Matthew Hodgson c254d043c5 fix ugly img errors and correctly render SVG thumbnails 
Fixes https://github.com/vector-im/riot-web/issues/6271
Fixes https://github.com/vector-im/riot-web/issues/1341
 2018-04-29 03:58:17 +01:00
Matthew Hodgson 9c5407c21f revokeObjectURLs 2018-04-29 03:17:55 +01:00
Matthew Hodgson bffd5bb891 fix constness 2018-04-29 03:09:17 +01:00
Matthew Hodgson 9701fd32b7 switch back to blob urls for rendering e2e attachments 
Based on @walle303's work at https://github.com/matrix-org/matrix-react-sdk/pull/1820
Deliberately reverts 8f778f54fd
Mitigates XSS by whitelisting the mime-types of the attachments so that malicious ones
should not be recognised and executed by the browser.
 2018-04-29 03:07:31 +01:00
Michael Telatynski 4021fc049c
re-arrange method order to group statics before instance methods 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 00:54:54 +01:00
Michael Telatynski c00c52e537
added another comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 00:53:35 +01:00
Michael Telatynski 407be88c92
add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-29 00:51:39 +01:00