Commit graph

6892 commits

Author SHA1 Message Date
Cheng Zhao
9e82334b67 Merge pull request #4057 from princejwesley/browser-window
Return null for no focused window when calling BrowserWindow.getFocusedWindow
2016-01-11 22:53:38 +08:00
Cheng Zhao
192fa4c86b Cleanup docs and code of setProxy 2016-01-11 22:45:34 +08:00
Cheng Zhao
34c9279fc5 Merge pull request #4046 from deepak1556/session_proxy_patch
session: allow user to isolate pac script and proxy bypass rules
2016-01-11 21:49:15 +08:00
Cheng Zhao
a1da3c278b Merge pull request #4056 from cdaringe/patch-1
Specify enumerable property accessibility
2016-01-11 21:42:54 +08:00
Cheng Zhao
b25435c465 Merge pull request #4054 from yamatoya/master
Add Japanese translation documentation for faq and tutorial
2016-01-11 21:42:10 +08:00
Cheng Zhao
26bd97d6cf Fix style issues of #4029 2016-01-11 21:12:07 +08:00
Cheng Zhao
edcd34d4ce Merge pull request #4029 from leethomas/show-message-box-default-button
Show message box default button
2016-01-11 20:58:03 +08:00
Cheng Zhao
e3d3cd1198 docs: Update link of VS Community
Also fix the version of VS requried.

Close #3962.
2016-01-11 20:52:32 +08:00
Cheng Zhao
91ca84d106 Merge pull request #4050 from etiktin/cosmetic
Remove unneeded extra semicolons (;; -> ;)
2016-01-11 15:41:06 +08:00
Cheng Zhao
fe45a4ac98 Merge pull request #4048 from etiktin/fix_win_failing_test
Fix failing test on Windows
2016-01-11 15:40:08 +08:00
Prince J Wesley
018ae5189b Return null for no focused window when calling BrowserWindow.getFocusedWindow() 2016-01-11 12:58:44 +05:30
Robo
8557cd223c maintain api compatibility 2016-01-11 12:24:01 +05:30
Cheng Zhao
33b7b774c1 docs: Notification on Windows can use http:// icon now 2016-01-11 14:41:38 +08:00
Cheng Zhao
1944472c2f docs: Make win.getNativeWindowHandle more clear 2016-01-11 13:43:24 +08:00
Cheng Zhao
54e1d7b3bf Merge pull request #4023 from omrilitov/master
Added getNativeWindowHandle method
2016-01-11 13:32:29 +08:00
Cheng Zhao
76a34a27ea Merge pull request #4055 from atom/backport-1500713003
Backport https://codereview.chromium.org/1500713003
2016-01-11 13:24:55 +08:00
大和屋 貴仁
630819e1d6 Merge branch 'master' of https://github.com/atom/electron 2016-01-11 14:12:43 +09:00
Christopher Dieringer
12f5e5072d Specify enumerable property accessibility 2016-01-10 21:02:07 -08:00
Cheng Zhao
1de9cfd4eb Backport https://codereview.chromium.org/1500713003 2016-01-11 12:59:02 +08:00
大和屋 貴仁
4f1be903c4 Fix a document 2016-01-11 13:19:14 +09:00
Cheng Zhao
20a92d7d1e Merge pull request #4044 from j5a/translate_docs_into_japanese
Update docs-translations/jp/tutorial/quick-start.md
2016-01-11 12:06:39 +08:00
Cheng Zhao
7bec597ea0 Merge pull request #4042 from ZhangYueqiu/patch-1
Update supported-platforms.md
2016-01-11 12:06:16 +08:00
Plusb Preco
373bed33c5 📝 Update as upstream
[ci skip]
2016-01-11 12:04:48 +08:00
大和屋 貴仁
595a3469d9 Add Japanese translation documentation for faq and tutorial 2016-01-11 13:03:37 +09:00
Cheng Zhao
1ee565ab81 Merge pull request #4030 from lukeapage/patch-4
Correct misleading sentence on progress for transparent click through
2016-01-11 11:21:18 +08:00
leethomas
fee301e768 follow style guidelines 2016-01-10 19:15:40 -08:00
Cheng Zhao
0f2c35e2b8 Merge pull request #4052 from atom/right-way-to-fix-path
Change brightray's PATH_START to 11000
2016-01-11 11:04:06 +08:00
Cheng Zhao
adcdf123af Change brightray's PATH_START to 11000 2016-01-11 10:40:45 +08:00
Cheng Zhao
da52017d82 Revert "fix chrome app and user path conflicts"
This reverts commit 25aaafde45bd3ac7d9a82184f67b79874da73aa8.
2016-01-11 10:30:17 +08:00
Eran Tiktin
29939dc0b7 Remove unneeded extra semicolons (;; -> ;) 2016-01-11 02:11:40 +02:00
leethomas
803b06b7de 🏁 support defaultId for dialog boxes on Windows 2016-01-10 15:55:26 -08:00
leethomas
ae5c6add11 rename all references to default_button_index -> default_id to keep consistent with cancel_id 2016-01-10 15:33:27 -08:00
Eran Tiktin
f1d388fb36 Fix failing test on Windows
The exit code tests include an assert on the output we get from a
spawned electron process. This doesn't currently work on Windows, so we
skip it for now
2016-01-11 01:33:22 +02:00
Robo
be50ca2653 session: allow user to isolate pac script and proxy bypass rules 2016-01-11 03:55:56 +05:30
Joe Naha
8b07918650 📝 Update to follow the latest version.
[ci skip]
2016-01-11 04:00:03 +09:00
ZhangYueqiu
56d1235bbd Update supported-platforms.md
Change a wrong word
2016-01-10 15:43:25 +08:00
Eran Tiktin
c5dee6a3d8 Merge pull request #10 from atom/master
Update from upstream
2016-01-10 01:46:26 +02:00
Omri Litov
a4636ba18c Update browser-window.md 2016-01-08 20:53:59 +02:00
leethomas
dfce803045 🏁 update windows message_box function signatures to accept default_button_index....and do nothing with it 2016-01-08 08:23:06 -08:00
leethomas
c4c145ef6a 📝 add defaultButtonIndex to dialog docs 2016-01-08 08:22:11 -08:00
leethomas
22c455175a 🐧 add default button index for linux/gtk 2016-01-08 08:22:10 -08:00
leethomas
f1edd5f26f 🍎 add default button index for osx 2016-01-08 08:21:54 -08:00
Luke Page
6728d9291d Correct misleading sentence on progress for transparent click through 2016-01-08 10:56:51 +00:00
Cheng Zhao
df27cda36c Bump v0.36.3 2016-01-08 13:40:47 +08:00
Cheng Zhao
9a707b7c69 Merge pull request #4027 from atom/fix-locale
Fix loading locale on OS X
2016-01-08 13:32:53 +08:00
Cheng Zhao
5514e89276 Copy locales in Cocoa format 2016-01-08 12:38:00 +08:00
Cheng Zhao
ec4c5e58ff Initialize resource bundle on browser process separately 2016-01-08 12:06:06 +08:00
Cheng Zhao
5f6a8a7c24 Merge pull request #4009 from atom/remove-getobject-handler
Remove custom WM_GETOBJECT handler
2016-01-08 09:55:24 +08:00
Omri Litov
943e46f3bd Fix linux and mac build errors 2016-01-08 00:27:53 +02:00
Omri Litov
224955d6ac Update browser-window.md 2016-01-07 23:17:23 +02:00