Charlie Hess 
								
							 
						 
						
							
							
								
							
							
	f2797d2eab  
						 
						
							
							
								
								
								Merge commit ' 58567834c7' into web-contents-download-url  
							
							... 
							
							
							
							Conflicts:
	atom/browser/api/atom_api_web_contents.cc 
							
						 
						
							2015-12-03 10:31:51 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Charlie Hess 
								
							 
						 
						
							
							
								
							
							
	5839df66e4  
						 
						
							
							
								
								
								Document the new method.  
							
							
							
						 
						
							2015-12-02 13:49:42 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	2fba05b5e7  
						 
						
							
							
								
								
								Add menu parameter for Tray.popUpContextMenu  
							
							
							
						 
						
							2015-12-02 18:43:11 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	e5974e44ed  
						 
						
							
							
								
								
								Deprecate the page-title-set event  
							
							... 
							
							
							
							We have two names for the same event, page-title-updated wins. 
							
						 
						
							2015-12-01 18:50:56 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	165b464a15  
						 
						
							
							
								
								
								docs: process.noAsar  
							
							
							
						 
						
							2015-12-01 13:43:52 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	6fb944c842  
						 
						
							
							
								
								
								Merge pull request  #3604  from niedzielski/patch-2  
							
							... 
							
							
							
							Update docs for webContents.addWorkSpace 
							
						 
						
							2015-11-27 18:39:11 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Niedzielski 
								
							 
						 
						
							
							
								
							
							
	62c65280a1  
						 
						
							
							
								
								
								Update docs for webContents.addWorkSpace  
							
							... 
							
							
							
							Specify that webContents.addWorkSpace cannot be called before DevTools
creation and include example.
Fix : #3536  
							
						 
						
							2015-11-26 23:16:00 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Niedzielski 
								
							 
						 
						
							
							
								
							
							
	0b245b96e4  
						 
						
							
							
								
								
								Update docs for globalShortcut.register  
							
							... 
							
							
							
							Document return value for globalShortcut.register and common failure scenario.
Fix : #3600  
							
						 
						
							2015-11-26 22:38:47 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	59402eb23f  
						 
						
							
							
								
								
								Add ELECTRON_NO_ATTACH_CONSOLE env var  
							
							... 
							
							
							
							Close  #1556 . 
						
							2015-11-26 21:11:28 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	682b48095a  
						 
						
							
							
								
								
								docs: Add example  
							
							
							
						 
						
							2015-11-26 20:44:07 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	6534a0e616  
						 
						
							
							
								
								
								docs: Add Environment Variables  
							
							
							
						 
						
							2015-11-26 20:37:48 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	a551b8eaaa  
						 
						
							
							
								
								
								Merge pull request  #3590  from vQuagliaro/doc-windows-open-file  
							
							... 
							
							
							
							[doc] open-file and open-url events are only available on OS X 
							
						 
						
							2015-11-26 18:34:12 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vincent Quagliaro 
								
							 
						 
						
							
							
								
							
							
	fe4638ef33  
						 
						
							
							
								
								
								📝  open-file and open-url events are only available on OS X  
							
							
							
						 
						
							2015-11-26 09:09:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	b9fd095b04  
						 
						
							
							
								
								
								docs: Mark code blocks  
							
							
							
						 
						
							2015-11-24 18:40:50 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	bab603d33a  
						 
						
							
							
								
								
								Merge pull request  #3550  from etiktin/support_proxy_bypass_list  
							
							... 
							
							
							
							Add support for --proxy-bypass-list command line argument 
							
						 
						
							2015-11-24 18:38:33 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	c2197d8a05  
						 
						
							
							
								
								
								Merge pull request  #3554  from meowlab/docs-fix  
							
							... 
							
							
							
							docs: Fix deprecated usage tips 
							
						 
						
							2015-11-23 18:19:37 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	ba8b448c36  
						 
						
							
							
								
								
								docs: Add indent for items in list  
							
							... 
							
							
							
							Some markdown renderers require it to be able to render the list
