Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	a14739bde9  
						 
						
							
							
								
								
								Merge pull request  #2553  from etiktin/patch-3  
							
							... 
							
							
							
							Update dialog.md with info about filter extensions 
							
						 
						
							2015-08-25 12:49:13 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jessica Lord 
								
							 
						 
						
							
							
								
							
							
	1964bb2acc  
						 
						
							
							
								
								
								Move files to ES translation docs  
							
							
							
						 
						
							2015-08-22 14:24:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jessica Lord 
								
							 
						 
						
							
							
								
							
							
	04967de2ed  
						 
						
							
							
								
								
								Move file to JP translation docs  
							
							
							
						 
						
							2015-08-22 14:24:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jessica Lord 
								
							 
						 
						
							
							
								
							
							
	6c984fac7c  
						 
						
							
							
								
								
								Add file to KO translation docs  
							
							
							
						 
						
							2015-08-22 14:23:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jessica Lord 
								
							 
						 
						
							
							
								
							
							
	3f52a91312  
						 
						
							
							
								
								
								Create directory for KO translations  
							
							
							
						 
						
							2015-08-22 14:21:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	c686fc4d6b  
						 
						
							
							
								
								
								Made sure that lines are not longer than 80 characters  
							
							
							
						 
						
							2015-08-22 05:09:37 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	db2f0a68e8  
						 
						
							
							
								
								
								Update dialog.md with info about filter extensions  
							
							... 
							
							
							
							There was some confusion about the correct way to add an `All Files` filter (see #2525 ), so I added it to the example.
Also added a short note about the extension syntax.
This is related to PR #2547 . 
							
						 
						
							2015-08-21 21:18:37 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	d7cf460918  
						 
						
							
							
								
								
								docs: callback => completion in some places  
							
							
							
						 
						
							2015-08-21 20:16:56 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	9212a1db8e  
						 
						
							
							
								
								
								Merge branch 'master' into chrome44  
							
							
							
						 
						
							2015-08-21 19:29:34 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	ec18c2f354  
						 
						
							
							
								
								
								Merge pull request  #2453  from etiktin/nativeimage_ico_support_windows  
							
							... 
							
							
							
							Add support for using .ico icon files on Windows 
							
						 
						
							2015-08-21 11:45:12 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	01921ee6fa  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/preco21/electron  into preco21-master  
							
							... 
							
							
							
							Conflicts:
	docs/api/browser-window-ko.md 
							
						 
						
							2015-08-21 11:30:47 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	ad24c11f32  
						 
						
							
							
								
								
								Merge remote-tracking branch 'atom/master'  
							
							
							
						 
						
							2015-08-21 11:41:07 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	351dc4ed6b  
						 
						
							
							
								
								
								Translate more files, fix outdated remote.md section  
							
							... 
							
							
							
							Translate content-tracing(50%), remote docs.
Fix `Remote buffer` section as outdated. 
							
						 
						
							2015-08-21 11:33:02 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	8cc602ff94  
						 
						
							
							
								
								
								Merge pull request  #2515  from atom/fix-no-print-background  
							
							... 
							
							
							
							Fix a typing error in option checking: printBackgrounds => printBackground 
							
						 
						
							2015-08-21 09:02:08 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	b1ffd1b02a  
						 
						
							
							
								
								
								Merge pull request  #2503  from teleclimber/master  
							
							... 
							
							
							
							Clarify that MSVS 2015 will not work in Windows build docs. 
							
						 
						
							2015-08-21 08:57:32 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	cf6415bf84  
						 
						
							
							
								
								
								Merge pull request  #2520  from etiktin/patch-2  
							
							... 
							
							
							
							Update browser-window.md 
							
						 
						
							2015-08-21 08:57:14 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	2bc087b5d5  
						 
						
							
							
								
								
								Merge branch 'master' into nativeimage_ico_support_windows  
							
							
							
						 
						
							2015-08-20 17:11:52 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	172cc22d90  
						 
						
							
							
								
								
								Fix some typos, update as upstream  
							
							
							
						 
						
							2015-08-20 07:50:07 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Haojian Wu 
								
							 
						 
						
							
							
								
							
							
	4e6dc49646  
						 
						
							
							
								
								
								📝  Fix a typing error: printBackgrounds => printBackground  
							
							
							
						 
						
							2015-08-19 09:44:33 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	129d92b30a  
						 
						
							
							
								
								
								Update browser-window.md  
							
							... 
							
							
							
							Update the `beforeunload` example to use `e.returnValue = false` instead of `return false`, since `e.returnValue` always works while the `return` works only in certain conditions. See #2481  for details. 
							
						 
						
							2015-08-18 19:34:14 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Petr Felzmann 
								
							 
						 
						
							
							
								
							
							
	7842a90c5e  
						 
						
							
							
								
								
								Fix absolute url to github  
							
							
							
						 
						
							2015-08-17 15:03:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Petr Felzmann 
								
							 
						 
						
							
							
								
							
							
	acffc713e0  
						 
						
							
							
								
								
								Fix formatting of print and printToPDF methods  
							
							
							
						 
						
							2015-08-17 10:52:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Olivier Forget 
								
							 
						 
						
							
							
								
							
							
	092f9d2c46  
						 
						
							
							
								
								
								Clarify that MSVS 2015 will not work in Windows build docs.  
							
							
							
						 
						
							2015-08-14 10:25:18 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	7d97bb6fe0  
						 
						
							
							
								
								
								docs: Rewrite docs for new protocol API  
							
							
							
						 
						
							2015-08-14 13:44:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	33eadad139  
						 
						
							
							
								
								
								popContextMenu => popUpContextMenu  
							
							
							
						 
						
							2015-08-10 13:00:15 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	eaaf52483e  
						 
						
							
							
								
								
								Merge pull request  #2443  from ialexryan/patch-1  
							
							... 
							
							
							
							Fixed typo 
							
						 
						
							2015-08-10 11:22:06 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	ebfd03570f  
						 
						
							
							
								
								
								Merge pull request  #2456  from etiktin/update_build_md  
							
							... 
							
							
							
							Add a comment to build instructions about cpplint 
							
						 
						
							2015-08-10 11:21:51 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	40c7e6e179  
						 
						
							
							
								
								
								Update as upstream, translate 2 files, fix some typos  
							
							
							
						 
						
							2015-08-10 03:33:32 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	de441916d6  
						 
						
							
							
								
								
								Add a comment to build instructions about cpplint  
							
							... 
							
							
							
							I added a mention of `cpplint.py` in the build instructions.
The reason, is because it's easy to miss it's existence. Even if you
noticed it's mentioned in `coding-style.md` you might mistakenly think
that `test.py` runs it). 
							
						 
						
							2015-08-08 23:25:27 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eran Tiktin 
								
							 
						 
						
							
							
								
							
							
	c495088390  
						 
						
							
							
								
								
								Updated native-image.md  
							
							... 
							
							
							
							Add a mention of the support for .ico files on Windows 
							
						 
						
							2015-08-08 19:08:09 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Ryan 
								
							 
						 
						
							
							
								
							
							
	fb60f7946f  
						 
						
							
							
								
								
								Fixed typo  
							
							
							
						 
						
							2015-08-06 22:15:59 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	958658513c  
						 
						
							
							
								
								
								Refactor code in taskbarHost  
							
							
							
						 
						
							2015-08-06 12:44:07 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	f740684f41  
						 
						
							
							
								
								
								Merge pull request  #2400  from atom/thumbar_button  
							
							... 
							
							
							
							Implement API for supporting thumbnail toolbars 
							
						 
						
							2015-08-06 09:55:26 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robo 
								
							 
						 
						
							
							
								
							
							
	0a7a4c0d0a  
						 
						
							
							
								
								
								webview: adding load-commit event  
							
							
							
						 
						
							2015-08-05 19:22:30 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Haojian Wu 
								
							 
						 
						
							
							
								
							
							
	78eac4116c  
						 
						
							
							
								
								
								Polish thumbar code.  
							
							... 
							
							
							
							* Fix a memory leak in thumbar initialization.
