gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,807 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

423 Commits

Author SHA1 Message Date
RiotRobot 88c8ea0d5a v1.3.0-rc.2 2019-07-12 17:38:06 +01:00
RiotRobot a23386bdb4 v1.3.0-rc.1 2019-07-12 11:39:59 +01:00
J. Ryan Stinnett f1a680322b Add riot.im configuration files 2019-07-12 10:48:34 +01:00
J. Ryan Stinnett d47d0e4097 Enable reactions and edits for desktop 2019-07-12 10:23:14 +01:00
RiotRobot e5ffb8de4c v1.2.4 2019-07-11 11:24:52 +01:00
RiotRobot a53d7edc7f v1.2.3 2019-07-08 11:10:31 +01:00
RiotRobot 1ce8f3844b v1.2.3-rc.1 2019-07-03 17:47:41 +01:00
J. Ryan Stinnett c9bd1b8510 Change update URL to match new host 2019-07-03 15:47:52 +01:00
Michael Telatynski 320f3198ea Fix Electron vector: links 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-27 20:33:15 +01:00
Michael Telatynski 974797648f Move config-getting to VectorBasePlatform 
in Electron get config via IPC from main process
which has access to the "local" config.json override file
and can make people happy :D

Remove bunch of duplicated code,
and move comments around to put them in the right place

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-26 21:08:04 +01:00
RiotRobot 6f1ce750bf Merge branch 'master' into develop 2019-06-19 16:03:22 +01:00
RiotRobot 80262314f3 v1.2.2 2019-06-19 15:59:10 +01:00
J. Ryan Stinnett f3bfb08280 Update Electron's runtime PNG icon to match others 
This runtime PNG icon (the default window and tray icon) was not updated to
remove the white background when we last changed the branding. This copies a 265
px PNG from elsewhere to ensure it matches.

Part of https://github.com/vector-im/riot-web/issues/9897
 2019-06-18 16:59:04 +01:00
J. Ryan Stinnett 292427c275 Move default Electron icons outside asar 
Electron doesn't seem to want to load icons from within `asar`s, so this changes
the default icons (used for window and tray) so that they are just regular files
on disk and updates the reference to match.

Part of https://github.com/vector-im/riot-web/issues/9897
 2019-06-18 16:58:43 +01:00
RiotRobot a86f1e8a90 v1.2.2-rc.2 2019-06-18 15:58:36 +01:00
J. Ryan Stinnett f10e7ac224 Fix reference to main window when setting Electron window icon 
This fixes the fallback path which sets the Electron window icon to the default
icon in case there's no data URI based icon coming content. This is true
immediately after startup, for example.

Part of https://github.com/vector-im/riot-web/issues/9897
 2019-06-18 14:31:19 +01:00
RiotRobot b751383702 v1.2.2-rc.1 2019-06-12 12:11:12 +01:00
RiotRobot 6b93053a80 v1.2.1 2019-05-31 11:53:34 +01:00
RiotRobot d6fb0bc24f v1.2.0 2019-05-29 16:19:59 +01:00
RiotRobot 7f7b3e747c v1.2.0-rc.1 2019-05-23 17:40:08 +01:00
David Baker 8ac5957186 v1.1.2 2019-05-15 14:34:59 +01:00
David Baker 875d1b209a v1.1.1 2019-05-14 13:53:31 +01:00
David Baker 5c46bd37e8 v1.1.0 2019-05-07 15:54:38 +01:00
David Baker 7c5e39e170 Add new scalar staging url 2019-05-01 11:45:11 +01:00
David Baker 49efece6c6 v1.1.0-rc.1 2019-04-30 12:48:52 +01:00
David Baker f400cea437 Merge branch 'master' into develop 2019-04-16 01:26:24 +01:00
David Baker 29cb8c42b0 v1.0.8 2019-04-16 01:22:02 +01:00
pacien 2c9b51f29d Add support for custom profile directory 
A custom user data directory can now be specified using the "profile-dir"
command line argument.

Github ref: closes #6175

