Commit graph

264 commits

Author SHA1 Message Date
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