Commit graph

7403 commits

Author SHA1 Message Date
Cheng Zhao
12569f2c9d mac: Simulate the behavior of cmd+~ when OS X didn't handle it 2016-02-18 18:32:13 +08:00
Cheng Zhao
25156dbd53 Merge pull request #4532 from atom/no-drop-capacities
Update libchromiumcontent, fix #3666
2016-02-18 13:01:18 +08:00
Cheng Zhao
1e894df102 Update libchromiumcontent, fix #3666 2016-02-18 12:14:25 +08:00
Cheng Zhao
b13a2fe260 Merge pull request #4531 from atom/fix-win32-specs
spec: Fix failing tests on Windows
2016-02-18 12:12:32 +08:00
Cheng Zhao
651264d098 spec: Fix failing tests on Windows 2016-02-18 11:39:35 +08:00
Cheng Zhao
5f42429af1 Merge pull request #4523 from atom/spec-clean-up
Clean up specs post CoffeeScript conversion
2016-02-18 11:15:37 +08:00
Cheng Zhao
233961ea29 Merge pull request #4530 from atom/shared-ffmpeg
Link with ffmpeg dynamically
2016-02-18 11:13:57 +08:00
Kevin Sawicki
31028ab636 Update var declarations 2016-02-17 09:27:25 -08:00
Kevin Sawicki
54d7c580bd Remove unneeded returns 2016-02-17 09:08:34 -08:00
Kevin Sawicki
8a9395101e Remove unused results 2016-02-17 09:08:34 -08:00
Kevin Sawicki
12adaa0570 Remove unneeded returns 2016-02-17 09:08:34 -08:00
Kevin Sawicki
e63c3c727a Add newlines between describe/it blocks 2016-02-17 09:08:34 -08:00
Kevin Sawicki
709661156a Use const for requires 2016-02-17 09:08:34 -08:00
Cheng Zhao
3d3fc18a3a Update libchromiumcontent to use shared ffmpeg 2016-02-17 23:23:36 +08:00
Cheng Zhao
7fece7e9b3 Link with ffmpeg 2016-02-17 22:21:14 +08:00
Cheng Zhao
57f322a818 Merge pull request #4509 from caibirdme/feature-translate-into-Chinese
tanslate file-object.md
2016-02-17 19:38:57 +08:00
deenjun
28635e5f2c remove original English text 2016-02-17 14:54:57 +08:00
Cheng Zhao
723acfa1a1 Merge pull request #4510 from atom/skip-eslint
Skip eslint on our Windows build machine for now
2016-02-17 12:07:51 +08:00
Cheng Zhao
01ede11cb8 Skip eslint on our Windows build machine for now 2016-02-17 10:54:44 +08:00
Cheng Zhao
c02a49a1db Merge pull request #4507 from atom/mb-add-deprecation-handler-api
Add API for custom handling of deprecations
2016-02-17 10:51:30 +08:00
deenjun
baf44c7a41 tanslate file-object.md 2016-02-17 10:42:59 +08:00
Cheng Zhao
7810f4293f Merge pull request #4447 from KevinMartin/patch-3
Add ability to specify v8 flags in package.json
2016-02-17 10:42:29 +08:00
Kevin Jose Martin
ee0cac7d54 Remove command line switches, add v8 flags 2016-02-16 21:23:13 -05:00
Plusb Preco
407bef5727 📝 Update as upstream
[ci skip]
2016-02-17 09:37:09 +08:00
Max Brunsfeld
3e3e593366 👕 Add missing semicolons 2016-02-16 15:28:33 -08:00
Max Brunsfeld
ccef805e9b Add API for custom handling of deprecations 2016-02-16 15:21:32 -08:00
Kevin Sawicki
175449f096 Merge pull request #4503 from x87/master
fixed typo in the russian translation of README.md
2016-02-16 12:52:37 -08:00
Seemann
2346caf6fb fixed typo in the russian translation of README.md 2016-02-16 23:19:20 +03:00
Kevin Sawicki
73518cdc8d Merge pull request #4501 from dmnlk/feature/add_community_jp
add Japanese Elecron Community
2016-02-16 10:45:30 -08:00
dmnlk
959c08a1ec add Japanese Electron Community 2016-02-17 02:28:10 +09:00
Cheng Zhao
0ba86b9716 docs: Make variable names follow previous example 2016-02-16 23:10:05 +08:00
Cheng Zhao
18e7825ff3 Merge pull request #4498 from destan/patch-2
add a new platform definition for linux
2016-02-16 23:08:34 +08:00
Destan Sarpkaya
afacca252e add a new platform definition for linux
On Linux in order for changes made to individual `MenuItem`s to take effect, you have to call `setContextMenu` again

Regarding https://github.com/atom/electron/issues/1473
2016-02-16 16:24:05 +02:00
Cheng Zhao
61a9316f67 Merge pull request #4496 from cesine/update/deps
fix dependencies badge  which shows out of date
2016-02-16 22:18:51 +08:00
Cheng Zhao
e47a815c38 Merge pull request #4482 from lukeapage/patch-7
spelling fixes and americanisms
2016-02-16 20:22:31 +08:00
Cheng Zhao
25ac6f0f37 Merge pull request #4480 from apoco/single-instance-clarification
makeSingleInstance clarification
2016-02-16 20:17:18 +08:00
Cheng Zhao
5b4f29e7ed Merge pull request #4471 from rsezille/master
Docs: Start french translation
2016-02-16 16:22:55 +08:00
Cheng Zhao
aaca93046c spec: Give beginFrameSubscription test more time to run 2016-02-16 16:20:15 +08:00
Cheng Zhao
bce11c8913 Merge commit 'd76f6fe' 2016-02-16 16:15:59 +08:00
Cheng Zhao
44260634af Merge pull request #4364 from atom/launch-url-or-file-directly-from-cli
Launch URL or HTML file directly
2016-02-16 16:13:10 +08:00
Cheng Zhao
7ca09de386 Merge remote-tracking branch 'origin/dont-write-empty-dev-tools-extensions-file' 2016-02-16 12:30:42 +08:00
Cheng Zhao
55642d257d Merge pull request #4494 from pra85/patch-3
docs: fix a minor typo
2016-02-16 12:28:08 +08:00
Plusb Preco
81ffde3c2a 📝 Update as upstream
[ci skip]
2016-02-16 12:20:21 +08:00
Cheng Zhao
95d8716ffa Merge pull request #4497 from atom/docs-revise
Improve the IPC related docs
2016-02-16 12:20:00 +08:00
Cheng Zhao
fded8d80b1 docs: Remove unnecessary "properties: " suffix 2016-02-16 12:11:05 +08:00
Cheng Zhao
2b406ccaf7 Optional => optional 2016-02-16 11:54:41 +08:00
Cheng Zhao
f58bab70c5 docs: Improve the docs on sharing data 2016-02-16 11:52:47 +08:00
Cheng Zhao
b8e8e4c930 docs: Cleanup the IPC docs 2016-02-16 11:34:39 +08:00
cesine
2aff0c47d0 ⬆️ 👕 updated to eslint 2.1.0
Verified migration doc (nothing to be done)
http://eslint.org/docs/user-guide/migrating-to-2.0.0

And made sure the eslint tasks passed
2016-02-15 22:30:29 -05:00
Cheng Zhao
63578f9d2b Merge pull request #4392 from madarche/doc-howto-share-objects
Document different techniques to share objects
2016-02-16 11:18:20 +08:00