From 725f6f7cf2e7b0eadeca60f1e7f03e1e8e245cff Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Wed, 23 Apr 2014 15:34:29 -0700 Subject: [PATCH 1/8] Use MIT license --- LICENSE | 21 ++++++++++++++++++++- package.json | 7 ++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 796e16c2a..493db50ed 100644 --- a/LICENSE +++ b/LICENSE @@ -1 +1,20 @@ -Copyright 2014 GitHub, Inc. +Copyright (c) 2013 GitHub Inc. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/package.json b/package.json index 23add34e6..8814dd72e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,12 @@ "bugs": { "url": "https://github.com/atom/atom/issues" }, - "license": "All Rights Reserved", + "licenses": [ + { + "type": "MIT", + "url": "http://github.com/atom/atom/raw/master/LICENSE.md" + } + ], "atomShellVersion": "0.11.10", "dependencies": { "async": "0.2.6", From d89b4534f16c59af38804df3ca1f366130524e20 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Wed, 23 Apr 2014 15:35:33 -0700 Subject: [PATCH 2/8] Update the year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 493db50ed..4d231b456 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013 GitHub Inc. +Copyright (c) 2014 GitHub Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the From 832cc40a7f935788a595d2d2a656cea5d9c56b63 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Wed, 23 Apr 2014 15:36:57 -0700 Subject: [PATCH 3/8] Add .md extension --- LICENSE => LICENSE.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE => LICENSE.md (100%) diff --git a/LICENSE b/LICENSE.md similarity index 100% rename from LICENSE rename to LICENSE.md From 0a8f2422d3fa459f76bdf5450a6cf4a3dbcd6f1c Mon Sep 17 00:00:00 2001 From: probablycorey Date: Thu, 24 Apr 2014 17:37:24 -0700 Subject: [PATCH 4/8] Use public grunt-download-atom-shell --- build/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package.json b/build/package.json index 346024d2b..d684968b9 100644 --- a/build/package.json +++ b/build/package.json @@ -18,7 +18,7 @@ "grunt-contrib-coffee": "~0.9.0", "grunt-contrib-less": "~0.8.0", "grunt-cson": "0.8.0", - "grunt-download-atom-shell": "git+https://atom-bot:467bac80a0017b96fb5be5cfc686f5e0cc607b10@github.com/atom/grunt-download-atom-shell#v0.6.1", + "grunt-download-atom-shell": "^0.6.1", "grunt-lesslint": "0.13.0", "grunt-markdown": "~0.4.0", "grunt-peg": "~1.1.0", From 3d2dedb49fdb319f3711f1e2574657f4ad6511a5 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Mon, 28 Apr 2014 14:42:31 -0700 Subject: [PATCH 5/8] Update the readme --- README.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 484ca7386..c1bf36e80 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,12 @@ -# Atom — The hackable editor +# Atom — A hackable text editor for the 21st Century ![Atom](http://i.imgur.com/OrTvUAD.png) -Check out our [guides and API documentation](https://atom.io/docs/latest). +Atom is an open source text editor built on top of +[atom-shell](http://github.com/atom/atom-shell). It's designed to be +customizable, but also usable without needing to edit a config file. Atom is +modern, approachable, and hackable to the core. Visit [atom.io](http://atom.io) +to learn more. ## Installing @@ -12,6 +16,11 @@ Atom will automatically update when a new release is available. ## Building -Follow the instructions in the [build docs][building]. +``` +git clone git@github.com:atom/atom.git +cd atom +script/build # Creates application at /Applications/Atom.app +``` -[building]: https://github.com/atom/atom/blob/master/docs/building-atom.md +## Developing +Check out the [guides](https://atom.io/docs/latest) and the [API reference](atom.io/docs/api). From 7d3abda86fe702e5aee013a60cce8539ba9d7f35 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Wed, 30 Apr 2014 16:38:44 -0700 Subject: [PATCH 6/8] Fix Workspace::openLicense --- src/workspace.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/workspace.coffee b/src/workspace.coffee index 6f5975e1e..b662143c4 100644 --- a/src/workspace.coffee +++ b/src/workspace.coffee @@ -114,7 +114,7 @@ class Workspace extends Model # Public: Open Atom's license in the active pane. openLicense: -> - @open(join(atom.getLoadSettings().resourcePath, 'LICENSE')) + @open(join(atom.getLoadSettings().resourcePath, 'LICENSE.md')) # Synchronously open the given URI in the active pane. **Only use this method # in specs. Calling this in production code will block the UI thread and From e5197f6f0f27082e52c9ebd90168900f25392fc9 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 5 May 2014 11:06:36 -0700 Subject: [PATCH 7/8] Fench code block as sh --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c1bf36e80..a12f55bd1 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Atom will automatically update when a new release is available. ## Building -``` +```sh git clone git@github.com:atom/atom.git cd atom script/build # Creates application at /Applications/Atom.app From f4d9abc789447bb7563af3e478919c4d03d10eed Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 5 May 2014 11:07:43 -0700 Subject: [PATCH 8/8] Use ~ instead of ^ to support older npm versions --- build/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package.json b/build/package.json index d684968b9..5cfdb1b63 100644 --- a/build/package.json +++ b/build/package.json @@ -18,7 +18,7 @@ "grunt-contrib-coffee": "~0.9.0", "grunt-contrib-less": "~0.8.0", "grunt-cson": "0.8.0", - "grunt-download-atom-shell": "^0.6.1", + "grunt-download-atom-shell": "~0.6.1", "grunt-lesslint": "0.13.0", "grunt-markdown": "~0.4.0", "grunt-peg": "~1.1.0",