Commit graph

237 commits

Author SHA1 Message Date
Roxanne Skelly
c3e956932b Fix OSX Build 2018-09-27 15:22:04 -07:00
Roxanne Skelly
ec4575f587 Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup 2018-09-27 13:36:10 -07:00
Roxanne Skelly
b0b2c6f3ee Fixup path finding for interface 2018-09-27 13:31:28 -07:00
Roxanne Skelly
f1ba213ccc Merge branch 'sysTray' of https://github.com/roxanneskelly/hifi into sysTraySetup 2018-09-27 12:08:51 -07:00
Roxanne Skelly
330789471d Fix merge conflict and set proper polling times 2018-09-27 12:03:37 -07:00
Roxanne Skelly
00a5075d34 Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup 2018-09-27 11:44:41 -07:00
Roxanne Skelly
6a3b286a07 Fix windows notification popups:w 2018-09-27 11:44:00 -07:00
Roxanne Skelly
d851e3994e Search for interface should check peer package
Also, retain enabled/disabled state for notifications across restarts
2018-09-27 11:10:51 -07:00
Roxanne Skelly
61aef14c64 OSX notifications dismiss the previous notifications immediately when
sent, preventing 'click' behavior
2018-09-27 10:16:21 -07:00
Roxanne Skelly
b6fd302a83 OSX Interface-running detection fixes 2018-09-26 18:40:54 -07:00
Roxanne Skelly
ba1bae6408 OSX Build fix 2018-09-26 17:43:04 -07:00
Roxanne Skelly
db772fc3fe Update console name for osx build 2018-09-26 15:39:45 -07:00
Roxanne Skelly
45a3df114f Merge branch 'sysTraySetup' of https://github.com/roxanneskelly/hifi into sysTray 2018-09-26 13:05:30 -07:00
Roxanne Skelly
5949679c0a Add mac interface-run detection to server-console 2018-09-26 13:00:37 -07:00
Roxanne Skelly
2c6e9349eb SysTray Setup. server-console.exe should be included in client-only
installs.

By default, on new install, tray notifier should be enabled.
2018-09-26 12:59:15 -07:00
Roxanne Skelly
be87773b2c Checkpoint sysTray Installer 2018-09-26 10:47:33 -07:00
Roxanne Skelly
7257a99414 Checkpoint sysTray Installer 2018-09-26 10:46:19 -07:00
Roxanne Skelly
3deb3bc771 Coding standard issue found during CR 2018-09-25 14:17:15 -07:00
Roxanne Skelly
ac2ad7fc81 Fix some coding standard issues found during CR 2018-09-25 14:13:25 -07:00
Roxanne Skelly
e3943f210d Save 'enabled' configuration between restarts 2018-09-24 16:16:56 -07:00
Roxanne Skelly
16dba169c5 Tray Notifier code review fixes 2018-09-24 14:36:54 -07:00
Roxanne Skelly
d5baadbefa Modify --url hifiapp: behavior to trigger through appUI when first
starting interface.

