Commit Graph

26784 Commits

Author SHA1 Message Date
Wliu
d6fa46acce Update browser files to use require 'electron' 2015-12-12 13:22:22 -05:00
Wliu
678c390e2e Fix indentation 2015-12-10 22:52:06 -05:00
Cheng Zhao
2e5c7f8573 executeJavaScriptInDevTools is deprecated 2015-12-11 11:00:08 +08:00
Cheng Zhao
2150790596 Use the new style of remote 2015-12-11 10:21:46 +08:00
Cheng Zhao
c186d70bec Also use require('electron') in specs 2015-12-11 10:03:20 +08:00
Cheng Zhao
1f9cfc929c Update the API usages after merge 2015-12-11 09:50:18 +08:00
Cheng Zhao
d7e6b6399f ⬆️ electron@0.35.4 2015-12-11 09:33:53 +08:00
Cheng Zhao
f6e889aeb2 Merge branch 'master' into wl-electron-35 2015-12-11 09:32:32 +08:00
Cheng Zhao
1725b9bf54 Use require('electron') 2015-12-11 09:30:58 +08:00
Nathan Sobo
26163f2195 Merge pull request #9947 from atom/ns-mb-refactor-text-measurement
Don’t force DOM updates in LinesYardstick
2015-12-10 15:18:10 -07:00
Nathan Sobo
85c6139579 Don’t force DOM updates in LinesYardstick
Instead, determine the need for a DOM update in the component before
measuring with the lines yardstick, and break `updateSync` into two
explicit pre- and post-measurement phases.
2015-12-10 14:47:05 -07:00
simurai
50dc9b6bb4 ⬆️ one-dark/light-ui@v1.1.9 2015-12-11 06:17:15 +09:00
Wliu
8883b8bbdc Merge pull request #10001 from svanharmelen/language-go@0.41.0
⬆️ language-go@0.41.0
2015-12-10 08:57:22 -05:00
Sander van Harmelen
255864fc9d ⬆️ language-go@0.41.0 2015-12-10 13:52:10 +01:00
Max Brunsfeld
f3e257cad8 1.5.0-dev 2015-12-09 14:18:27 -08:00
Max Brunsfeld
77a5409623 Merge branch 'beta' 2015-12-09 12:51:52 -08:00
Max Brunsfeld
0f485cc98e Merge branch 'stable' into beta
Conflicts:
	package.json
2015-12-09 12:51:27 -08:00
Antonio Scandurra
d7f1f7bb62 📝 Mention the fix for untitled editors [ci skip] 2015-12-09 12:05:13 +01:00
Antonio Scandurra
ae90db0aa0 Merge pull request #9968 from atom/as-deserialize-untitled-editors
Deserialize untitled editors
2015-12-09 12:00:40 +01:00
Antonio Scandurra
769b7bcd89 Merge branch 'master' into as-deserialize-untitled-editors
# Conflicts:
#	package.json
2015-12-09 08:48:04 +01:00
Antonio Scandurra
38b72dc156 📝 Mention reloading keymaps fix 2015-12-09 08:41:34 +01:00
Antonio Scandurra
f709c43159 Reorder changelog 2015-12-09 08:40:06 +01:00
Antonio Scandurra
02b2f06ae1 Update CHANGELOG.md 2015-12-09 08:38:35 +01:00
Antonio Scandurra
9dd61ca7e6 📝 Mention switching encoding speedup 2015-12-09 08:37:54 +01:00
Antonio Scandurra
b3b8b8d563 ⬆️ text-buffer 2015-12-09 08:31:31 +01:00
Wliu
80faae4add ⬆️ language-c@0.51.1 2015-12-08 22:30:28 -05:00
Nathan Sobo
afb64e2650 Merge branch 'beta' 2015-12-08 16:11:11 -07:00
Nathan Sobo
efe33d69fd Back to 1.3.0-beta7 because it wasn't published v1.3.0-beta7 2015-12-08 16:10:06 -07:00
Max Brunsfeld
ddf70f1fd4 Merge branch 'beta' 2015-12-08 14:42:26 -08:00
Max Brunsfeld
bef0e5c994 Set mac version properly on beta 2015-12-08 14:39:14 -08:00
simurai
14a440e0f1 ⬆️ one-dark/light-ui@v1.1.8 2015-12-08 13:57:33 -08:00
Nathan Sobo
cd9bf67d98 Fix bad merge. Oops. 2015-12-08 14:32:32 -07:00
Nathan Sobo
7798ac1b77 Merge branch 'beta' 2015-12-08 14:28:06 -07:00
Nathan Sobo
3567d47790 Merge pull request #9878 from atom/ns-mb-fix-prepare-stack-trace-recursion
Avoid infinite recursion in Error.prepareStackTrace
2015-12-08 14:22:07 -07:00
Nathan Sobo
7718d5cb56 Merge pull request #9773 from atom/mb-ns-prepare-stack-trace-fixes
Allow Error.prepareStackTrace to be temporarily reassigned
2015-12-08 14:21:47 -07:00
Nathan Sobo
9bd22d35b4 Merge branch 'beta' 2015-12-08 14:13:37 -07:00
Nathan Sobo
54169b53a8 1.3.0-beta8 2015-12-08 14:11:39 -07:00
Nathan Sobo
916da68ee5 ⬆️ find-and-replace for layer service 2015-12-08 14:11:14 -07:00
Max Brunsfeld
8850ce388a Merge pull request #9975 from atom/mb-fix-package-json-config-schema-handling
Fix some issues with config schemas in packages' package.json files
2015-12-08 12:33:35 -08:00
Max Brunsfeld
d835ac0ac8 Add spec for re-registering schema after unloading package 2015-12-08 11:27:20 -08:00
Max Brunsfeld
314a1234f4 Track which packages are in the process of activating
This fixes a race condition where a package's activation promise resolves asynchronously
after it has been deactivated, causing it to stay in the package manager's @activePackages
object.
2015-12-08 11:09:52 -08:00
Wliu
82c27e896e ⬆️ language-xml@0.34.2 2015-12-08 09:35:14 -05:00
Sander van Harmelen
665e855911 ⬆️ language-go@0.40.0 2015-12-07 20:32:21 -05:00
Max Brunsfeld
03a2846eb5 Remove redundant unloadPackage call in spec 2015-12-07 17:24:34 -08:00
Max Brunsfeld
05e10bfaeb Register config schemas from package.json in theme packages 2015-12-07 16:52:33 -08:00
Max Brunsfeld
ec759f1322 Clear out loaded packages in PackageManager.prototype.reset
This way, when the AtomEnvironment is reset, packages will have .load() called
on them again, so their config schemas will be registered again.
2015-12-07 16:49:57 -08:00
Nathan Sobo
cacd7fceed Merge pull request #9972 from atom/ns-increase-stack-trace-limit
Increase stack trace size limit to 30
2015-12-07 15:52:17 -07:00
Nathan Sobo
4f9e1a8ca3 Increase stack trace size limit to 30 2015-12-07 14:25:11 -07:00
Antonio Scandurra
1f955f0aab 🔥 💚 Remove outdated spec
This made the build fail because we were checking that a TextEditor couldn't
have been serialized when the path didn't exist. This is exactly the opposite we
want to do for restoring untitled editors, therefore I think it's safe to delete
this test.

/cc: @nathansobo for extra 👀
2015-12-07 22:03:28 +01:00
Max Brunsfeld
5825fb51b5 Merge pull request #9948 from dirk-thomas/order_config_cson
save config.cson in alphabetic order
2015-12-07 11:19:56 -08:00