Commit graph

15371 commits

Author SHA1 Message Date
Hum4n01d
a694110d48 Fix order of OSs
It was previously inconsistent
2017-05-08 13:36:28 -07:00
Kevin Sawicki
dd84fd4348 Merge pull request #9400 from brianzelip/patch-1
📝 minor docs copy edit - add two words
2017-05-08 08:57:50 -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
357caf8991 fixing spec 2017-05-06 22:41:05 -07:00
Hari Krishna Reddy Juturu
939885bc66 Remove .only on spec 2017-05-06 22:14:52 -07: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
Kevin Sawicki
b712521056 Merge pull request #9381 from electron/cpu-usage-fix
CPU Usage requires process metrics to be preserved
2017-05-05 16:03:26 -07:00
Zeke Sikelianos
f228809317 fix the tslint.json path 2017-05-05 15:00:29 -07:00
Zeke Sikelianos
d4d1409e6f use tsconfig file when linting electron.d.ts 2017-05-05 13:52:14 -07:00
Zeke Sikelianos
0a941fe2f5 Merge pull request #9385 from LestaD/patch-1
Add Russian Telegram community
2017-05-05 10:34:06 -07:00
Sergey Sova
888b2d6bd1 Add Russian Telegram community 2017-05-05 19:34:53 +03:00
Zeke Sikelianos
7d7a2d9319 Merge pull request #7857 from electron/publish-electron.d.ts
Initial scripts to publish electron.d.ts
2017-05-05 08:31:00 -07:00
Zeke Sikelianos
c46b70c68d Merge pull request #9383 from johangp/patch-1
Is Google Chrome an open source browser?
2017-05-05 08:11:48 -07:00
Johan Giraldo
39d7981624 Is Google Chrome an open source browser?
Google Chrome isn't an open source project. Chromium is an open source project, so I think that is more precise say "and is used in Chromium, the open source browser from Google" or something like these.
2017-05-05 13:49:38 +02:00
Hari Krishna Reddy Juturu
d65c4fe912 CPU Usage requires process metrics to be preserved 2017-05-05 02:38:51 -07:00
Kevin Sawicki
6980e92a00 Merge pull request #8998 from electron/felix-notification-docs
Improve notification docs
2017-05-04 15:31:12 -07:00
Kevin Sawicki
70033009eb Merge pull request #9373 from electron/process-metrics
Adding CPU and I/O metrics to process module
2017-05-04 15:30:19 -07:00
Hari Krishna Reddy Juturu
07d8dfaa53 Fixing UT 2017-05-04 14:50:06 -07:00
Hari Krishna Reddy Juturu
6b51c25820 Exposing cpu & io counters function similar to mem methods 2017-05-04 14:48:37 -07:00
Hari Krishna Reddy Juturu
472dad1ffc convert var to const 2017-05-04 14:33:59 -07:00
Hari Krishna Reddy Juturu
982c5064d8 Removing extra bool 2017-05-04 14:33:59 -07:00
Hari Krishna Reddy Juturu
656fb593b4 Fixing lint error 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
3c71f542a8 Fixing UT 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
70e199e255 Merge pull request #9333 from electron/process-memory-info-sandbox
Expose `process.get{System,Process}MemoryInfo` to sandbox
2017-05-04 14:17:44 -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
1e4b99bd7f Merge pull request #9338 from mcizol/master
add auto-invite for turkish community(en-readme)
2017-05-04 14:14:22 -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
3b3e7cc14e Assert memory info for all returned processes 2017-05-04 13:43:45 -07:00
Hari Krishna Reddy Juturu
ab1bcefe9e Make pid an integer 2017-05-04 13:37:43 -07:00
Kevin Sawicki
edd28c9a91 Link to MemoryInfo structure 2017-05-04 13:35:12 -07:00
Kevin Sawicki
e206aae9fc 🎨 Use snake case 2017-05-04 13:27:42 -07:00
Kevin Sawicki
76c15a7a3e Merge pull request #9348 from tsekityam/patch-1
Change translation of `license` to `授權條款`
2017-05-04 11:32: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
Kevin Sawicki
110611f242 🎨 2017-05-03 16:22:56 -07:00
Kevin Sawicki
d3bb7b7278 Merge pull request #294 from electron/updgrade-to-58-0-3029-96
Upgrade to 58.0.3029.96
2017-05-03 13:42:33 -07:00
22222
042b511a27 Fix #8911 2017-05-03 12:47:00 -05:00
Kevin Sawicki
e1d564da6e Upgrade to Chrome 58.0.3029.96 2017-05-03 08:49:57 -07:00
Kevin Sawicki
dec7a3c12a Upgrade to 58.0.3029.96 2017-05-03 08:48:58 -07:00
Samuel Attard
718dc732ad
Add docs and add isSelected arg 2017-05-03 20:25:50 +10:00
Zeke Sikelianos
7956d63e99 tslint electron.d.ts 2017-05-02 16:31:46 -07:00
Kevin Sawicki
164b97af4c Use nodedir option to specify local headers 2017-05-02 13:47:34 -07:00
Kevin Sawicki
20fa2ce147 Rebuild native modules during bootstrap 2017-05-02 13:24:29 -07:00
Kevin Sawicki
c19c14d0b3 Build spec modules against locally generated node headers tarball 2017-05-02 10:14:49 -07:00
Kevin Sawicki
c6c93211be Merge remote-tracking branch 'origin/master' into chrome58 2017-05-02 09:15:16 -07:00