Also, menu names and order follow UX documentation.
2018-09-24 13:43:55 -07:00
Stephen Birarda
0381630e73 update some server-console dependencies after npm audit 2018-09-20 16:07:24 -07:00
Roxanne Skelly
6e051b7431 Checkpoint tray notifications
* Fix app launch
* refactor notifications code
* fixup wording
2018-09-20 15:55:35 -07:00
Roxanne Skelly
bda179697e Tray Notifications - users handling changes
Since the 'users' api call doesn't support a 'since', we now query
all of the online connections each time to keep track of connections
that join or leave.
2018-09-19 15:50:50 -07:00
Roxanne Skelly
d5f756c79d Tray Notifier Checkpoint
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
2018-09-19 12:40:15 -07:00
Roxanne Skelly
555432dd49 Blank js file to force build (and prep for appinfo parsing) 2018-09-14 14:13:26 -07:00
Roxanne Skelly
5edb76ef34 Checkpoint Tray Notifier 2018-09-14 11:35:20 -07:00
Simon Walton
64b18ee5b9 Change sys-tray Sandbox menu item from Go Home to Visit Sandbox 2018-07-18 13:11:20 -07:00
SimonWalton-HiFi
4807f9d8eb
Merge branch 'master' into snoretoast 2018-06-14 09:31:10 -07:00
Atlante45
3ea265f233 Ensure hifi roaming directory is created 2018-06-13 17:00:41 -07:00
Atlante45
3ed72569a1 Update fs-extra version 2018-06-13 16:49:34 -07:00
Clement
75a75ecd1a Migrate old logs 2018-06-13 16:49:34 -07:00
SimonWalton-HiFi
66cad7831e
Merge branch 'master' into snoretoast 2018-06-13 12:10:51 -07:00
Simon Walton
cda0c5a121 Fix main.js - incorrect merge by git 2018-06-13 11:33:19 -07:00
Simon Walton
01ef636411 Merge branch 'master' into snoretoast
Two simple conflicts fixed.
2018-06-13 11:19:56 -07:00
John Conklin II
99b5835098
Merge pull request #13344 from birarda/feat/new-version-numbers
handle semantic version numbers in interface/sandbox update
2018-06-13 11:16:56 -07:00
Stephen Birarda
4713d8d44c fix reference to builds URL for sandbox check 2018-06-12 16:06:17 -07:00
Stephen Birarda
1b42ddd898
Merge pull request #13252 from birarda/bug/sandbox-backup-instructions
remove confusing sandbox content update/backup system
2018-06-11 14:04:07 -07:00
Clement
ffac96d0a0 Migrate old logs 2018-06-11 11:00:08 -07:00
Clement
75bb6e5211 Store sandbox log in appdata local 2018-06-11 11:00:08 -07:00
Stephen Birarda
8dd268addb handle semantic version updates in sandbox 2018-06-08 17:21:06 -07:00
Simon Walton
97613f1f07 Only set app ID on sandbox link
Also pass down the app ID from CMake files to installer and
server-console.
2018-06-01 14:13:52 -07:00
Stephen Birarda
de6db6f0cd remove confusing sandbox content update/backup system 2018-05-31 15:56:59 -07:00
Simon Walton
5e17ef5e21 Also call electron's setAppUserModelId() 2018-05-30 14:25:05 -07:00
Stephen Birarda
33a122c08e remove short SHA where it should not appear 2018-05-30 12:05:07 -07:00
Simon Walton
ef4d09c5e2 Add app user-model IDs to Sandbox shortcut and use in server-console 2018-05-30 10:21:07 -07:00
Simon Walton
65bb4c218e Distinguish appIDs for production & nonproduction 2018-05-25 11:02:49 -07:00
Simon Walton
f0570557b2 Assign a Win 'appUserModelId' and use it for toaster popups (notifications) 2018-05-24 10:56:17 -07:00
Stephen Birarda
79576e0f48 update request and dependency hoek for CVE 2018-05-03 17:16:35 -07:00
Stephen Birarda
7638dceee3 fix remote require from downloader page 2018-04-03 18:06:18 -07:00
Stephen Birarda
c23d4df932 use SIGTERM as default kill signal for child process bug 2018-04-03 17:54:26 -07:00
Stephen Birarda
22ac400402 update electron version to 1.8.4 2018-04-03 17:53:29 -07:00
Stephen Birarda
4f99569046 bump fs-extra to 1.0.0 so brace-expansion is bumped to 1.1.11 2018-02-27 10:20:53 -08:00
Stephen Birarda
f95893f070 updates to electron-packager and node-notifier for CVEs 2018-02-12 11:09:10 -08:00
Stephen Birarda
1f54b1fcc3 remove unneeded dependency on electron-compilers 2017-12-08 14:09:42 -08:00
Stephen Birarda
aea9821c07 update to a newer version of electron-compilers 2017-12-08 14:03:37 -08:00
Stephen Birarda
d81e87771b added package-lock file for server console 2017-12-08 11:28:49 -08:00
Atlante45
85601669e1 Prevent thrashing by limiting to 10 restarts every 10 minutes 2017-06-30 14:34:49 -07:00
Atlante45
22099a14a8 Go Home spawns interface detached 2017-06-29 13:50:40 -07:00
Atlante45
ec7fe81b87 Sandbox doesn't restart Interface. 2017-06-29 13:22:11 -07:00
Atlante45
5c731636b1 Sandbox restarts crashed processes 2017-06-29 12:13:52 -07:00
Atlante45
a66e1148ba Preliminary work on AC auto cleanup 2017-06-28 19:20:18 -07:00
seefo
9fa21fc79f Incomplete sandbox content updates are now removed and reperformed 2017-06-14 14:45:25 -07:00
Ryan Huffman
de2f8bd944 Add clarifying comment to use of kill in isProcessRunning 2017-06-02 08:58:35 -07:00
Ryan Huffman
0536f8974a Remove shutdownWatcher option inside sandbox 2017-06-01 18:13:40 -07:00
Ryan Huffman
aa48f3f063 Rename watchProcessShutdown to shutdownWith 2017-06-01 18:13:27 -07:00
Ryan Huffman
52f9100332 Fix isProcessRunning error in strict mode 2017-06-01 12:48:42 -07:00
Ryan Huffman
aaf9b9ac7f Update server-console to watch interface via pid rather than marker 2017-06-01 11:20:36 -07:00
Ryan Huffman
eb9acad42e Update content set URL for RC40 2017-05-18 16:36:01 -07:00
Ryan Huffman
4895f51dc1 Update content set URL 2017-05-05 16:41:32 -07:00
Stephen Birarda
d55eba9440 update AC monitor to launch 7 ACs 2017-01-20 11:26:04 -08:00
Ryan Huffman
627a5d56da Update content set URL 2016-12-21 10:11:10 -08:00
Atlante45
722032080a Make clear popup is from the Sandbox 2016-11-16 11:03:15 -08:00
Brad Hefta-Gaub
5454dca82e Merge pull request #9030 from highfidelity/stable
Update master with Stable hotfix
2016-11-07 18:48:54 -08:00
Atlante45
f34cf64f3e Disable updater on Steam 2016-11-07 16:09:56 -08:00
Atlante45
3c76dad454 Force sandbox config saves 2016-11-07 10:42:59 -08:00
Ryan Huffman
3d160cca75 Merge pull request #8969 from huffman/feat/task-manager-app-name
Add "High Fidelity" to sandbox and interface description in Windows Task Manager
2016-11-02 14:21:19 -07:00
Atlante45
e78d907db0 Add clo to launch interface after content loads 2016-11-01 18:15:27 -07:00
Ryan Huffman
b7f5fc2516 Update 'Sandbox' to 'High Fidelity Sandbox' in task manager 2016-11-01 08:58:29 -07:00
Atlante45
e1ed7929e3 exit sandbox instead of asking to quit 2016-10-28 15:10:27 -07:00
Atlante45
4cb1d75ca4 Disable console splash screen 2016-10-27 14:12:17 -07:00
Ryan Huffman
cc3a1d8c67 Update home content set 2016-10-25 13:54:16 -07:00
Atlante45
812265363c Reorder object construction 2016-10-24 13:31:54 -07:00
Atlante45
4661d6e2d1 Move log file to already existing Sandbox directory 2016-10-24 11:24:35 -07:00
Atlante45
143fc644d3 Added some shutdown debug 2016-10-24 11:11:30 -07:00
Atlante45
b0a22599e7 Make log global 2016-10-24 10:58:21 -07:00
Atlante45
b2e68a1075 Print log to file as well 2016-10-24 10:58:21 -07:00
Brad Hefta-Gaub
d5c87a0db6 CR feedback 2016-10-17 12:02:23 -07:00
Brad Hefta-Gaub
d46170bec0 auto shutdown of sandbox when interface quits 2016-10-17 07:55:24 -07:00
Atlante45
4bea6f2931 Update window size automaticatlly 2016-10-12 15:18:39 -07:00
Ryan Huffman
79ea7c4075 Update content set version to 9 2016-10-07 10:30:18 -07:00
Ryan Huffman
09d9cd8311 Update content version to 8 2016-10-07 10:30:18 -07:00
Ryan Huffman
92a7a638d4 Update content set to version 7 2016-10-07 10:30:18 -07:00
Ryan Huffman
63c72eed65 Update content set for server console 2016-10-07 10:30:18 -07:00
Ryan Huffman
c7ead55380 Update default content set 2016-10-07 10:30:18 -07:00
Ryan Huffman
7379e9a03f Update server-console content URL 2016-10-07 10:30:18 -07:00
Ryan Huffman
66a33d020d Update content version 2016-10-07 10:30:18 -07:00
Ryan Huffman
7c791755c0 Update home content to version 2 2016-10-07 10:30:18 -07:00
Ryan Huffman
15e00c30a6 Update tutorial content version 2016-10-07 10:30:18 -07:00