From 84d1515f84d7ae92e0b164b2822321591b03d9ed Mon Sep 17 00:00:00 2001 From: Adam Fortuna Date: Wed, 2 Nov 2016 12:28:53 -0400 Subject: [PATCH 1/7] Create LICENSE.txt --- LICENSE.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 000000000..c1faa3a1f --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,7 @@ +Copyright (c) 2016 Code School + +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. From ff77f689b8e3cc994696e9d5e0ba32b582bc2d08 Mon Sep 17 00:00:00 2001 From: Adam Fortuna Date: Wed, 2 Nov 2016 12:30:33 -0400 Subject: [PATCH 2/7] Update LICENSE.txt --- LICENSE.txt | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index c1faa3a1f..94075e99a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,7 +1,21 @@ +MIT License + Copyright (c) 2016 Code School -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: +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 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. +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. From b6e3af9955786543d2fab07ae415d8085cdbb31e Mon Sep 17 00:00:00 2001 From: Adam Fortuna Date: Thu, 8 Dec 2016 09:36:51 -0500 Subject: [PATCH 3/7] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 66e3bebe0..4d2c4c6d9 100755 --- a/README.md +++ b/README.md @@ -88,4 +88,6 @@ This will make your `index.html` file available at the URL: `http://.github.io/HelloCodeSchoolProject/` -For instance, our `answer` branch is available at the url [http://codeschool.github.io/HelloCodeSchoolProject/](http://codeschool.github.io/HelloCodeSchoolProject/). +# Another Answer + +If you want to checkout one other possible solution to this problem and compare your work, you can checkout the `solution` branch. From 3ab48d7b1ea110e0d8158109989dadedc335d121 Mon Sep 17 00:00:00 2001 From: Adam Fortuna Date: Thu, 8 Dec 2016 09:40:13 -0500 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d2c4c6d9..3fe1e4897 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you know these, you should be all set to jump in and give this project a shot # Setup -In order to get this working, you'll need to have [Git](https://git-scm.com/) installed, and have a GitHub account. If this is your first time setting up Git, I'd recommend checking out Code School's video on [How to Setup Git for Code School Projects in 5 Minutes](#) to learn what you need to know. +In order to get this working, you'll need to have [Git](https://git-scm.com/) installed, and have a GitHub account. If this is your first time setting up Git, I'd recommend checking out Code School's video on How to Setup Git for Code School Projects in 5 Minutes to learn what you need to know. To get started, fork this repository to your account and clone it down locally. If you want, you can also try doing this completely from GitHub! From 7b7f648ce798fcc33a3346d1a2c0f19472a03cb6 Mon Sep 17 00:00:00 2001 From: "Mr. Ivan" Date: Thu, 8 Dec 2016 10:19:46 -0600 Subject: [PATCH 5/7] Change assertion message for task 1 - On the codeschool website it asks students to add their name to the title element --- test/index_test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/index_test.js b/test/index_test.js index 071f5c40a..e381a3f4f 100755 --- a/test/index_test.js +++ b/test/index_test.js @@ -21,7 +21,7 @@ describe('Your HTML Page', function() { assert.equal(window.$('title').length, 1, 'Make sure to create a `title` element.'); }); - it('should have a title with the text "Code School" @title', function() { + it('should have a title that contains your name @title', function() { assert.notEqual(window.$('title').text(), '', 'Make sure to set the content of the `title` element to your Code School username.'); }); From 85aacdf63da45f29058e16cce9df5ed22a4e10cf Mon Sep 17 00:00:00 2001 From: Eric J Fisher Date: Fri, 9 Dec 2016 15:43:01 -0500 Subject: [PATCH 6/7] Corrected Project URL in Readme.md The project urls were missing the `-` in `code-school` causing them to 404, these urls have been corrected. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3fe1e4897..413301dd2 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This is a sample project to test out how projects work at Code School. For this # Getting Started -To get started with this project, head over to the [Hello Code School](https://www.codeschool.com/projects/hello-codeschool) project on Code School, and begin! It'll walk you through all of the steps below. They're included here in the readme in case you work better locally, or want to try working on this project offline. +To get started with this project, head over to the [Hello Code School](https://www.codeschool.com/projects/hello-code-school) project on Code School, and begin! It'll walk you through all of the steps below. They're included here in the readme in case you work better locally, or want to try working on this project offline. # Prerequisites @@ -43,7 +43,7 @@ In these `li` elements, list out what you want to learn. # Checking Your Work -Once you've completed all of the tasks, go ahead and commit those to your fork of this repository and push it up to GitHub. Follow the directions on [Hello Code School](https://www.codeschool.com/projects/hello-codeschool) to submit your project and get feedback from Code School. +Once you've completed all of the tasks, go ahead and commit those to your fork of this repository and push it up to GitHub. Follow the directions on [Hello Code School](https://www.codeschool.com/projects/hello-code-school) to submit your project and get feedback from Code School. ## Running Tests Locally From e333ace93a40cf7eddce101f8ec57687191d5152 Mon Sep 17 00:00:00 2001 From: Varun GN Date: Wed, 3 Jan 2018 16:45:03 +0530 Subject: [PATCH 7/7] Update index.html Edited my index.html as per the instructions provided --- index.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 4f7f0189f..c1b75b3e0 100755 --- a/index.html +++ b/index.html @@ -4,8 +4,13 @@ + varungn - - +

Hello, Code School!

+
    +
  • JS
    • +
  • BlockChain
    • +
+