| 
								
								
									 Kevin Sawicki | a44f0620b3 | : -> - | 2017-05-10 14:27:51 -07:00 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | edac443673 | Correct property name to pid | 2017-05-10 14:26:13 -07:00 |  | 
				
					
						| 
								
								
									 Hari Juturu | 277c3155a6 | use will-create-webview event | 2017-05-09 10:12:44 -07:00 |  | 
				
					
						| 
								
								
									 renaesop | cba5e96496 | Merge remote-tracking branch 'ups/master' | 2017-05-09 09:44:24 +08:00 |  | 
				
					
						| 
								
								
									 Hari Krishna Reddy Juturu | 3321f7d39c | Changing command line option name | 2017-05-08 17:27:31 -07:00 |  | 
				
					
						| 
								
								
									 Tom Watson | 50057163c6 | 📝 clarify dialog buttons blocking side effect | 2017-05-08 11:17:33 +02:00 |  | 
				
					
						| 
								
								
									 Brian Zelip | 68c19fc509 | 📝 minor docs copy edit - add two words [ci skip] | 2017-05-07 11:06:46 -04:00 |  | 
				
					
						| 
								
								
									 Hari Krishna Reddy Juturu | 94d054cf11 | Add option to override webview security | 2017-05-06 22:10:42 -07:00 |  | 
				
					
						| 
								
								
									 Hari Krishna Reddy Juturu | b4a8ed01f1 | PR 44648: Enabling creation on webview with node-integration disabled and raising events - Enabling creation on webview with node-integration disabled and raising events
Conflicts:
	lib/browser/guest-view-manager.js | 2017-05-06 20:50:01 -07:00 |  | 
				
					
						| 
								
								
									 Hari Krishna Reddy Juturu | 472dad1ffc | convert var to const | 2017-05-04 14:33:59 -07:00 |  | 
				
					
						| 
								
								
									 Hari Krishna Reddy Juturu | 8bc4d3f8bd | GetIOCounters is not implemented on mac | 2017-05-04 14:33:59 -07:00 |  | 
				
					
						| 
								
								
									 Hari Krishna Reddy Juturu | 8a5aa04756 | Adding CPU and I/O metrics to process module | 2017-05-04 14:33:59 -07: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 | 01b3db3d2f | 🎨 | 2017-05-04 14:15:48 -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 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | edd28c9a91 | Link to MemoryInfo structure | 2017-05-04 13:35:12 -07:00 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | 0343db53ad | Merge pull request #9344 from rafbm/patch-1 Use actual Chromium l10n_util list in locales.md | 2017-05-04 11:31:31 -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 |  | 
				
					
						| 
								
								
									 Samuel Attard | 718dc732ad | Add docs and add isSelected arg | 2017-05-03 20:25:50 +10:00 |  | 
				
					
						| 
								
								
									 Kevin Wojniak | 342a8fd577 | Add missing word | 2017-05-02 09:05:07 -07:00 |  | 
				
					
						| 
								
								
									 Rafael Masson | 410078bb54 | Use actual Chromium l10n_util list in locales.md I’m not sure where the locale list from the [original commit](https://github.com/electron/electron/pull/6324/commits/bbaab9b35536691ad4c8effab147c8797e629fbe) came from, but it clearly wasn’t copied from `l10n_util`. It was missing Spanish, Portuguese, Polish, Vietnamese, to name a few…
This commit overwrite the whole list with [`l10n_util` as-is](61cfc2b0a8/ui/base/l10n/l10n_util.cc (L41-L175)). | 2017-05-01 17:15:37 -04:00 |  | 
				
					
						| 
								
								
									 Brendan Forster | 541efc3b93 | tidy up docs | 2017-04-29 19:35:49 +10:00 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | c26605c384 | Minor edits to example guide | 2017-04-27 14:22:56 -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 |  | 
				
					
						| 
								
								
									 Neil Craig | c0669cb46e | Update touch-bar.md Add a simple example of running the example code as it might not be obvious to people who've not used Electron. Hopefully it makes sense :-) | 2017-04-27 20:19:17 +01:00 |  | 
				
					
						| 
								
								
									 Brendan Forster | 5534181ebd | rework docs | 2017-04-27 15:12:30 +10:00 |  | 
				
					
						| 
								
								
									 Brendan Forster | 50af70a0e8 | Merge branch 'master' into certificate-addition-windows | 2017-04-27 14:47:50 +10:00 |  | 
				
					
						| 
								
								
									 Ryohei Ikegami | 1d73e84a29 | Merge branch 'master' into native-window-open | 2017-04-27 12:03:55 +09:00 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | f6bbcc6efa | Fix typos | 2017-04-26 13:03:15 -07:00 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | 87db1b8aa7 | Document other inherited web preferences | 2017-04-25 12:57:53 -07: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 | 9e70372c1f | change endsession event name to session-end | 2017-04-24 10:16:11 -07:00 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | d3ae1d8d23 | Merge pull request #9246 from rreimann/master Clarify requirements for resumable downloads | 2017-04-24 08:50:55 -07:00 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | 13eeb1d17f | Minor wording tweaks | 2017-04-24 08:50:40 -07:00 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | 99985c0ed9 | Wrap header names in backticks | 2017-04-24 08:49:59 -07:00 |  | 
				
					
						| 
								
								
									 Brendan Forster | 253a4b0114 | Merge remote-tracking branch 'electron/master' into certificate-addition-windows | 2017-04-24 11:13:34 +10:00 |  | 
				
					
						| 
								
								
									 rreimann | 7ea6d01a8c | Rephrase note for resume method | 2017-04-22 18:15:07 +02:00 |  | 
				
					
						| 
								
								
									 Hari Krishna Reddy Juturu | 3c3e14b820 | End session event on browser window | 2017-04-21 14:22:11 -07:00 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | e9880e9c97 | Merge pull request #8996 from swashcap/master Add documentation note on dynamic Menu items | 2017-04-21 13:44:01 -07:00 |  | 
				
					
						| 
								
								
									 Kevin Sawicki | 7177ea5e9a | Bold note for emphasis | 2017-04-21 13:39:51 -07:00 |  | 
				
					
						| 
								
								
									 rreimann | 7ce3571270 | Clarify requirements for resumable downloads | 2017-04-21 15:14:56 +02:00 |  | 
				
					
						| 
								
								
									 Brendan Forster | 304c8b9562 | add some docs for Windows usage | 2017-04-21 13:09:49 +10:00 |  | 
				
					
						| 
								
								
									 Paul Frazee | 3068d7a43e | Make note about sync webview calls in docs | 2017-04-20 14:02:41 -05: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 | 6701a96216 | Merge pull request #9211 from sindresorhus/patch-1 Add docs tip about testing Touch Bar usage | 2017-04-18 12:10:45 -04:00 |  | 
				
					
						| 
								
								
									 Hari Krishna Reddy Juturu | efca0a6e07 | fixup! Adding cookie flush store api | 2017-04-18 09:05:13 -07:00 |  | 
				
					
						| 
								
								
									 Hari Krishna Reddy Juturu | 19709a50e9 | Adding cookie flush store api | 2017-04-18 09:05:13 -07:00 |  | 
				
					
						| 
								
								
									 Samuel Attard | 11c7c107a9 | add iconPosition property to touch bar buttons | 2017-04-18 08:56:39 -07:00 |  | 
				
					
						| 
								
								
									 Ryohei Ikegami | 8dff29185b | Merge branch 'master' into native-window-open | 2017-04-18 21:59:22 +09:00 |  |