Signed-off-by: Pacien TRAN-GIRARD <pacien.trangirard@pacien.net>
 2019-04-09 19:35:14 +02:00
Bruno Windels a41a14b975 Merge branch 'master' into develop 2019-04-08 16:21:13 +02:00
Bruno Windels 659c29cf77 v1.0.7 2019-04-08 16:16:46 +02:00
Travis Ralston f36a24fef0 Fix autolaunch setting appearing toggled off 
Fixes https://github.com/vector-im/riot-web/issues/9123

The value used here is a function which returns a promise, not a flag.
 2019-04-02 17:59:47 -06:00
Travis Ralston 8b2d33ac0a Don't try to save files the user didn't want to save 
Fixes https://github.com/vector-im/riot-web/issues/9350
 2019-04-01 13:24:17 -06:00
David Baker 2bac72fa36 v1.0.6 2019-04-01 13:53:18 +01:00
Travis Ralston 7a9cea4baa Add "Save image as..." button to context menu on images 
Fixes https://github.com/vector-im/riot-web/issues/9324
Requires https://github.com/matrix-org/matrix-react-sdk/pull/2848
 2019-03-29 16:21:25 -06:00
David Baker f392a00138 v1.0.6-rc.1 2019-03-27 17:46:32 +00:00
Bruno Windels f777c2c9bc Merge branch 'master' into develop 2019-03-21 11:40:43 +01:00
Bruno Windels 0dd1a7b309 v1.0.5 2019-03-21 11:34:17 +01:00
David Baker 42c2692d28 Merge branch 'master' into develop 2019-03-18 14:20:09 +00:00
David Baker 5254cef980 v1.0.4 2019-03-18 14:11:52 +00:00
Aaron Raimist b40ed7cb11
Update Electron help menu link 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-03-13 14:43:24 -05:00
David Baker 958e8662d9 v1.0.4-rc.1 2019-03-13 14:58:28 +00:00
J. Ryan Stinnett 13aca0716a Add yarn lock file for Electron app 
We did not previously commit lock files for the Electron app, so there is no
correct copy to import from. For this directory, I created a fresh yarn lock
file using yarn install.
 2019-03-11 15:33:00 +00:00
David Baker acb8afaeb7 Merge branch 'master' into develop 2019-03-06 16:07:05 +00:00
David Baker 8e9d73fb5b v1.0.3 2019-03-06 15:55:40 +00:00
David Baker b2d417d7ef Merge branch 'master' into develop 2019-03-06 11:38:17 +00:00
David Baker ea86359c41 v1.0.2 2019-03-06 11:31:02 +00:00
David Baker b7d2159d60 v1.0.2-rc.3 2019-03-05 19:20:57 +00:00
David Baker 5474a5e0c7 utm_campaign is now added automatically 2019-03-05 18:27:22 +00:00
David Baker 9235b5a861 Add modular.im hosting link to electron app config 2019-03-05 18:27:15 +00:00
David Baker 116f1d7d92 utm_campaign is now added automatically 2019-03-05 16:45:46 +00:00
David Baker 3c123a064b Add modular.im hosting link to electron app config 2019-03-05 16:18:04 +00:00
David Baker 29ff95cccc v1.0.2-rc.2 2019-03-01 17:39:57 +00:00
David Baker ab1ceff242 v1.0.2-rc.1 2019-03-01 12:20:32 +00:00
Michael Telatynski baa034230f
Merge pull request #8983 from vector-im/t3chguy/local-config 
Add support for localConfig at $appData/config.json.
 2019-03-01 07:54:49 +00:00
Nad Chishtie f020995ac4 Updated install spinner referenced in #8913 2019-02-28 11:19:00 +01:00
Michael Telatynski 0e0c1cfad3 Add support for localConfig at $appData/config.json. 
Move electron-config to $appData/electron-config.json

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-28 00:17:33 +00:00
Travis Ralston a5a4c167e8
Merge pull request #8911 from vector-im/t3chguy/no-update 
Allow disabling update mechanism
 2019-02-24 18:00:54 -07:00