correctly. 
							
						 
						
							2015-11-23 16:59:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sunny 
								
							 
						 
						
							
							
								
							
							
	6d46c3a75e  
						 
						
							
							
								
								
								docs: Fix deprecated usage tips  
							
							
							
						 
						
							2015-11-23 13:40:23 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	baab0486f0  
						 
						
							
							
								
								
								Add documentation for --proxy-bypass-list  
							
							... 
							
							
							
							Depends on atom/brightray#179  
							
						 
						
							2015-11-22 23:44:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	651254424d  
						 
						
							
							
								
								
								Expand the descriptions of options with defaults  
							
							... 
							
							
							
							Resolves  #3367  
						
							2015-11-21 21:50:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	ab693ca571  
						 
						
							
							
								
								
								Update docs  
							
							
							
						 
						
							2015-11-21 06:42:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	8e2faba8f7  
						 
						
							
							
								
								
								Small style fix  
							
							
							
						 
						
							2015-11-20 13:06:42 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	c1d6d68783  
						 
						
							
							
								
								
								Merge pull request  #3509  from bengotow/macosx-desktop-window  
							
							... 
							
							
							
							Support the "desktop" window type on Mac OS X 
							
						 
						
							2015-11-20 13:02:05 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ben Gotow 
								
							 
						 
						
							
							
								
							
							
	65c823407d  
						 
						
							
							
								
								
								Address feedback  
							
							
							
						 
						
							2015-11-19 10:14:14 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	1b464c82e1  
						 
						
							
							
								
								
								docs: Put webContents.session under Properties  
							
							
							
						 
						
							2015-11-19 21:48:45 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	08c13cf446  
						 
						
							
							
								
								
								Deprecate app.resolveProxy  
							
							... 
							
							
							
							There is now a public API to get default session, this helper is no
longer necessary. 
							
						 
						
							2015-11-19 21:32:46 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	44c562ebd9  
						 
						
							
							
								
								
								docs: New session methods  
							
							
							
						 
						
							2015-11-19 21:31:39 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	dd8ef33e42  
						 
						
							
							
								
								
								docs: webContents.savePage is placed at wrong place  
							
							
							
						 
						
							2015-11-19 21:10:50 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ben Gotow 
								
							 
						 
						
							
							
								
							
							
	d427ae1030  
						 
						
							
							
								
								
								Support the "desktop" window type on Mac OS X  
							
							... 
							
							
							
							Adds the desktop window type referenced in https://github.com/atom/electron/issues/2899  for compatiblity with the linux version. Note that on Mac OS X, the desktop window cannot receive input events (seems to be a limitation of being behind the desktop).
In this diff I also removed the `standardWindow` option from the docs, in favor of an additional `textured` value for window `type` on Mac OS X. The old `standardWindow` option continues to work, but seemed more confusing. If this seems like a bad idea, I can revert that change. 
							
						 
						
							2015-11-19 00:39:45 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	2affc44000  
						 
						
							
							
								
								
								Merge pull request  #3503  from etiktin/patch-2  
							
							... 
							
							
							
							Update ipc-renderer.md 
							
						 
						
							2015-11-19 11:00:13 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	afbceab2ab  
						 
						
							
							
								
								
								Merge pull request  #3496  from preco21/master  
							
							... 
							
							
							
							Update as upstream and some fixes 
							
						 
						
							2015-11-19 10:57:21 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	e9b8e66f2b  
						 
						
							
							
								
								
								Merge pull request  #3497  from etiktin/patch-1  
							
							... 
							
							
							
							Update browser-window.md 
							
						 
						
							2015-11-19 10:54:32 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	b7ae9d3337  
						 
						
							
							
								
								
								Update ipc-renderer.md  
							
							... 
							
							
							
							Removed duplication. 
							
						 
						
							2015-11-19 02:11:32 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	f581730516  
						 
						
							
							
								
								
								Update browser-window.md  
							
							... 
							
							
							
							Changed the description of the preload key to make it clear you need to provide an absolute file path and not a file url.
