Skip to content

merge with original #2

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.

Sign up for GitHub

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

Jump to bottom
Merged
freosc merged 48 commits into from
Jun 8, 2020
Merged

merge with original #2

freosc merged 48 commits into from
Jun 8, 2020

Conversation

@freosc
Copy link
Owner

@freosc freosc commented Jun 8, 2020

No description provided.

gustavo-lara-molina and others added 30 commits May 17, 2020 20:44
@gustavo-lara-molina
Merge pull request #1 from ElectronNET/master
09fa662 
Updating fork
@gustavo-lara-molina
adding all powerMonitor api events
8fe60bf
@gustavo-lara-molina
Adding All PowerMonitor Methods, Fixing Comments
bbab114
@GregorBiswanger
Merge pull request #413 from freosc/CookieHandling
95f9a59 
Implementation for electronjs cookie handling
@GregorBiswanger
Update to the native Electron 9.0.0 - Update electron-updater 4.3.1 -…
95acbd5 
… Update Changelog
@konstantingross
Removed double slash in args
4ad39ba
@konstantingross
Add lifetime hosted service to detect fully started ASP.NET Core
cac9cfc
@konstantingross
Context menu example modified
52b8500
@GregorBiswanger
Merge pull request #415 from konstantingross/feature/New_host_IsReady…
1541553 
…_property

New App.IsReady property
@GregorBiswanger
add App.Ready event
c552a04
@GregorBiswanger
implement lazy App.Ready event
39c3e92
@GregorBiswanger
Update for 9.31.1
2ba49db
@konstantingross
Add missing API call for SetProgressBar options
485bce0
@GregorBiswanger
Merge pull request #416 from konstantingross/master
596aa68 
Add missing API call for SetProgressBar options
@GregorBiswanger
Update for 9.31.1
94055b9
@GregorBiswanger
Merge branch 'master' of https://github.com/ElectronNET/Electron.NET
2b415e5
@konstantingross
Shell.OpenItem API fix for Electron 9.0.0
76dcdc4
@GregorBiswanger
Merge pull request #417 from konstantingross/master
a03dc1d 
Shell.OpenItem API fix for Electron 9.0.0
@konstantingross
Missing semicolon
58ab180
@konstantingross
Shell.ShowItemInFolder API fix for Electron 9.0.0
0329530
@GregorBiswanger
manage the configuration environment with the electron.manifest.json
029b077
@GregorBiswanger
Merge branch 'master' of https://github.com/ElectronNET/Electron.NET
fabd25a
@konstantingross
Log disconnect reason
c6d67a9
@konstantingross
* Shell.OpenPath API fix for Electron 9.0.0
641864b 
* Shell.OpenExternal API fix for Electron 9.0.0
* Shell.MoveItemToTrash API fix for Electron 9.0.0 and added new macOS parameter
* Shell.ReadShortcutLink API fix for Electron 9.0.0
* Summaries have been rewritten
@konstantingross
Update ShortcutLinkOperation.cs
ce4ef03
@konstantingross
Update Shell.cs
c5c822a
@konstantingross
Updated NuGet Package version
b08222b
@GregorBiswanger
Merge pull request #418 from konstantingross/master
7aa2268 
Shell API adapted to Electron 9.0.0
@GregorBiswanger
Update for Electron.NET 9.31.1
874bc8e
@GregorBiswanger
Merge branch 'master' of https://github.com/ElectronNET/Electron.NET
1ab4835
konstantingross and others added 18 commits May 31, 2020 03:09
@konstantingross
App API:
eee84d2 
* Summaries rewritten
* Added new parameters / Removed not supported parameters
* Added some new methods like appFocus(options), appHasSingleLock, etc.
@konstantingross
Removed dock methods from app API and moved to dock API
9ddb1b1
@gustavo-lara-molina
removing PM methods with issues for this versión
258710b
@gustavo-lara-molina
Merge remote-tracking branch 'origin/master' into powerMonitor
c95bbe7
@GregorBiswanger
Merge pull request #422 from konstantingross/feature/App_API_Enhancem…
d106c6b 
…ents

App API enhancements
@GregorBiswanger
Merge pull request #423 from gustavo-lara-molina/powerMonitor
b98c570 
Power monitor - adding missing events
@GregorBiswanger
update Electron.NET 9.31.1
a030e3c
@GregorBiswanger
Merge branch 'master' of https://github.com/ElectronNET/Electron.NET
db7a5ff
@konstantingross
Fix deployment dock.js
cb36e34
@konstantingross
Electron 9.0.1 Update
b3266cd
@konstantingross
Improvement debugging and testing new api calls (without install cli)
606d00d
@konstantingross
Fix cannot find modules in ElectronHostHook
a66375e
@GregorBiswanger
Merge pull request #425 from konstantingross/feature/Fix_Dock_API
380441c 
Fix Dock API/ Electron 9.0.1 Update / ...
@GregorBiswanger
Update for Electron.NET 9.31.1
9baf152
@GregorBiswanger
Merge branch 'master' of https://github.com/ElectronNET/Electron.NET
96abbd1
@GregorBiswanger
Update for Electron.9.31.1
886f839
@GregorBiswanger
Update for Electron.NET 9.31.1
4286bc4
@GregorBiswanger
Update for Electron.NET 9.31.1
8c8115f
@freosc freosc merged commit 519fb53 into freosc:master Jun 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@freosc @gustavo-lara-molina @GregorBiswanger @konstantingross