Cheng Zhao
|
989799633d
|
Merge pull request #2762 from GoooIce/master
Add docs-translations\api\ global-shortcut.md and accelerator.md for zh-CN
|
2015-09-11 21:09:07 +08:00 |
|
Cheng Zhao
|
bf01112acd
|
Merge pull request #2764 from tomashanacek/master
docs: Fix role hideothers, unhide typo
|
2015-09-11 21:06:26 +08:00 |
|
Tomáš Hanáček
|
af5262630a
|
docs: Fix role hideothers, unhide typo
|
2015-09-11 14:26:48 +02:00 |
|
王雪
|
a1cd806955
|
Merge pull request #3 from atom/master
更新一下啊
|
2015-09-11 18:38:10 +08:00 |
|
GoooIce
|
ff67fae9ef
|
Add api\accelerator.md
Add api\accelerator.md
|
2015-09-11 17:27:20 +08:00 |
|
Cheng Zhao
|
b80aab3cf2
|
Merge pull request #2760 from preco21/master
Update as upstream, add new translated docs, fix typos,
|
2015-09-11 17:06:48 +08:00 |
|
Plusb Preco
|
750d3e979c
|
Add session.md as translated, mark untranslated files in README.md
|
2015-09-11 13:30:37 +09:00 |
|
Plusb Preco
|
c3664463ab
|
Update as upstream, fix typos
|
2015-09-11 11:56:36 +09:00 |
|
Plusb Preco
|
c6395c2197
|
Merge remote-tracking branch 'atom/master'
|
2015-09-11 11:56:11 +09:00 |
|
Jessica Lord
|
39bd10d1ef
|
Merge pull request #2757 from atom/jl-web-contents-links
Update Documentation Links to web-contents
|
2015-09-10 14:48:33 -07:00 |
|
Jessica Lord
|
9eca0f82de
|
Merge pull request #2751 from atom/jl-bw-prop
Create Instance Properties Section in BrowserWindow
|
2015-09-10 14:47:38 -07:00 |
|
Jessica Lord
|
4b8472d3b4
|
Merge pull request #2756 from GoooIce/master
Add docs-translations\api\shell.md for zh-CN
|
2015-09-10 12:47:05 -07:00 |
|
Jessica Lord
|
aae2d82c28
|
Update links to web-contents.md
|
2015-09-10 12:19:37 -07:00 |
|
Jessica Lord
|
6cfe43a644
|
Merge branch 'patch-1' of https://github.com/destan/electron into destan-patch-1
|
2015-09-10 12:13:21 -07:00 |
|
Jessica Lord
|
2ac2392a6b
|
🔥 extra line
|
2015-09-10 12:11:40 -07:00 |
|
Jessica Lord
|
7c287d565d
|
Resolve conflicts
|
2015-09-10 12:09:37 -07:00 |
|
Paul Betts
|
31775aa049
|
Fix harder
|
2015-09-10 11:00:43 -07:00 |
|
Paul Betts
|
9ca85a7859
|
Fix electron-rebuild instructions for Win32
|
2015-09-10 10:57:08 -07:00 |
|
Jessica Lord
|
b861a174ca
|
Merge pull request #2750 from atom/jl-doc-bits
A Few More Documentation Things
|
2015-09-10 10:41:42 -07:00 |
|
GoooIce
|
92f7899c60
|
Add api\global-shortcut.md
Add api\global-shortcut.md
|
2015-09-10 22:29:22 +08:00 |
|
王雪
|
572199068b
|
Merge pull request #2 from atom/master
更新一下啊
|
2015-09-10 20:39:22 +08:00 |
|
GoooIce
|
32a66fa94e
|
add api\shell.md
add api\shell.md
|
2015-09-10 20:27:50 +08:00 |
|
Cheng Zhao
|
60522e0d68
|
Bump v0.32.2
|
2015-09-10 16:27:15 +08:00 |
|
Cheng Zhao
|
708526baec
|
Merge pull request #2754 from atom/fix-node-integration
Fix "node-integration" not working in "web-preferences"
|
2015-09-10 16:26:12 +08:00 |
|
Cheng Zhao
|
ae2f754d10
|
No need to set menu in spec window
|
2015-09-10 16:01:04 +08:00 |
|
Cheng Zhao
|
143453b603
|
Update native-mate to fix the behavior of Dictionary::Get
|
2015-09-10 15:58:10 +08:00 |
|
Cheng Zhao
|
d4cbf7cadb
|
spec: node-integration should work in web-preferences
|
2015-09-10 15:57:16 +08:00 |
|
GoooIce
|
3ee854d9a3
|
Merge branch 'master' of https://github.com/GoooIce/electron
|
2015-09-10 14:34:11 +08:00 |
|
王雪
|
442b0d5df3
|
Merge pull request #1 from atom/master
更新一下啊
|
2015-09-10 14:37:05 +08:00 |
|
GoooIce
|
c8954ff32c
|
Merge remote-tracking branch 'atom/master'
|
2015-09-10 14:27:16 +08:00 |
|
Cheng Zhao
|
6321a3898c
|
Merge pull request #2748 from etiktin/patch-1
Update README.md
|
2015-09-10 11:18:24 +08:00 |
|
Cheng Zhao
|
70af2e0bee
|
osx: Don't warn about unkown warning option
We can not make every compiler happy.
|
2015-09-10 11:15:35 +08:00 |
|
Cheng Zhao
|
626c7d1090
|
Merge pull request #2747 from nekuz0r/did-fail-event-url
add ValidatedUrl to did-fail-load event
|
2015-09-10 11:02:01 +08:00 |
|
Jessica Lord
|
c29a2e4992
|
Standardize DevTools
|
2015-09-09 14:11:06 -07:00 |
|
Jessica Lord
|
279fd0a461
|
Standardize **Note:**
|
2015-09-09 14:09:14 -07:00 |
|
Jessica Lord
|
1a35d6bda6
|
🔥 extra lines
|
2015-09-09 14:00:37 -07:00 |
|
Jessica Lord
|
5593717d78
|
Create Instance Properties section
|
2015-09-09 13:57:35 -07:00 |
|
Jessica Lord
|
6abc4fb255
|
🔥 odd, stray +
|
2015-09-09 13:48:04 -07:00 |
|
Jessica Lord
|
e9712e2998
|
Add section on documentation translations
|
2015-09-09 13:33:11 -07:00 |
|
Jessica Lord
|
ce49bba2fc
|
Add section links
|
2015-09-09 13:32:56 -07:00 |
|
Eran Tiktin
|
5089929be8
|
Update README.md
Capitalized the "Formerly known..." text + rearranged the community section and mention the slack channel.
|
2015-09-09 21:34:20 +03:00 |
|
Gohy Leandre
|
590be75fa9
|
add ValidatedUrl to did-fail-load event
|
2015-09-09 15:56:16 +02:00 |
|
Jessica Lord
|
0046970805
|
Merge pull request #2713 from etiktin/fix_es_translation_links
Fix es translation links
|
2015-09-09 06:47:26 -07:00 |
|
Cheng Zhao
|
9dc6cfc1e9
|
Bump v0.32.1
|
2015-09-09 19:39:42 +08:00 |
|
Cheng Zhao
|
749a1a3e9a
|
Merge pull request #2746 from atom/no-keep
Fix session not getting persisted on exit
|
2015-09-09 19:39:20 +08:00 |
|
Cheng Zhao
|
93bbc0bca9
|
Don't reference RequestContextGetter in JS objects
V8 doesn't guarrentee the C++ class of JS objects will get destroyed, so
this will result in RequestContextGetter never getting freed
|
2015-09-09 19:27:28 +08:00 |
|
Cheng Zhao
|
9d51da505e
|
Run destruction callbacks before message loop gets destroyed
|
2015-09-09 19:27:08 +08:00 |
|
Destan Sarpkaya
|
e48f5ea1aa
|
update broken link
|
2015-09-09 14:06:33 +03:00 |
|
Cheng Zhao
|
e5496d9ac0
|
Merge pull request #2743 from atom/fix-backward-compatibility
Fix backward compatibility with old BrowserWindow options
|
2015-09-09 16:25:03 +08:00 |
|
Cheng Zhao
|
c2b2a2072f
|
spec: Set node-integration in window.open should work
|
2015-09-09 16:11:45 +08:00 |
|