Also mentioned that it's possible to reintroduce Node globals when node integration is off and referenced the example from process.md (related to https://github.com/atom/electron/issues/254#issuecomment-157769756 ). 
							
						 
						
							2015-11-18 21:06:06 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	ef64a211a2  
						 
						
							
							
								
								
								Standardize platform labels  
							
							
							
						 
						
							2015-11-19 04:01:50 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vítor Galvão 
								
							 
						 
						
							
							
								
							
							
	e2cd0578f3  
						 
						
							
							
								
								
								web-view-tag.md: small typo correction ('the' position swap)  
							
							
							
						 
						
							2015-11-18 18:13:48 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	0c2d769b8a  
						 
						
							
							
								
								
								Fix platform label to uppercase  
							
							
							
						 
						
							2015-11-18 23:35:36 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	87546bd4f8  
						 
						
							
							
								
								
								Merge pull request  #3479  from bengotow/tray-resizing  
							
							... 
							
							
							
							Fix sizing of Mac OS X tray icon after image change 
							
						 
						
							2015-11-18 18:49:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	a3460e8e19  
						 
						
							
							
								
								
								Merge pull request  #3483  from preco21/patch-4  
							
							... 
							
							
							
							'app-command' event is only available in Windows 
							
						 
						
							2015-11-18 18:11:37 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	bcdd0952f8  
						 
						
							
							
								
								
								docs: Fix typo  
							
							
							
						 
						
							2015-11-18 17:56:50 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	9ca022c98a  
						 
						
							
							
								
								
								docs: Update the certificate APIs  
							
							
							
						 
						
							2015-11-18 11:35:26 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	341341bf28  
						 
						
							
							
								
								
								Rename select-certificate to select-client-certificate  
							
							
							
						 
						
							2015-11-18 10:10:21 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	0e8ab0688d  
						 
						
							
							
								
								
								Fix wrong markdown  
							
							
							
						 
						
							2015-11-18 09:43:28 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	0dd14ad204  
						 
						
							
							
								
								
								'app-command' event is only available in Windows  
							
							
							
						 
						
							2015-11-18 09:36:14 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ben Gotow 
								
							 
						 
						
							
							
								
							
							
	9c69416e32  
						 
						
							
							
								
								
								Fix sizing of Mac OS X tray icon after image change  
							
							... 
							
							
							
							- Consolidate logic that applies view dimensions into a function
- Use `NSVariableStatusItemLength` instead of trying to sync status item width
- Use modern Obj-C syntax `@[], @{}` in a few places
- Recompute view bounds after updating image in `setImage:` 
							
						 
						
							2015-11-17 13:43:55 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	961ee5a4d9  
						 
						
							
							
								
								
								Rename verify-certificate to untrusted-certificate  
							
							
							
						 
						
							2015-11-17 21:41:36 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	ebe66daa56  
						 
						
							
							
								
								
								Emit verify-certificate only when default verifier fails  
							
							
							
						 
						
							2015-11-17 21:36:36 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	24f573eceb  
						 
						
							
							
								
								
								Merge pull request  #3344  from deepak1556/certificate_verifier_api_patch  
							
							... 
							
							
							
							session: api to allow handling certificate verification 
							
						 
						
							2015-11-17 18:53:35 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	202d2eeb8a  
						 
						
							
							
								
								
								Merge pull request  #3454  from brenca/keyboard-pr  
							
							... 
							
							
							
							Adding further options to specify the character being sent with sendInputEvent (keyboard) 
							
						 
						
							2015-11-16 22:13:09 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Heilig Benedek 
								
							 
						 
						
							
							
								
							
							
	14740eeb8a  
						 
						
							
							
								
								
								Merging keyCode and keyIdentifier and adjusting the docs accordingly  
							
							
							
						 
						
							2015-11-16 14:51:26 +01:00