From f71bb9349b4900b646cce3b434a19736acfdc1c7 Mon Sep 17 00:00:00 2001 From: dpen2000 Date: Tue, 6 May 2014 22:32:31 -0500 Subject: [PATCH 1/9] Update README.md Change 2010 express edition link because old one redirects to a general page about Visual Studio --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31fbd9819..764bb5266 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Atom will automatically update when a new release is available. ### Windows Requirements * Windows 7 or later - * [Visual C++ 2010 SP1 Express](http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express) + * [Visual C++ 2010 SP1 Express](http://www.visualstudio.com/en-us/downloads/download-visual-studio-vs#DownloadFamilies_4) * [node.js - 32bit](http://nodejs.org/download/) v0.10.x * [Python 2.7.x](http://www.python.org/download/) * [GitHub for Windows](http://windows.github.com/) From a7e9037e5bf5cfab02f6f91f06730e27a3e07488 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 7 May 2014 14:44:30 -0600 Subject: [PATCH 2/9] Upgrade language-go for grammar improvements in atom/language-go#18 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a26702f02..4afb2f6c1 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "language-css": "0.16.0", "language-gfm": "0.34.0", "language-git": "0.9.0", - "language-go": "0.10.0", + "language-go": "0.11.0", "language-html": "0.19.0", "language-hyperlink": "0.9.0", "language-java": "0.10.0", From 67de17e0c3ac0009865d474a03390397a8f161f3 Mon Sep 17 00:00:00 2001 From: Angel Ezquerra Date: Wed, 7 May 2014 23:56:29 +0200 Subject: [PATCH 3/9] Add mercurial directories to default list of ignored names atom already ignored git and svn directories. It makes sense to ignore mercurial (.hg) directories as well. --- src/workspace-view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index 32c2f0802..129222585 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -64,7 +64,7 @@ class WorkspaceView extends View @version: 4 @configDefaults: - ignoredNames: [".git", ".svn", ".DS_Store", "Thumbs.db"] + ignoredNames: [".git", ".hg", ".svn", ".DS_Store", "Thumbs.db"] excludeVcsIgnoredPaths: true disabledPackages: [] themes: ['atom-dark-ui', 'atom-dark-syntax'] From 9b49c2f987dfb1a564ddbe98e447bb032c95756b Mon Sep 17 00:00:00 2001 From: Lee Dohm Date: Wed, 7 May 2014 22:38:51 -0700 Subject: [PATCH 4/9] :memo: Some simple documentation fixes --- src/atom.coffee | 6 ++++-- src/editor.coffee | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/atom.coffee b/src/atom.coffee index 8eca1abe4..925e9bd3a 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -39,7 +39,7 @@ class Atom extends Model # Public: Load or create the Atom environment in the given mode. # # - mode: Pass 'editor' or 'spec' depending on the kind of environment you - # want to build. + # want to build. # # Returns an Atom instance, fully initialized @loadOrCreate: (mode) -> @@ -479,6 +479,8 @@ class Atom extends Model @getCurrentWindow().isFullScreen() # Public: Get the version of the Atom application. + # + # Returns the version text {String}. getVersion: -> @constructor.getVersion() @@ -488,7 +490,7 @@ class Atom extends Model # Public: Get the directory path to Atom's configuration area. # - # Returns the absolute path to ~/.atom + # Returns the absolute path to `~/.atom`. getConfigDirPath: -> @constructor.getConfigDirPath() diff --git a/src/editor.coffee b/src/editor.coffee index 38dfb40f1..98dbd5d5a 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -563,7 +563,7 @@ class Editor extends Model bufferRowForScreenRow: (row) -> @displayBuffer.bufferRowForScreenRow(row) - # Public: Get the syntactic scopes for the most the given position in buffer + # Public: Get the syntactic scopes for the given position in buffer # coordinates. # # For example, if called with a position inside the parameter list of an From 8f08e497a05bb254cfc2e43e53090adbc02d7fad Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 8 May 2014 19:16:47 +0200 Subject: [PATCH 5/9] Upgrade to scrollbar-style@0.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4afb2f6c1..794074ba4 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "runas": "^0.5", "scandal": "0.15.2", "scoped-property-store": "^0.9.0", - "scrollbar-style": "^0.3.0", + "scrollbar-style": "^0.4.0", "season": "^1.0.2", "semver": "1.1.4", "serializable": "^1", From ddc62efb44a69b47107d1896417c56c0d8b5b37c Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 8 May 2014 19:17:17 +0200 Subject: [PATCH 6/9] Upgrade to pathwatcher@1.2.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 794074ba4..3f7978c85 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "nslog": "0.5.0", "oniguruma": "^1.0.6", "optimist": "0.4.0", - "pathwatcher": "^1.2.3", + "pathwatcher": "^1.2.4", "property-accessors": "^1", "q": "^1.0.1", "random-words": "0.0.1", From 5246d784db050723bf6c004662c226f43270d569 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 8 May 2014 13:50:32 -0700 Subject: [PATCH 7/9] Upgrade to text-buffer@2.2.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f7978c85..a88e868af 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "serializable": "^1", "space-pen": "3.1.1", "temp": "0.5.0", - "text-buffer": "^2.2.0", + "text-buffer": "^2.2.1", "theorist": "^1", "underscore-plus": "^1.2.1", "vm-compatibility-layer": "0.1.0" From bd4e56fd08b4b226b747bcdfcf7ffcf036b78885 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 8 May 2014 14:01:30 -0700 Subject: [PATCH 8/9] Upgrade to text-buffer@2.2.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a88e868af..c5da24849 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "serializable": "^1", "space-pen": "3.1.1", "temp": "0.5.0", - "text-buffer": "^2.2.1", + "text-buffer": "^2.2.2", "theorist": "^1", "underscore-plus": "^1.2.1", "vm-compatibility-layer": "0.1.0" From 255cdbb60a9a7ebc5200b3de488f7d8f7ddb8212 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Thu, 8 May 2014 09:19:58 -0700 Subject: [PATCH 9/9] Avoid problems with version pattern ^X.Y.Z Older versions of npm don't recognize that pattern --- build/package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/package.json b/build/package.json index 04e603658..90a2f88c1 100644 --- a/build/package.json +++ b/build/package.json @@ -27,6 +27,8 @@ "json-front-matter": "~0.1.3", "legal-eagle": "~0.4.0", "minidump": "0.5.x", + "read-package-json": "1.1.8", + "normalize-package-data": "0.2.12", "rcedit": "~0.1.2", "request": "~2.27.0", "rimraf": "~2.2.2",