Commit graph

12239 commits

Author SHA1 Message Date
Andy
6324270221 fix some expression 2016-12-29 21:53:53 +08:00
Kevin Sawicki
219693d91f Merge pull request #8295 from electron/more-default-font-families
Support cursive/fantasy default font families
2016-12-28 13:42:35 -08:00
Kevin Sawicki
25c80f314b Merge pull request #8281 from abouthiroppy/fix-electron-jp-link
Fix electron-jp's link in README.md
2016-12-28 13:41:52 -08:00
Kevin Sawicki
5d505f9139 Support cursive/fantasy default font families 2016-12-28 13:40:53 -08:00
Kevin Sawicki
bc39964ece Merge pull request #8254 from electron/webcontents-will-navigate-crash
Don't load URL if web contents is destroyed
2016-12-28 13:40:31 -08:00
Kevin Sawicki
abea1196de Add spec for closing from will-navigate listener 2016-12-28 13:40:07 -08:00
Kevin Sawicki
1308f790ad Don't load URL if web contents is destroyed 2016-12-28 13:40:06 -08:00
Haojian Wu
095f304d7d Merge pull request #8284 from x-yao/zh-cn-docs
Add glossary.md in Simplified Chinese docs
2016-12-28 09:13:36 +01:00
x-yao
5a54d90d72 [ci skip]update glossary.md translation changes 2016-12-28 15:54:51 +08:00
x-yao
003fdd2382 Merge branch 'master' of github.com:electron/electron into zh-cn-docs 2016-12-28 15:47:24 +08:00
Zeke Sikelianos
5b9b33f32d Merge pull request #8285 from electron/update-glossary
📝 Fix a broken asar link.
2016-12-26 10:23:17 -08:00
x-yao
5ee3915c40 [ci skip]fixed glossary.md incorrect words 2016-12-26 17:57:20 +08:00
Haojian Wu
dcead89507 📝 Fix a broken asar link. 2016-12-26 10:28:08 +01:00
x-yao
6f2f3ed1ac Merge branch 'master' of github.com:electron/electron into zh-cn-docs 2016-12-26 12:03:00 +08:00
x-yao
738c8c047e [ci skip]add glossary.md in Simplified Chinese docs 2016-12-26 12:02:24 +08:00
abouthiroppy
d224f5d998 Fix electron-jp's link in README.md 2016-12-25 18:08:25 +09:00
Zeke Sikelianos
f8a9f628ae Merge pull request #7888 from electron/rename-webview-doc
Rename web-view to webview for consistency
2016-12-22 15:54:39 -08:00
Zeke Sikelianos
6995b51f2c set webview spec timeout to three minutes 2016-12-22 13:31:30 -08:00
Zeke Sikelianos
c989ea43f5 bump webview spec timeout to two minutes 2016-12-22 12:30:34 -08:00
Zeke Sikelianos
b0c4c79c49 remove unused webview fixture 2016-12-22 10:41:05 -08:00
Zeke Sikelianos
eb4038d626 more internal web-view reverting 2016-12-22 10:41:05 -08:00
Zeke Sikelianos
7562a8b662 revert renames of internal web-view stuff 2016-12-22 10:41:05 -08:00
Zeke Sikelianos
c75a1f08fd replace all web-view code with webview 2016-12-22 10:41:05 -08:00
Zeke Sikelianos
1085c28612 rename all web-view files to webview 2016-12-22 10:41:05 -08:00
Kevin Sawicki
eca9bffb01 Merge pull request #8269 from drewchandler/fix-clear-storage-data-docs
Use localstorage in clearStorageData docs
2016-12-22 10:07:31 -08:00
Drew Chandler
b28a865436 Use localstorage in clearStorageData docs
It won't work if you use include the space that is currently in the docs.
2016-12-22 09:51:39 -08:00
Kevin Sawicki
57d682a050 Merge pull request #8252 from electron/dialog-window-crash
Don't crash when window is closed by dialog callback
2016-12-22 09:34:07 -08:00
Kevin Sawicki
8c5f26373b Add override 2016-12-22 09:33:21 -08:00
Kevin Sawicki
87f09131aa Observe window and only use it when it is open 2016-12-22 09:33:21 -08:00
Kevin Sawicki
371b347ee9 Merge pull request #8268 from electron/update-production-variables
Move a couple env vars from development to production
2016-12-22 09:32:43 -08:00
Kevin Sawicki
ad2627b05a Move variables from development to production 2016-12-22 09:22:04 -08:00
Zeke Sikelianos
bb012c3db2 Merge pull request #8265 from thorbenegberts/patch-1
🐛 Fix link to Quick Start [ci skip]
2016-12-22 08:01:32 -08:00
x-yao
387dd67b60 [ci skip]fix chinese incorrect words 2016-12-22 17:10:27 +08:00
Thorben Egberts
b22eb0d65f Change Quick Start link from absolute to relative 2016-12-22 08:45:51 +01:00
Zeke Sikelianos
ec46d57816 Merge pull request #8267 from cesarandreu/patch-2
Fix a typo, there => their
2016-12-21 20:49:36 -08:00
Cesar Andreu
e296d4826f Fix a typo, there => their 2016-12-21 19:21:04 -08:00
Thorben Egberts
3cfe94c5ef Fixed link to Quick Start 2016-12-21 23:41:34 +01:00
Zeke Sikelianos
2b955a5ae1 Merge pull request #7878 from electron/glossary
Add a glossary of terms
2016-12-21 14:12:07 -08:00
Zeke Sikelianos
aeedd36168 see also 2016-12-21 13:47:40 -08:00
Zeke Sikelianos
e57cb713b2 link process annotations to glossary 2016-12-21 13:47:40 -08:00
Zeke Sikelianos
a098bf30d4 add DMG and NSIS to glossary 2016-12-21 13:47:40 -08:00
Zeke Sikelianos
f1692f3274 lint to glossary from docs readme 2016-12-21 13:47:40 -08:00
Zeke Sikelianos
a39dc1b78a 🎨 2016-12-21 13:47:40 -08:00
Zeke Sikelianos
ead5275d63 fix heading level 2016-12-21 13:47:40 -08:00
Zeke Sikelianos
4e8c21549b define process and webview 2016-12-21 13:47:40 -08:00
Zeke Sikelianos
ed081c8834 WIP 2016-12-21 13:47:40 -08:00
Kevin Sawicki
f99dabbac6 Merge pull request #8078 from electron/dts-docs-update-again
Update Docs
2016-12-21 13:39:53 -08:00
Kevin Sawicki
707b1d1b79 Merge pull request #8207 from philwyett-hemi/rpm_dev
Doc updates related to Fedora and RHEL / CentOS
2016-12-21 13:38:09 -08:00
Kevin Sawicki
026711e750 Merge pull request #8249 from electron/nsscreens-crash
Use firstObject instead of objectAtIndex:0
2016-12-21 10:58:14 -08:00
Kevin Sawicki
b9f569f7fb Merge pull request #8248 from electron/secure-options
Add options to protocol.registerStandardSchemes docs
2016-12-21 09:40:30 -08:00