Commit graph

6310 commits

Author SHA1 Message Date
Cheng Zhao
ec88567683 Merge pull request #3573 from rprichard/fix_3565
Fix https://github.com/atom/electron/issues/3565 by adding a typeof
2015-11-26 11:00:29 +08:00
Ryan Prichard
0f5a3baff4 Fix https://github.com/atom/electron/issues/3565 by adding a typeof 2015-11-24 16:49:52 -06:00
Cheng Zhao
bf5e9e4f4d Merge pull request #3568 from laiso/fix_docs
docs: s/loadUrl/loadURL/g in docs-translations/
2015-11-24 22:03:46 +08:00
laiso
4acbd3e03f s/loadUrl/loadURL/g in docs-translations/ 2015-11-24 21:02:14 +09:00
Cheng Zhao
b9fd095b04 docs: Mark code blocks 2015-11-24 18:40:50 +08:00
Cheng Zhao
24e892dd17 Update brightray for #3550 2015-11-24 18:39:16 +08:00
Cheng Zhao
bab603d33a Merge pull request #3550 from etiktin/support_proxy_bypass_list
Add support for --proxy-bypass-list command line argument
2015-11-24 18:38:33 +08:00
Cheng Zhao
fe88cb01fc Merge pull request #3531 from deepak1556/fetch_job_nocontent_patch
protocol: handle http responses with no content
2015-11-24 15:45:07 +08:00
Cheng Zhao
a4a14a5f0e Update brightray for #3458 2015-11-24 15:14:48 +08:00
Cheng Zhao
e634dc567e Merge pull request #3561 from preco21/master
Update as upstream
2015-11-24 13:40:16 +08:00
Plusb Preco
6e6cee3ac6 Small fixes 2015-11-24 10:23:52 +09:00
Plusb Preco
6636effb1d Update as upstream
* Update as upstream
* Add caution of translation version
2015-11-24 10:21:30 +09:00
Plusb Preco
d353a3a204 Merge remote-tracking branch 'refs/remotes/atom/master' 2015-11-23 20:34:00 +09:00
Cheng Zhao
c2197d8a05 Merge pull request #3554 from meowlab/docs-fix
docs: Fix deprecated usage tips
2015-11-23 18:19:37 +08:00
Cheng Zhao
9e74b10825 Merge pull request #3548 from dongjoon-hyun/fix_typos_in_koKR_api_ipc_main
Fix typos in Korean api/ipc-main.md
2015-11-23 17:45:48 +08:00
Cheng Zhao
422e40d08c Merge pull request #3544 from dongjoon-hyun/fix_typo
Fix a typo in Korean quick-start tutotial
2015-11-23 17:45:44 +08:00
Cheng Zhao
e98d4c4a2e Merge pull request #3549 from bengotow/fix-hide-others
Remove trailing colons from default menu roles
2015-11-23 17:44:06 +08:00
Plusb Preco
54f16a5568 Merge remote-tracking branch 'refs/remotes/atom/master' 2015-11-23 18:23:15 +09:00
Cheng Zhao
360a747acf Merge pull request #3542 from etiktin/fix_menu_item_using_deprcated_api
Fix menu-item using deprecated API
2015-11-23 17:11:44 +08:00
Cheng Zhao
ba8b448c36 docs: Add indent for items in list
Some markdown renderers require it to be able to render the list
correctly.
2015-11-23 16:59:15 +08:00
Cheng Zhao
634fef2508 Merge pull request #3537 from etiktin/make_BrowserWindow_options_optional
Make BrowserWindow options argument optional
2015-11-23 16:56:30 +08:00
Cheng Zhao
812e105d4f Merge pull request #3535 from etiktin/use_the_correct_docs_version
Use the correct docs version
2015-11-23 16:45:26 +08:00
Cheng Zhao
1a1d5aba94 Merge pull request #3533 from preco21/master
Update as upstream
2015-11-23 16:41:02 +08:00
Sunny
6d46c3a75e docs: Fix deprecated usage tips 2015-11-23 13:40:23 +08:00
Eran Tiktin
baab0486f0 Add documentation for --proxy-bypass-list
Depends on atom/brightray#179
2015-11-22 23:44:20 +02:00
Robo
167f11e797 protocol: handle http responses with no content 2015-11-23 01:07:14 +05:30
Ben Gotow
fbdef9e112 Remove trailing colons from default menu roles
`hideothers` and `unhide` had trailing colons which prevented them from being enabled / working in the default app. #3543
2015-11-22 09:08:35 -08:00
Dongjoon Hyun
df570269e3 Fix typos in Korean api/ipc-main.md 2015-11-22 23:16:56 +09:00
Dongjoon Hyun
10a7ecee46 Add space, too 2015-11-22 19:55:36 +09:00
Dongjoon Hyun
b406774055 Fix a typo in Korean quick-start tutotial 2015-11-22 19:50:52 +09:00
Eran Tiktin
6db6842c14 Fix menu-item using deprecated API
Some of the roles in menu-item use methods on BrowserWindow instead of
WebContents which outputs a deprecation warning.
I changed it to use the correct methods.
2015-11-22 01:13:57 +02:00
Eran Tiktin
651254424d Expand the descriptions of options with defaults
Resolves #3367
2015-11-21 21:50:23 +02:00
Eran Tiktin
4027d04662 Add test 2015-11-21 06:58:17 +02:00
Eran Tiktin
ab693ca571 Update docs 2015-11-21 06:42:40 +02:00
Eran Tiktin
18de28c3ff Make BrowserWindow options argument optional
Resolves #3473
2015-11-21 06:22:19 +02:00
Plusb Preco
1cf3216f50 Add missed translation 2015-11-21 13:15:37 +09:00
Eran Tiktin
df8cc85d2c Rephrased the note 2015-11-21 04:22:16 +02:00
Eran Tiktin
5730d588d0 Add a note to readme about docs versioning
Added a note to readme about using the correct docs version. Hopefully
this will reduce users confusion.
2015-11-21 03:31:52 +02:00
Eran Tiktin
4d4bb0a73e Added ctags cache files to .gitignore 2015-11-21 02:32:53 +02:00
Eran Tiktin
9341b9d640 Make links to docs, point to the correct version
- Links to docs in the default app, pointed to the docs in the master
branch. I changed them to point to the docs that match Electron's
version.
- Added Electron's version to the header of the default app, so it will
be easier to figure out what version is currently running.
2015-11-21 02:26:59 +02:00
Plusb Preco
ecdce2b214 Update as upstream 2015-11-21 07:51:52 +09:00
Eran Tiktin
f374508a61 Merge remote-tracking branch 'refs/remotes/atom/master' 2015-11-20 19:25:23 +02:00
Eran Tiktin
50083017bc Merge remote-tracking branch 'refs/remotes/atom/master' 2015-11-20 18:44:51 +02:00
Cheng Zhao
29052b0498 Bump v0.35.1 2015-11-20 13:36:59 +08:00
Cheng Zhao
153c751fd7 Update brightray for #3493 2015-11-20 13:33:42 +08:00
Cheng Zhao
8e2faba8f7 Small style fix 2015-11-20 13:06:42 +08:00
Cheng Zhao
c1d6d68783 Merge pull request #3509 from bengotow/macosx-desktop-window
Support the "desktop" window type on Mac OS X
2015-11-20 13:02:05 +08:00
Cheng Zhao
866cff8b9c Merge pull request #3519 from preco21/master
Update as upstream, some cleanups
2015-11-20 10:52:53 +08:00
Cheng Zhao
784d2633a9 Make child_process.execFileSync support asar 2015-11-20 10:33:57 +08:00
Cheng Zhao
eec93665b7 Merge pull request #3514 from atom/session
Add session module
2015-11-20 10:23:38 +08:00