* Check the number of thumbar buttons, should be <= 7.
* Correct to check thumbar button click event. 
							
						 
						
							2015-08-05 19:38:12 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Haojian Wu 
								
							 
						 
						
							
							
								
							
							
	ad01a1731a  
						 
						
							
							
								
								
								📝  say more about thumbnail toolbar.  
							
							
							
						 
						
							2015-08-05 13:55:04 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Haojian Wu 
								
							 
						 
						
							
							
								
							
							
	97ab780305  
						 
						
							
							
								
								
								📝  BrowserWindow.setThumbarButton API.  
							
							
							
						 
						
							2015-08-05 13:55:04 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robo 
								
							 
						 
						
							
							
								
							
							
	3b05b135a5  
						 
						
							
							
								
								
								tracing: fix api and docs  
							
							
							
						 
						
							2015-08-05 02:29:55 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	7c75329b18  
						 
						
							
							
								
								
								Merge pull request  #2375  from deepak1556/web_frame_api_patch  
							
							... 
							
							
							
							webFrame: api to make scheme bypass CSP 
							
						 
						
							2015-08-03 14:46:40 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	e135bcb5b7  
						 
						
							
							
								
								
								docs: userGesture is optional  
							
							
							
						 
						
							2015-08-03 14:43:01 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	d455232eb1  
						 
						
							
							
								
								
								Merge pull request  #2383  from deepak1556/render_script_execution_patch  
							
							... 
							
							
							
							render: executejavascript with option to create usergesture context 
							
						 
						
							2015-08-03 14:37:29 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robo 
								
							 
						 
						
							
							
								
							
							
	9fb03d584c  
						 
						
							
							
								
								
								add spec and fix docs  
							
							
							
						 
						
							2015-07-31 12:30:17 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robo 
								
							 
						 
						
							
							
								
							
							
	92ea533aee  
						 
						
							
							
								
								
								webFrame: api to make scheme bypass CSP  
							
							
							
						 
						
							2015-07-30 22:36:02 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Robo 
								
							 
						 
						
							
							
								
							
							
	239d535cac  
						 
						
							
							
								
								
								render: executejavascript with option to simulate usergesture  
							
							
							
						 
						
							2015-07-30 15:38:46 +05:30 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jiaji Zhou 
								
							 
						 
						
							
							
								
							
							
	e0a117414b  
						 
						
							
							
								
								
								Add missing dependency for ubuntu build  
							
							... 
							
							
							
							I tried to follow the document to build electron on a fresh clean built Ubuntu 15.04.