Michael Telatynski ffacf30722 Allow disabling update mechanism 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 04:52:07 +00:00
Michael Telatynski 714570443d Allow configuration of whether closing window closes or minimizes to tray 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 01:08:01 +00:00
Bruno Windels 77b317b3cf v1.0.1 2019-02-15 14:00:01 +01:00
J. Ryan Stinnett 55da52debd v1.0.0 2019-02-14 17:07:27 +00:00
J. Ryan Stinnett 21f11f02a4 v1.0.0-rc.2 2019-02-14 11:19:06 +00:00
J. Ryan Stinnett 32c958e2f2 Merge branch 'develop' into release-v1.0.0 2019-02-14 11:17:18 +00:00
Nad Chishtie db30c24b9f Updated app icons 2019-02-13 17:58:57 +00:00
David Baker bbbb4c7861 run icons script on new icon 2019-02-13 17:28:28 +00:00
David Baker a51c0744e6 v1.0.0-rc.1 2019-02-08 18:45:53 +00:00
Aaron Raimist a03a738317
Only allow Electron to zoom with CommandOrControl+= 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-02-06 13:20:40 -06:00
Aaron Raimist bfdffc653e
Allow Electron to zoom with CommandOrControl+= 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-02-02 15:53:10 -06:00
Bruno Windels 90140f6361
Merge pull request #8321 from vector-im/experimental 
Merge redesign into develop
 2019-01-30 12:49:37 +00:00
David Baker 2aaed5d4c3 Doc broken will-navigate listener 2019-01-24 11:36:36 +00:00
David Baker a0c205e4c9 v0.17.9 2019-01-22 11:44:13 +00:00
David Baker e94e712d49 v0.17.9-rc.1 2019-01-17 11:07:42 +00:00
Michael Telatynski 8c895cd435 Correct the copying of e-mail addresses in the electron app 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-01-15 08:37:01 +00:00
David Baker 62a49af23f Only serve origin migrator whilst migrating 
as per comment
 2018-12-21 22:21:06 +00:00
