Michael Telatynski
5762323bd1
Merge branch 'develop' into t3chguy/electron_profiles
2017-06-01 00:01:53 +01:00
Matthew Hodgson
448c10736a
Merge pull request #4012 from vector-im/t3chguy/electron_settings
...
auto-launch support [Electron]
2017-05-30 23:59:15 +01:00
Michael Telatynski
53b7b6cb14
Merge branch 't3chguy/electron_settings' of github.com:vector-im/riot-web into t3chguy/electron_settings
2017-05-30 12:34:05 +01:00
Michael Telatynski
c54e2a30b6
explicitly hide because setApplicationMenu on Linux otherwise shows...
...
https://github.com/electron/electron/issues/9621
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 12:33:32 +01:00
Michael Telatynski
db602f2bc0
Merge branch 'develop' into t3chguy/electron_profiles
2017-05-30 11:00:51 +01:00
Michael Telatynski
b27600adbe
Improve for Mac - Tested on 10.10.5
2017-05-30 10:53:01 +01:00
Michael Telatynski
9c25aab509
Fix bad merge (3993 before 4021 broke things)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 22:12:36 +01:00
Michael Telatynski
1d2bd68200
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_settings
2017-05-29 22:12:06 +01:00
Michael Telatynski
8a59acb5c3
explicit protocol in configs, otherwise breaks in Electron
...
when it tries file://
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:32:44 +01:00
Michael Telatynski
28d929f901
correct electron config to not point at personal piwik
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:10:13 +01:00
Michael Telatynski
c2c417b207
add piwik config to riot.im electron build config
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:07:56 +01:00
Matthew Hodgson
ff5adeff2c
Merge branch 'develop' into t3chguy/tidy_electron_files
2017-05-26 18:50:48 +01:00
Matthew Hodgson
445a55c7ca
Merge pull request #3992 from vector-im/t3chguy/electron_call_sleep
...
Prevent Power Save when in call (Electron)
2017-05-26 18:44:53 +01:00
Michael Telatynski
e63baf62c4
quit -> exit as screen is not accessible in alt instance
...
when using makeSingleInstance
which leads to a weird error
Unhandled exception { Error: Cannot find module '../screen'
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-26 09:49:23 +01:00
Michael Telatynski
0fb6a305a3
uber basic multi-profile support for electron app
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-26 09:48:32 +01:00
Michael Telatynski
727e267853
we don't really need a webContents like that, so pass if needed
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 12:47:36 +01:00
Michael Telatynski
c4c78c9b3e
split webContents context handling into own file, as main was growing
...
add handlers for editable fields, with Cut Copy Paste Undo Redo etc
add Copy Image feature to all images, working on not only the download
buttons now
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-25 12:42:53 +01:00
Michael Telatynski
a98792b05e
auto-launch support, ux =checkbox in UserSettings[Electron]
...
settings are sorta generic, probably reusable for proxy settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:52:08 +01:00
Michael Telatynski
c63e429c76
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_call_sleep
2017-05-24 10:56:36 +01:00
Michael Telatynski
8994c2bad1
missed a concat :)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:28:01 +01:00
Michael Telatynski
e0fb2fd074
/me forgets we don't have babel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:25:56 +01:00
Michael Telatynski
4bb054c955
electron stuff isn't actually using flow, so don't enable it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:25:18 +01:00
Michael Telatynski
911c3bcf6e
tidy electron files, they were starting to annoy me
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:21:52 +01:00
Michael Telatynski
4944bfdaa2
onAction support in Electron process, disable powersave when in call
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 18:32:39 +01:00
David Baker
73ec3e1f4d
Merge branch 'master' into develop
2017-05-22 11:44:31 +01:00
David Baker
5c4e3cec08
v0.9.10
2017-05-22 11:40:10 +01:00
David Baker
a9b5282ba3
Merge pull request #3909 from vector-im/t3chguy/favicon_improvements
...
Electron Tray Improvements
2017-05-19 16:22:11 +01:00
David Baker
029dfe5ed0
v0.9.10-rc.1
2017-05-19 10:41:22 +01:00
David Baker
5526525b6b
Merge pull request #3954 from vector-im/dbkr/riot_bot_for_desktop
...
Add config for riot-bot on desktop app build
2017-05-18 13:18:19 +01:00
David Baker
c9e821ffc5
Add config for riot-bot on desktop app build
...
Also remove unused room dir stuff
2017-05-18 12:00:02 +01:00
David Baker
dfb30e91de
Desktop: 'copy link address'
...
Add 'copy link address' to link context menu in electron app
2017-05-18 11:32:10 +01:00
Michael Telatynski
9352e5d78e
Lets make it abundantly clear that we want attention. FLASH FLASH FLASH
...
also improve favicon updating to not change if we're same as previous
not sure how intensive the nativeImage stuff is but cheap efficiency
For FLASH FLASH I moved the setBadgeCount stuff RPC -> IPC
should be more reliable now, its in electron-main
Win only:
if mainWindow is set and is not in focus make it FLASH
clear flash if notification gets cleared elsewhere
debounce focus handler so we don't set a million of them
if the app is backgrounded a while
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-17 10:39:43 +01:00
Michael Telatynski
826a571b60
apply same image to the window/taskbar too; as per request
...
LETS MAKE IT CLEAR WE ARE NEEDY AND WANT ATTENTION
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-17 10:05:50 +01:00
Michael Telatynski
aa7728cad3
tidy up tray.js - it made my eyes hurt
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:41:13 +01:00
Michael Telatynski
808240eef9
shouldn't need this try-catch
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:40:17 +01:00
Michael Telatynski
6aae97b812
Update tray tooltip based on document.title
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:39:55 +01:00
Michael Telatynski
bbda658b7f
make Electron tray icon mimic the Favico.js one
...
DRY: moved Favicon stuff into the base platform
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:37:13 +01:00
Michael Telatynski
c607b1bc89
npm is "smart" enough to try and install our electron wrapper as a module
...
instead of the actual electron package. With no way to ignore directories.
I'd like to think of this as temporary, until I get to rip apart riot-web
and riot-electron
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-10 13:36:27 +01:00