mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8249 commits 1 branch 183 tags 5.3 GiB
Commit graph

8249 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kevin Sawicki
08e18d46ea Merge pull request #5244 from electron/disable-node-in-web-view-when-disabled-in-parent 
Disable node in webviews when disabled in parent window
 2016-04-22 09:05:58 -07:00
Cheng Zhao
c04d43ca13 Bump v0.37.7 2016-04-22 17:39:11 +09:00
Cheng Zhao
394ffa88dd Merge pull request #5250 from electron/felix/camelCase 
Windows Store Camels
 2016-04-22 11:23:15 +09:00
Felix Rieseberg
c0f63eed4e 🎨 Windows Store Camels 2016-04-21 19:11:25 -07:00
Kevin Sawicki
bb2cab2858 Merge pull request #5247 from djpereira/patch-1 
Update desktop-capturer.md
 2016-04-21 15:32:56 -07:00
Daniel Pereira
b45f683655 Update desktop-capturer.md 
Fixed native image link.
 2016-04-21 17:00:19 -05:00
Kevin Sawicki
8e7bf1051d Disable node integration on webview when disabled on window 2016-04-21 11:52:10 -07:00
Kevin Sawicki
e4bd592e0e Add failing spec 2016-04-21 11:49:42 -07:00
Cheng Zhao
c92e622ce0 Merge pull request #5238 from electron/felix/appx-detection 
Add Windows Store Detection
 2016-04-21 16:21:38 +09:00
Felix Rieseberg
2a2a8d3263 Add Windows Store Detection 
If we're running as a Windows Store appx package,
`process.windowsstore` will be `true`, otherwise
`undefined`.
 2016-04-21 00:02:03 -07:00
Cheng Zhao
b30143c67d Merge pull request #5237 from electron/set-path-no-create 
Do not create the folder passed to app.setPath
 2016-04-21 14:49:55 +09:00
Cheng Zhao
df97be30e5 Do not create the folder passed to app.setPath 2016-04-21 14:37:29 +09:00
Cheng Zhao
1c75baa8b3 Merge pull request #5236 from electron/short-ss-path 
Make the length of SingletonSocket's path as short as we can
 2016-04-21 14:14:24 +09:00
Cheng Zhao
0900762507 Make the length of SingletonSocket's path as short as we can 2016-04-21 13:58:11 +09:00
Cheng Zhao
ec832f418a Merge pull request #5233 from electron/remove-no-exception 
Guard against unexist owner when removing ref to remote object
 2016-04-21 11:50:27 +09:00
Cheng Zhao
a836ee4ea7 Merge pull request #5231 from deepak1556/open_external_pemission_patch 
session: allow providing permission to handle external protocols
 2016-04-21 11:50:01 +09:00
Cheng Zhao
b5c1db9ad9 Guard against unexist owner when removing ref to remote object 2016-04-21 11:23:20 +09:00
deepak1556
ca756c3c24 session: allow providing permission to handle external protocols 2016-04-21 05:27:07 +05:30
Cheng Zhao
aa29dc0c8a Merge pull request #5199 from Mr0grog/5183-disambiguate-loading-from-main-frame-loading 
Add `isLoadingMainFrame()` to WebContents
 2016-04-20 20:49:56 +09:00
Rob Brackett
dc8fc7c079 📝 Add English docs for webContents.isLoadingMainFrame() 
[ci skip]
 2016-04-19 23:27:22 -07:00
Cheng Zhao
823c4f91a8 Merge pull request #5219 from atdrago/master 
Add note for OS X about using `role` on MenuItem
 2016-04-20 15:11:43 +09:00
Cheng Zhao
809135f657 Merge pull request #5222 from Stone-Jay/master 
fixes some translation mistakes
 2016-04-20 15:05:25 +09:00
Cheng Zhao
47ec7dcaa0 Merge pull request #5213 from rmcdonald/patch-1 
Correct transposition errors by changing xfvb to xvfb
 2016-04-20 15:05:04 +09:00
Cheng Zhao
3fdcbcef03 Merge pull request #5223 from electron/remote-cleanup 
Small cleanup of the code determining value's type
 2016-04-20 14:47:16 +09:00
