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
b4da15bba8
Merge pull request #2545 from mmastrac/master
...
Fix for issue 1968: use uv_backend_timeout to determine timeout to match other platforms
2015-08-21 11:33:43 +08:00
Cheng Zhao
993a5fda41
Merge branch 'preco21-master'
2015-08-21 11:31:42 +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
Matt Mastracci
e628c7b37d
Fix for issue 1968: use uv_backend_timeout to determine timeout to match other platforms
2015-08-20 20:13:04 -06: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
715fdc8614
Merge pull request #2454 from etiktin/fix_asar_testing
...
Fix asar testing (it would fail on Windows due to line endings)
2015-08-21 09:00:36 +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
f386342a7c
Fix memory leak and confirming to style guide
...
Fixed according to @hokein 's suggestions.
2015-08-20 19:26:20 +03: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
Jessica Lord
12672cf50b
Merge pull request #2511 from petrfelzmann/doc-github-link
...
Fix absolute url to github
2015-08-19 13:33:54 +02: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
Haojian Wu
69e1e3c0bd
Fix a typing error in option checking: printBackgrounds => printBackground
2015-08-18 09:28:02 +08:00
Paul Betts
0efdb448b6
Merge pull request #2509 from atom/fix-win-tray
...
Correct generation of GUID on Windows.
2015-08-17 09:02:21 -07:00
Petr Felzmann
7842a90c5e
Fix absolute url to github
2015-08-17 15:03:04 +02:00
Thomas Johansen
7c62cfba33
Merge pull request #2510 from petrfelzmann/doc-formatting
...
Fix formatting of print and printToPDF methods
2015-08-17 12:28:13 +02:00
Petr Felzmann
acffc713e0
Fix formatting of print and printToPDF methods
2015-08-17 10:52:10 +02:00
Thomas Johansen
d3db178182
Merge pull request #2508 from etiktin/fix_typo_in_init
...
Fix typo
2015-08-17 10:03:54 +02:00
Haojian Wu
763dcc545d
Correct generation of GUID on Windows.
2015-08-17 13:20:36 +08:00
Eran Tiktin
6f25996fa1
Fixed typo
2015-08-16 23:20:09 +03:00
Olivier Forget
e296f6daa2
Merge pull request #1 from teleclimber/teleclimber-win-build
...
Clarify that MSVS 2015 will not work in Windows build docs.
2015-08-14 10:28:26 -07:00
Olivier Forget
092f9d2c46
Clarify that MSVS 2015 will not work in Windows build docs.
2015-08-14 10:25:18 -07:00
Kevin Sawicki
1a5269e51b
Merge pull request #2476 from atom/ks-contributor-covenant
...
Switch to Contributor Covenant from Open Code of Conduct
2015-08-11 09:49:25 -07:00
Kevin Sawicki
8f32f9f5cb
Open Code of Conduct -> Contributor Covenant
2015-08-11 09:45:45 -07:00
Cheng Zhao
b4e836bf2e
Bump v0.30.4
2015-08-10 16:50:48 +08:00
Cheng Zhao
a296b4ef33
Merge pull request #2465 from atom/fix-incept-scheme
...
Force request context to initialize beforing incepting protocol
2015-08-10 15:47:12 +08:00
Cheng Zhao
140ba2858a
Fix cpplint warnings
2015-08-10 15:37:03 +08:00
Cheng Zhao
3379641fe2
Force request context to initialize beforing incepting protocol
2015-08-10 15:31:29 +08:00
Cheng Zhao
0644129fbe
Pass net::URLRequestContextGetter in scoped_refptr
2015-08-10 15:28:18 +08:00
Cheng Zhao
c295979270
BrowserContext::GetRequestContext can only be called on UI thread
2015-08-10 15:02:16 +08:00
Cheng Zhao
e4a7352b62
Merge pull request #2462 from atom/tray-event
...
More fixes of Tray
2015-08-10 13:45:35 +08:00
Cheng Zhao
33eadad139
popContextMenu => popUpContextMenu
2015-08-10 13:00:15 +08:00
Cheng Zhao
225140bd64
win: Don't emit right-clicked event when there is menu attached
2015-08-10 12:52:55 +08:00
Cheng Zhao
58dee04d5c
mac: Redraw icon when menu is closed
2015-08-10 12:52:35 +08:00
Cheng Zhao
4b9ff309ec
Add our own MenuModel class
2015-08-10 12:39:05 +08:00
Cheng Zhao
a3f3a35fd1
mac: Don't emit "clicked" event if there is menu attached
2015-08-10 12:18:00 +08:00
Cheng Zhao
aa03eb5b6c
Merge pull request #2461 from atom/fix-webview-crash
...
Delay the call of element resize callback to next tick
2015-08-10 12:07:58 +08:00
Cheng Zhao
ebe70435ef
Merge pull request #2460 from atom/iojs-new-headers
...
Upload node headers with new filenames
2015-08-10 12:00:17 +08:00
Cheng Zhao
0a49dcc623
Delay the call of element resize callback to next tick
2015-08-10 11:56:42 +08:00
Cheng Zhao
52d07eb30f
Update checksums for new filenames
2015-08-10 11:42:14 +08:00
Cheng Zhao
70be04a2d3
Upload headers with new filenames
2015-08-10 11:28:43 +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
