Commit Graph

26724 Commits

Author SHA1 Message Date
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
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
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
Dirk Thomas
fbbcdbf518 order keys in config.cson alphabetically 2015-12-07 09:54:18 -08:00
Max Brunsfeld
80fdfb9280 ⬆️ find-and-replace 2015-12-07 09:34:34 -08:00
Dirk Thomas
6e2061c076 add spec for ordered config.cson 2015-12-06 17:15:13 -08:00
Antonio Scandurra
0896142ea2 Merge pull request #9831 from atom/as-user-keybindings-priority
Do not override user-defined keymaps when reloading packages
2015-12-04 21:34:20 +01:00
Max Brunsfeld
96e0deb3c2 ⬆️ github-releases 2015-12-04 09:47:05 -08:00
Antonio Scandurra
7c657b08cc ⬆️ atom-keymap 2015-12-04 18:42:43 +01:00
Kevin Sawicki
7f9da428b0 Merge pull request #9609 from DouweM/recent-documents
Add opened files and folders to recent documents menu
2015-12-04 09:18:17 -08:00
Antonio Scandurra
1c5c973823 Merge branch 'master' into as-user-keybindings-priority
# Conflicts:
#	spec/package-manager-spec.coffee
2015-12-04 16:18:56 +01:00
Kevin Sawicki
d377e725e0 ⬆️ language-gfm@0.82 2015-12-03 16:36:37 -08:00
Kevin Sawicki
5c6375d9de ⬆️ language-sql@0.20 2015-12-03 16:34:10 -08:00
Kevin Sawicki
1fac3cb4e2 Merge pull request #9620 from DouweM/window-title
Use em-dash in window title and exclude app name on OS X
2015-12-03 16:23:43 -08:00
Kevin Sawicki
65464225e8 ⬆️ language-perl@0.32 2015-12-03 16:17:46 -08:00
Kevin Sawicki
834115bb07 ⬆️ language-yaml@0.25 2015-12-03 16:11:22 -08:00
Kevin Sawicki
b43036c323 ⬆️ language-git@0.11 2015-12-03 16:10:56 -08:00
Kevin Sawicki
a90fa150e5 ⬆️ language-toml@0.18 2015-12-03 16:10:56 -08:00
Ben Ogle
e58ea27e91 ⬆️ find-and-replace@0.192.0 2015-12-03 15:52:13 -08:00
Kevin Sawicki
5f2991d4ca Merge pull request #9670 from atom/wl-shortcut-flag
Don't create a desktop shortcut when building
2015-12-03 15:35:57 -08:00
Kevin Sawicki
4fc88264e3 ⬆️ language-hyperlink@0.16 2015-12-03 15:34:24 -08:00
Wliu
2b694bb4b1 Merge pull request #9921 from atom/wl-update-for-js-scope-changes
Update specs for language-javascript changes
2015-12-03 17:26:17 -05:00
Kevin Sawicki
7394c1abe0 Merge pull request #9730 from zeke/covenant
bump Contributor Covenant version to 1.3
2015-12-03 14:20:17 -08:00
Max Brunsfeld
5ebb279008 Merge pull request #9937 from atom/mb-fix-crlf-movement-errors
Fix movement commands in the presence of CRLF line endings
2015-12-03 14:15:01 -08:00
Max Brunsfeld
33ea4f55f5 ⬆️ autocomplete-plus 2015-12-03 13:46:44 -08:00
Max Brunsfeld
fe5b1b70e8 Fix paragraph motions in the presence of CRLF line endings 2015-12-03 12:07:15 -08:00
Max Brunsfeld
76b6ca5043 Make CRLF word-movement tests pass 2015-12-03 11:52:45 -08:00
Max Brunsfeld
71d2761c1a Merge pull request #9763 from dranzerashi/patch-1 2015-12-03 10:30:48 -08:00
Zeke Sikelianos
d81e2a23b9 remove links to Contributor Covenant CoC 2015-12-03 10:08:03 -06:00
Wliu
c6cca659ab ⬆️ language-clojure@0.19.0 2015-12-03 10:33:14 -05:00
Zeke Sikelianos
e047741ff3 link to CoC from README and CONTRIBUTING docs [ci skip] 2015-12-02 23:36:29 -06:00
Wliu
26929810a0 ⬆️ language-html@0.43.1 2015-12-02 22:10:55 -05:00
Wliu
d85af0d3f4 💚 again 2015-12-02 21:39:12 -05:00
Wliu
ecd14f3390 💚 let and var are now storage.type.var.js
Refs atom/language-javascript#277
2015-12-02 20:47:27 -05:00
Wliu
837b003e00 ⬆️ language-javascript@0.104.0 2015-12-02 20:47:06 -05:00
Wliu
2bec69fcc2 ⬆️ language-yaml@0.24.1 2015-12-02 18:26:20 -05:00