David Baker 751a1dc543 Add tool to migrate logins between origins 
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
origin.

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
(https://github.com/matrix-org/matrix-js-sdk/pull/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.
 2018-12-21 19:14:25 +00:00
David Baker b6d70f4434 Missing include 2018-12-19 12:25:32 +00:00
David Baker fc4e1485ad Electron: Load app from custom protocol 
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
origin...
 2018-12-19 12:04:40 +00:00
David Baker b35903bb19
Merge pull request #7907 from vector-im/dbkr/electron_sandbox 
Run the Desktop app in a sandbox
 2018-12-19 09:48:10 +00:00
David Baker 60d3076038 Update to new electron single instance API 2018-12-18 18:10:09 +00:00
David Baker 19f1489c92 Run the Desktop app in a sandbox 
* 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:
   https://github.com/vector-im/riot-web/issues/4880).
 2018-12-18 17:42:55 +00:00
David Baker 7c4f67b1a1 v0.17.8 2018-12-10 13:46:57 +00:00
David Baker 74c81d6921 v0.17.8-rc.1 2018-12-06 12:48:34 +00:00
David Baker 02eb8a284c Actually revert electron app version bump 
last one was in fasct the main version file
 2018-12-06 12:47:18 +00:00
David Baker 6ba471421f v0.17.8-rc.1 2018-12-06 11:20:33 +00:00
David Baker 58f927538f v0.17.7 2018-11-22 16:56:41 +00:00
David Baker 07ed2e8d0a v0.17.6 2018-11-19 15:23:08 +00:00
David Baker a4a6f070e4 v0.17.6-rc.2 2018-11-15 15:38:42 +00:00
David Baker 154e8bdb50 v0.17.6-rc.1 2018-11-15 12:21:16 +00:00
David Baker cc4d0af713 Merge branch 'master' into develop 2018-11-13 19:02:34 +00:00
David Baker a1e5c72eb9 v0.17.5 2018-11-13 18:52:59 +00:00
David Baker 061838bdab Merge branch 'master' into develop 2018-11-13 18:19:10 +00:00
David Baker 71403980cc v0.17.4 2018-11-13 18:09:48 +00:00
David Baker 409c48efcb Merge branch 'master' into develop 2018-10-29 14:27:46 +00:00
David Baker 4574415e97 v0.17.3 2018-10-29 14:20:59 +00:00
Michael Telatynski c80f5ddcd1 Correct the author of the electron app 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-10-27 11:04:05 +01:00
David Baker a9a45dc32b v0.17.3-rc.1 2018-10-24 11:30:44 +01:00
Bruno Windels 221f75542a v0.17.2 2018-10-19 16:51:26 +02:00
David Baker 2518976326 v0.17.1 2018-10-18 18:38:54 +01:00
David Baker 1fc8592ef6 v0.17.0 2018-10-16 10:59:18 +01:00
David Baker 005e4aa1bd Phased rollout of lazyloading 2018-10-16 10:43:15 +01:00
David Baker 74f2266d89 v0.17.0-rc.1 2018-10-11 16:02:48 +01:00
Bruno Windels 957fde964b v0.16.5 2018-10-01 16:48:52 +02:00
Bruno Windels 582b67c42e v0.16.5-rc.1 2018-09-27 14:48:40 +01:00
Bruno Windels 44791a65b8 Revert "v0.16.5-rc.1" 
This reverts commit 81dfe506ac.
 2018-09-27 14:46:42 +01:00
Bruno Windels 81dfe506ac v0.16.5-rc.1 2018-09-27 14:42:14 +01:00
David Baker d8aaae6d42 v0.16.4 2018-09-10 11:42:20 +01:00
David Baker 42bac1620e v0.16.4-rc.1 2018-09-07 14:39:20 +01:00
David Baker c150d97eaf v0.16.3 2018-09-03 14:29:48 +01:00
David Baker 9e4aa50567 v0.16.3-rc.2 2018-08-31 13:50:57 +01:00
David Baker 2bef30635c v0.16.3-rc.1 2018-08-30 14:39:12 +01:00
David Baker 656d0e0ff4 v0.16.2 2018-08-23 15:32:22 +01:00
David Baker 2ba60a7893 v0.16.1 2018-08-20 13:58:47 +01:00
David Baker c46963807e v0.16.1-rc.1 2018-08-16 15:46:28 +01:00
David Baker 6e0aeeea83 v0.16.0 2018-07-30 12:14:55 +01:00
David Baker f248da3e08 v0.16.0-rc.2 2018-07-24 19:40:52 +01:00
David Baker ea00df0466 v0.16.0-rc.1 2018-07-24 18:33:53 +01:00
David Baker 847df2f75b v0.15.7 2018-07-09 13:19:14 +01:00
David Baker d7ebd88804 v0.15.7-rc.2 2018-07-06 15:59:20 +01:00
David Baker 7e3cb3ba31 v0.15.7-rc.1 2018-07-04 11:27:21 +01:00
David Baker 84fbee085d v0.15.6 2018-06-29 12:01:17 +01:00
David Baker 62653d39b3 v0.15.6-rc.2 2018-06-22 18:13:00 +01:00
David Baker f9868b6100 v0.15.6-rc.1 2018-06-21 10:18:45 +01:00
David Baker 3847388ed0
Merge pull request #6805 from vector-im/t3chguy/electron_changes 
[electron] Fix desktop app --hidden flag
 2018-06-14 12:04:48 +01:00
David Baker ef341d4333 v0.15.5 2018-06-12 14:33:22 +01:00
David Baker e03248929d v0.15.5-rc.1 2018-06-06 16:09:22 +01:00
Michael Telatynski e0bb6183a6
remove debug log 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-26 14:37:04 +01:00
Michael Telatynski 20dd2c0b58
tidy code 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-26 14:36:25 +01:00
Michael Telatynski 8a4a6b2023
refactor hidden logic to be more resilient against electron weirdness 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-26 14:21:38 +01:00
Michael Telatynski ca2533cafa
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-26 14:00:45 +01:00
David Baker 07772ef5a2 v0.15.4 2018-05-25 15:23:18 +01:00
David Baker 05e0e842d6 Add cookie policy URL to electron config 2018-05-25 10:00:44 +01:00
David Baker bd3eedbda9 v0.15.4-rc.1 2018-05-24 18:27:06 +01:00
David Baker 581c95d093 Temporarily revert electron version bump 2018-05-24 18:26:43 +01:00
David Baker 5f6b60370d v0.15.4-rc.1 2018-05-24 18:24:59 +01:00
David Baker d5b21021fb v0.15.3 2018-05-18 12:36:22 +01:00
David Baker 4656d25590 Hide URL options for e2e blob: URL images 
These won't work outside of the electron app so there is zero point
in trying to open them in an external browser or offerring to copy
them to the clipboard
 2018-05-18 12:24:22 +01:00
David Baker d353c13bf1 Comment why we're passing empty objects in 2018-05-18 12:24:02 +01:00
David Baker 8872a6a24a Fix right click menu in electron 
Fixes https://github.com/vector-im/riot-web/issues/6762
 2018-05-18 12:23:56 +01:00
David Baker 3598df0d28 v0.15.2 2018-05-17 17:07:50 +01:00
David Baker 145fb69bdd v0.15.1 2018-05-16 16:12:07 +01:00
David Baker 6640e709f8 v0.15.0 2018-05-16 11:54:58 +01:00
David Baker f2bd4a4b5c v0.15.0-rc.6 2018-05-15 18:06:44 +01:00
Luke Barnard e9f0f84152 v0.15.0-rc.5 2018-05-15 15:59:02 +01:00
Luke Barnard 3987621b12 v0.15.0-rc.4 2018-05-14 18:29:49 +01:00
Luke Barnard ebb08a57c8 v0.15.0-rc.3 2018-05-11 18:29:33 +01:00
Luke Barnard 6c5c3c3454 v0.15.0-rc.2 2018-05-09 17:37:48 +01:00
Luke Barnard 98c9dd23d5 v0.15.0-rc.1 2018-05-09 15:27:48 +01:00
Luke Barnard 371ea7c078 v0.14.3-rc.1 2018-05-09 13:50:45 +01:00
Luke Barnard 7f50fb3023 Merge branch 'master' into develop 2018-05-09 13:32:06 +01:00
David Baker dd7ae83226 No trailing / 2018-04-30 16:12:53 +01:00
David Baker 48a16464d5 Don't show presence on matrix.org 2018-04-30 16:00:17 +01:00
David Baker 9235c0dcfa v0.14.2 2018-04-30 13:43:04 +01:00
David Baker 6dad8e695e v0.14.2-rc.3 2018-04-26 15:35:51 +01:00
David Baker 73e4fcafdc v0.14.2-rc.2 2018-04-26 11:44:36 +01:00
David Baker 8b99a72f2c v0.14.2-rc.1 2018-04-25 17:37:35 +01:00
David Baker 083dd4eeec Temporarily revert electron version bump 2018-04-25 16:36:16 +01:00
David Baker 3dcf194960 v0.14.2-rc.1 2018-04-25 15:41:33 +01:00
David Baker 7a2866feb9 v0.14.1 2018-04-12 12:59:27 +01:00
Luke Barnard b2a0031fe1 v0.14.0 2018-04-11 11:57:33 +01:00
Luke Barnard da988c85e4 v0.14.0-rc.6 2018-04-09 17:13:11 +01:00
Luke Barnard 233c3d2c98 v0.14.0-rc.5 2018-04-09 15:43:22 +01:00
David Baker 0d64c5fb83 v0.14.0-rc.4 2018-03-22 13:27:32 +00:00
David Baker 6bfb15ce7b v0.14.0-rc.3 2018-03-20 17:40:36 +00:00
David Baker 64c8f3dbe3 v0.14.0-rc.2 2018-03-19 15:01:14 +00:00
David Baker a662080ffe v0.14.0-rc.1 2018-03-19 12:20:02 +00:00
David Baker 1d222e3507 v0.13.5 2018-02-09 12:38:23 +00:00
David Baker 2eb433157a v0.13.4 2018-01-03 16:08:38 +00:00
Michael Telatynski d71af40967 add missing config.json entry such that scalar-staging widgets work 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-03 16:06:58 +00:00
Luke Barnard 5fba5b30e9 v0.13.3 2017-12-04 12:29:32 +00:00
Richard van der Hoff 854a665627 v0.13.2 2017-11-28 11:16:45 +00:00
David Baker 6ebab2cb8d v0.13.1 2017-11-17 16:05:26 +00:00
Luke Barnard 898bb6f9d8 v0.13.0 2017-11-15 11:08:37 +00:00
Luke Barnard 5e8ddc6d7c v0.13.0-rc.3 2017-11-14 14:21:44 +00:00
Luke Barnard ea0cfa92b4 v0.13.0-rc.2 2017-11-10 16:52:24 +00:00
Luke Barnard 0630d856f8 v0.13.0-rc.1 2017-11-10 13:44:08 +00:00
David Baker 8716f93a6d Disable labs in electron 
as we now disable labs in release Riot
 2017-10-16 15:22:17 +01:00
David Baker 2ca0d6621c v0.12.7 2017-10-16 14:55:33 +01:00
David Baker e0de9cbdfe v0.12.7-rc.3 2017-10-13 16:36:07 +01:00
David Baker 4bd53eb821 v0.12.7-rc.2 2017-10-13 15:05:34 +01:00
David Baker 79154e26fc v0.12.7-rc.1 2017-10-13 11:14:31 +01:00
David Baker af3feccc2d v0.12.6 2017-09-21 21:50:48 +01:00
David Baker f450ce422e v0.12.5 2017-09-21 18:06:03 +01:00
David Baker e814eb4555 v0.12.4 2017-09-20 15:18:17 +01:00
David Baker 8a4710b270 v0.12.4-rc.1 2017-09-19 10:55:28 +01:00
Michael Telatynski d97224e69e
fix really dumb blunder/typo preventing system from going to sleep. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-19 00:53:44 +01:00
David Baker 079f39efed Add New Vector windows build signing cert 
As the signing process needs it.
 2017-09-11 17:04:10 +01:00
David Baker 941f92530d Merge pull request #4623 from MurzNN/patch-1 
Fix menu on change keyboard language issue #4345
 2017-09-07 16:01:04 +01:00
David Baker 2ab9dc4270 v0.12.3 2017-09-06 13:31:31 +01:00
David Baker 0ced816505 v0.12.3-rc.3 2017-09-05 13:42:47 +01:00
David Baker 0c04df88cd v0.12.3-rc.2 2017-09-05 13:14:33 +01:00
David Baker 8b59c8c167 v0.12.3-rc.1 2017-09-01 16:21:38 +01:00
David Baker 843b608939 v0.12.2 2017-08-24 14:51:11 +01:00
Michael Telatynski 61d9c1a57a
Merge remote-tracking branch 'remotes/origin/develop' into patch-1 2017-08-24 10:07:04 +01:00
David Baker 2cec34021a v0.12.1 2017-08-23 15:58:05 +01:00
David Baker c7ddf6a80d v0.12.1-rc.1 2017-08-22 18:56:13 +01:00
Luke Barnard e5dd37d2d6 v0.12.0-rc.1 2017-08-16 10:39:57 +01:00
Michael Telatynski a6d5158830
electron support for mouse forward/back buttons in Windows 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-03 15:03:50 +01:00
Alexey Murz Korepov c6bc20cd2a Fix menu on change keyboard language issue #4345 
Fix activating menu when changing keyboard language / layout  via Alt-Shift, Alt-Ctrl, Alt-CapsLock, and Alt-Space
 2017-07-18 09:23:32 +03:00
Richard van der Hoff cc56ef3abd Attempt to flush the rageshake logs on close 
... so that we get to see what happened in the last 30s.
 2017-06-22 18:25:19 +01:00
Michael Telatynski 0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	electron_app/src/tray.js
 2017-06-22 15:04:33 +01:00