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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Heilig Benedek 
								
							 
						 
						
							
							
								
							
							
	5fff06d2c2  
						 
						
							
							
								
								
								Added documentation for the changes in KeyboardEvent and added missing mouseMove event type  
							
							
							
						 
						
							2015-11-16 04:54:48 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robo 
								
							 
						 
						
							
							
								
							
							
	e2959ed3fc  
						 
						
							
							
								
								
								add docs  
							
							
							
						 
						
							2015-11-14 12:09:18 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	5cacf79bc5  
						 
						
							
							
								
								
								docs: Document the new style of remote module  
							
							
							
						 
						
							2015-11-13 22:34:00 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	e8ffd24e4e  
						 
						
							
							
								
								
								Rename the "clicked" event to "click" in Tray  
							
							
							
						 
						
							2015-11-13 16:41:33 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	fbb8e61958  
						 
						
							
							
								
								
								Replace "Url" in API names with "URL"  
							
							
							
						 
						
							2015-11-13 16:03:40 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	d3caea91b0  
						 
						
							
							
								
								
								Add paths from chrome_paths  
							
							
							
						 
						
							2015-11-13 13:05:16 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	996a3c2a35  
						 
						
							
							
								
								
								Merge branch 'content_tracing_patch' of  https://github.com/deepak1556/atom-shell  into deepak1556-content_tracing_patch  
							
							
							
						 
						
							2015-11-13 12:29:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	78934dceb9  
						 
						
							
							
								
								
								Cleanup and docs for the --js-flags  
							
							
							
						 
						
							2015-11-13 12:22:08 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robo 
								
							 
						 
						
							
							
								
							
							
	bfaa50a79e  
						 
						
							
							
								
								
								retrieve download directory using  on linux  
							
							
							
						 
						
							2015-11-13 07:44:05 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robo 
								
							 
						 
						
							
							
								
							
							
	37e6e6fab7  
						 
						
							
							
								
								
								emit verify-certificate event for handling verification  
							
							
							
						 
						
							2015-11-13 06:44:49 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robo 
								
							 
						 
						
							
							
								
							
							
	3d5437e0a4  
						 
						
							
							
								
								
								tracing: fix docs and allow null values in file path conversion fromv8  
							
							
							
						 
						
							2015-11-13 02:36:38 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robo 
								
							 
						 
						
							
							
								
							
							
	d072e61282  
						 
						
							
							
								
								
								session: api to allow handling certificate verification  
							
							
							
						 
						
							2015-11-13 01:27:30 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	c5913c3149  
						 
						
							
							
								
								
								docs: Add notes on old APIs  
							
							
							
						 
						
							2015-11-12 22:24:11 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	eac2e7cc61  
						 
						
							
							
								
								
								docs: Update codes in docs to use require('electron')  
							
							
							
						 
						
							2015-11-12 21:20:09 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	28db51ad83  
						 
						
							
							
								
								
								docs: Update BrowserWindow's options  
							
							
							
						 
						
							2015-11-11 23:56:17 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	0e9415a256  
						 
						
							
							
								
								
								docs: More notes on --proxy-server,  close   #3390  
							
							
							
						 
						
							2015-11-11 22:55:32 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	0a5b234e3d  
						 
						
							
							
								
								
								Merge pull request  #3354  from nishanths/master  
							
							... 
							
							
							
							Add drag-entered and drag-exited events to Tray 
							
						 
						
							2015-11-11 22:44:05 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	b611154f43  
						 
						
							
							
								
								
								Standardize the webContents object name  
							
							
							
						 
						
							2015-11-11 09:03:49 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nishanth Shanmugham 
								
							 
						 
						
							
							
								
							
							
	ed179ecf03  
						 
						
							
							
								
								
								docs: Update tray docs with drop and drag-end events  
							
							
							
						 
						
							2015-11-10 10:14:55 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nishanth Shanmugham 
								
							 
						 
						
							
							
								
							
							
	f98147ea01  
						 
						
							
							
								
								
								Tray: Rename events to drag-enter and drag-leave  
							
							... 
							
							
							
							Previously, the names were drag-entered and drag-exited. The new names mirror the HTML Drag and Drop event names 
							
						 
						
							2015-11-10 09:27:39 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	90a7d4a906  
						 
						
							
							
								
								
								docs: Update with new IPC modules  
							
							
							
						 
						
							2015-11-10 16:48:24 +08:00