Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into experimental #8003

merged 53 commits into from Jan 3, 2019


Copy link

dbkr commented Jan 3, 2019

No description provided.

akarshanbiswas and others added 30 commits Nov 16, 2018
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
This is mostly useful for cases when the UI is broken or the user can't access the button because they aren't logged in. This is particularly helpful for troubleshooting issues with .well-known discovery if/when they come up.

Ref: #4802
Add a function to send a rageshake from the console
Update from Weblate.
last one was in fasct the main version file
dbkr and others added 22 commits Dec 10, 2018
See the react-sdk PR for some context.
Update the tests to match matrix-org/matrix-react-sdk#2340
The JS SDK's CONTRIBUTING file is a bit simpler to read. The Synapse version previously used includes mentions of Python lint tools that don't apply here.

Signed-off-by: J. Ryan Stinnett <>
 * Turn off node integration in the electron renderer process
 * Enable the chromium sandbox to put the renderer into its own process
 * Expose just the ipc module with a preload script
 * Introduce a little IPC call wrapper so we can call into the
   renderer process and await on the result.
 * Use this in a bunch of places we previously used direct calls
   to electron modules.
 * Convert other uses of node, eg. use of process to derive the
   platform (just look at the user agent)
 * Strip out the desktopCapturer integration which doesn't appear
   to have ever worked (probably best to just wait until
   getDisplayMedia() is available in chrome at this point:

Update to new electron single instance API
Run the Desktop app in a sandbox
This puts the app into its own origin so it doesn't have access
to the filesystem via file:// URIs.

Next step: migrate over localstorage & indexeddb data from the old
Signed-off-by: J. Ryan Stinnett <>
Make clear that the Debian package is for desktop
Looks like this was broken in the webpack 4 upgrade due to the
worker script setter and the bundle being re-ordered in index.html.

 * Remove the loop: we only use two scripts now, so import them
 * Remove outdated olm import code.
 * Stop generating a script import for each theme: we were pulling
   in 3 js files that did absolutely nothing.
 * Fix worker 'onmessage' scope (set it as a global rather than
   trying to make it an ES6 module which it isn't).
 * Fail hard if the indexeddb worker script isn't set to avoid
   this happening again.
Fix the IndexedDB worker
App checks at startup for an existing session, if there isn't one,
it will start the tool to check for a login in the file:// origin.
If there is one, it will copy the login over to the vector://vector

In principle this could also be used to migrate logins between
other origins on the web if this were ever required.

This includes a minified copy of the browserified js-sdk with
a getAllEndToEndSessions() function added to the crypto store
(matrix-org/matrix-js-sdk#812). This is
not great, but for a short-lived tool this seems better than
introducing more entry points into webpack only used for the
electron app.
as per comment
Electron: Load app from custom protocol
@dbkr dbkr requested a review from vector-im/riot-web Jan 3, 2019
@jryans jryans self-assigned this Jan 3, 2019
jryans approved these changes Jan 3, 2019
Copy link

jryans left a comment

Thanks for working on this! 😁 Looks like a straightforward merge with no conflicts, so I quickly skimmed all files.

@jryans jryans assigned dbkr and unassigned jryans Jan 3, 2019

This comment has been minimized.

Copy link

turt2live commented Jan 3, 2019

@dbkr dbkr merged commit 373c587 into experimental Jan 3, 2019
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
continuous-integration/travis-ci/push The Travis CI build passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
None yet
8 participants
You can’t perform that action at this time.