Cheng Zhao
965c3f605e Merge pull request #5197 from deepak1556/client_certificate_patch 
app: api to import client certificate
 2016-04-20 14:35:00 +09:00
Cheng Zhao
680652d01c buffer, null, array etc. all belong to object 2016-04-20 14:32:32 +09:00
Cheng Zhao
ff1b7d18f6 Cleanup the code determining value's type 2016-04-20 14:26:49 +09:00
Rob Brackett
d3e879cd7f Change WebContents::IsLoadingMainFrame to compare SiteInstances 
(per @deepak1556's recommendation)

Also updates tests to cover the situation where navigating between pages from the same potential "site" and adds generalized tests for `isLoadingMainFrame()`.
 2016-04-19 22:05:09 -07:00
Cheng Zhao
d7a391dc61 Merge pull request #5214 from alexgleason/docs-downloaditem-typo 
Fixed docs sample code programming error for DownloadItem
 2016-04-20 13:44:31 +09:00
Cheng Zhao
d3bff7fffc Merge pull request #5208 from deepak1556/devtools_dock_state_patch 
devtools: allow opening in specified dock state
 2016-04-20 13:34:52 +09:00
Cheng Zhao
a3e8591a41 Update brightray for #5208 2016-04-20 13:34:30 +09:00
deepak1556
794d120754 rename importClientCertificate => importCertificate 2016-04-20 08:45:49 +05:30
StoneStoneStone
bdde5fd7ad Update screen.md 2016-04-20 10:58:32 +08:00
StoneStoneStone
57bdbd8185 Update download-item.md 2016-04-20 10:39:47 +08:00
StoneStoneStone
16b54e1502 Update screen.md 2016-04-20 10:37:41 +08:00
StoneStoneStone
7468118df5 Update screen.md 2016-04-20 10:26:31 +08:00
Rob Brackett
942971b01a Fix linting errors. 2016-04-19 19:20:59 -07:00
Cheng Zhao
652110707e Merge pull request #5202 from electron/updating-submodules 
keeping submodules up to date
 2016-04-20 10:51:12 +09:00
Adam Drago
b80272dbb4 Add note for OS X about using role on MenuItem 2016-04-19 18:12:37 -07:00
Cheng Zhao
5b7637687c Merge pull request #5143 from felixrieseberg/debug-instructions 
Add Debugging Instructions for Windows
 2016-04-20 09:33:25 +09:00
Cheng Zhao
b2a3aabc90 Merge pull request #5218 from electron/style-fix 
Fix some coding style issues
 2016-04-20 09:31:53 +09:00
Cheng Zhao
18f5fcde60 Fix some coding style issues 2016-04-20 09:18:50 +09:00
Cheng Zhao
eb9e0e5534 Merge pull request #4922 from electron/bengotow/sheet-offset 
Allow sheets to be attached at a custom offset #4679
 2016-04-20 08:55:42 +09:00
Cheng Zhao
8ca1a6961c Merge pull request #5147 from deepak1556/devtools_network_controller_patch 
session: set client id when enabling network emulation
 2016-04-20 08:52:59 +09:00
Cheng Zhao
37e500dc10 Merge pull request #5203 from Stone-Jay/master 
Translate download-item.md to Chinese
 2016-04-20 08:50:25 +09:00
Cheng Zhao
873e9c44db Merge pull request #5196 from raybooysen/patch-1 
Update screen.md
 2016-04-20 08:44:41 +09:00
Jessica Lord
5e9fe1c6eb Merge pull request #5168 from electron/jlord-patch-1 
A few style updates 2 docs
 2016-04-19 12:29:42 -07:00
Alex Gleason
02c8c58c0b Fixed docs sample code programming error for DownloadItem 2016-04-19 12:47:05 -04:00
Zeke Sikelianos
8f04dd1b9c remove the git 2016-04-19 09:46:48 -07:00
rmcdonald
838cf0ffdc Correct transposition errors by changing xfvb to xvfb 2016-04-19 09:31:04 -07:00