Commit graph

3912 commits

Author SHA1 Message Date
renaesop
cba5e96496 Merge remote-tracking branch 'ups/master' 2017-05-09 09:44:24 +08:00
Kevin Sawicki
eebae82bc1 Merge pull request #9315 from electron/segmented-control-mode
Add mode prop to segmented touch bar control
2017-05-04 14:16:28 -07:00
Kevin Sawicki
59511354fd Merge pull request #9214 from electron/app-memoryinfo
API to get memory of all processes of the app
2017-05-04 14:00:30 -07:00
Hari Krishna Reddy Juturu
ab1bcefe9e Make pid an integer 2017-05-04 13:37:43 -07:00
Kevin Sawicki
e206aae9fc 🎨 Use snake case 2017-05-04 13:27:42 -07:00
Kevin Sawicki
c59fab0179 Merge pull request #9242 from shiftkey/certificate-addition-windows
certificate trust API for Windows
2017-05-03 16:39:00 -07:00
Kevin Sawicki
110611f242 🎨 2017-05-03 16:22:56 -07:00
Samuel Attard
718dc732ad
Add docs and add isSelected arg 2017-05-03 20:25:50 +10:00
Brendan Forster
e5648072dc handle untrusted root as well as self-signed 2017-05-02 11:25:51 +10:00
Kevin Sawicki
a748199833 Bump v1.6.8 2017-05-01 15:09:30 -07:00
Kevin Sawicki
b639dd0c81 Remove unused include/require statement 2017-05-01 10:30:11 -07:00
Kevin Sawicki
f2f6415543 Use v8 to parse message as JSON 2017-05-01 10:30:11 -07:00
deepak1556
0476e2fd3d destroy browserView webContents asynchronously 2017-05-01 16:53:55 +09:00
deepak1556
c68f41b8d8 destroy new window webContents asynchronously 2017-05-01 16:53:55 +09:00
deepak1556
5e976be43b remove page-title-updated workaround for #3380 2017-05-01 16:53:55 +09:00
deepak1556
9e3b8ade12 invoke WebContentsDestroyed manually when destruction path is async 2017-05-01 16:53:14 +09:00
deepak1556
f974a6bda9 browser: make destruction of webContents async 2017-05-01 16:53:14 +09:00
Brendan Forster
14f29e1319 it's 2017 get with the times 2017-04-29 19:29:07 +10:00
Brendan Forster
1ccc2afb03 underscore case all the things 2017-04-29 19:28:42 +10:00
Samuel Attard
225ccab3d2
Add mode prop to segmented touch bar control 2017-04-28 14:50:58 +10:00
Hari Krishna Reddy Juturu
07b53c0284 Return mate::Dictionary instead of v8::value 2017-04-27 21:07:35 -07:00
HariJ
81bd9fa3a2 fixing mac ut failure 2017-04-27 14:06:53 -07:00
Hari Krishna Reddy Juturu
3d12440a4a Fixing mac build 2017-04-27 14:06:53 -07:00
Hari Krishna Reddy Juturu
27aad902b8 Adding docs, specs and fixing object returned 2017-04-27 14:06:53 -07:00
Hari Krishna Reddy Juturu
bef7d5a520 API to get memory of all processes of the app 2017-04-27 14:06:53 -07:00
Brendan Forster
a1599cf881 focus on the self-signed certificate flow here 2017-04-27 15:06:23 +10:00
Brendan Forster
5151107c28 tighten up indenting 2017-04-27 15:01:55 +10:00
Brendan Forster
50af70a0e8 Merge branch 'master' into certificate-addition-windows 2017-04-27 14:47:50 +10:00
Brendan Forster
80212c0ab4 actually validate the chain before adding 2017-04-27 14:44:58 +10:00
Kevin Sawicki
7881376aff Merge pull request #9254 from electron/endsession-event
End session event on browser window
2017-04-24 12:02:05 -07:00
Hari Krishna Reddy Juturu
8458acff26 Removing #ifdef on endsession api 2017-04-24 11:58:08 -07:00
Hari Krishna Reddy Juturu
8a32826876 Removing #ifdef windows for endsession methods 2017-04-24 11:49:21 -07:00
Hari Krishna Reddy Juturu
9e70372c1f change endsession event name to session-end 2017-04-24 10:16:11 -07:00
Kevin Sawicki
13e4582697 Emit autoUpdater error directly as Error object 2017-04-24 09:47:30 -07:00
Brendan Forster
f644ba56a3 clean up the code a bit 2017-04-24 11:49:55 +10:00
Brendan Forster
253a4b0114 Merge remote-tracking branch 'electron/master' into certificate-addition-windows 2017-04-24 11:13:34 +10:00
Brendan Forster
ac3385124a reload the current cert database if the certificate was added 2017-04-24 11:12:26 +10:00
Hari Krishna Reddy Juturu
9e8252c1f9 Remove wm_state change 2017-04-21 14:35:30 -07:00
Hari Krishna Reddy Juturu
3c3e14b820 End session event on browser window 2017-04-21 14:22:11 -07:00
Brendan Forster
c181a8269d and this is how we invoke the callback 2017-04-21 12:47:11 +10:00
Brendan Forster
1439a1e322 and the order here matters apparently 2017-04-21 12:23:50 +10:00
Brendan Forster
b3baf9976f coding style fixes 2017-04-21 12:17:01 +10:00
Kevin Sawicki
a004cada7c Merge pull request #9095 from seanchas116/better-path-resolve
Search for module from app path when URL is not file protocol
2017-04-20 10:49:53 -07:00
Kevin Sawicki
dc8b43901b Merge pull request #9108 from yuya-oc/add-macos-sheet-events
Add sheet-begin and sheet-end events to macOS BrowserWindow
2017-04-20 10:33:31 -07:00
Kevin Sawicki
29a3e11893 Group sheet event methods with other macOS methods 2017-04-20 10:32:14 -07:00
Brendan Forster
5f1bcd2d16 a first pass at the script to import the certificate for Windows 2017-04-20 21:12:32 +10:00
Brendan Forster
dca08c208b and use the same signature for Windows 2017-04-20 14:21:08 +10:00
Brendan Forster
4f40b8a42c stub the windows source file 2017-04-20 14:21:08 +10:00
Kevin Sawicki
4a9383b50b Bump v1.6.7 2017-04-18 09:17:16 -07:00
Hari Krishna Reddy Juturu
fe88697348 fixup! fixup! Adding cookie flush store api 2017-04-18 09:05:13 -07:00