I encountered the following error message when trying to run ./script/bootstrap.py -v
Package nss was not found in the pkg-config search path. 
Perhaps you should add the directory containing `nss.pc' 
to the PKG_CONFIG_PATH environment variable 
No package 'nss' found 
After installing libnss3-dev, the build can pass. 
							
						 
						
							2015-07-30 01:21:17 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	764a6e1d76  
						 
						
							
							
								
								
								Merge pull request  #2376  from timruffles/patch-2  
							
							... 
							
							
							
							more accuracy around why to use ASAR 
							
						 
						
							2015-07-30 09:39:36 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Cheng Zhao 
								
							 
						 
						
							
							
								
							
							
	bbce2c7e2f  
						 
						
							
							
								
								
								Merge pull request  #2372  from atom/allow-insecure-content  
							
							... 
							
							
							
							Add allowing-insecure-content option 
							
						 
						
							2015-07-30 09:38:27 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	0f648f4468  
						 
						
							
							
								
								
								Update as upstream  
							
							
							
						 
						
							2015-07-30 10:27:56 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Plusb Preco 
								
							 
						 
						
							
							
								
							
							
	05def654c3  
						 
						
							
							
								
								
								Translate web-view-tag-tag-ko.md, improve grammer  
							
							
							
						 
						
							2015-07-30 09:56:27 +09:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Tim Ruffles 
								
							 
						 
						
							
							
								
							
							
	f9d5915542  
						 
						
							
							
								
								
								more accuracy around why to use ASAR  
							
							... 
							
							
							
							'protect' implies a lot more security than ASAR provides (none). I asked around #2374  to get some understanding of what ASAR does do for you. 
							
						 
						
							2015-07-29 13:45:30 +01:00