From 72e08d5b9a7661dd99bff79cbf580d159591db5a Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Thu, 28 Jan 2016 13:07:58 -0500 Subject: [PATCH 01/15] Revise focus of CONTRIBUTING, README Introduce the repo in README, and point people to guidelines more quickly in CONTRIBUTING, since that is linked to from the pages for new issues and new pull requests --- CONTRIBUTING.md | 27 +++++++-------------------- README.md | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cee92531a..9979a70e2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,12 @@ -### Where am I? ### -Physically? No idea. +## I wanna contribute! +Sweet! The transition from existing to new codebase is an ongoing process, and we love to have people in the Scratch and Open Source communities help us along the way, and even afterwards as we develop new features for Scratch here. -Digitally? You’re at Scratch’s open source Web Client! +Here are some ways you can contribute: +* [Report bugs](https://github.com/LLK/scratch-www/wiki/Reporting-Bugs) +* [Work on bugs and make pull requests](https://github.com/LLK/scratch-www/wiki/Workflow-for-Repo-Contributions) + * Make sure to check out how to [assign yourself bugs](https://github.com/LLK/scratch-www/wiki/Assigning-Yourself-Bugs) too. -At Scratch, we’re working to update our UI to use a new codebase, which will be contained in this repository. The transition from existing to new codebase is an ongoing process, and we love to have people in the Scratch and Open Source communities help us along the way, and even afterwards as we develop new features for Scratch here. - - -### Who and what will I find here? ### -We are always excited to have people join us in working to make Scratch a wonderful place for people of all ages to make projects together. If you’re new here, and looking to jump into our wonderful community, we have some wonderful resources for you to take a look at: +We are always excited to have people join us in working to make Scratch a wonderful place for people of all ages to make projects together. If you’re new here, and looking to jump into our wonderful community, we have some resources for you to take a look at: * [README](https://github.com/LLK/scratch-www/blob/develop/README.md) (if you’re to read only one me in this repo, make it this one – it has all of the necessary information for getting a local Scratch UI running on your machine!) * [Community Guidelines](https://github.com/LLK/scratch-www/wiki/Community-Guidelines) (we find it important to maintain a constructive and welcoming community, just like on Scratch) @@ -21,15 +20,3 @@ Beyond this repo, there are also some other resources that you might want to tak [Advanced Topics forum](https://scratch.mit.edu/discuss/31/) on Scratch (like Topics, but more complex-y) -### I wanna contribute! ### -Sweet! Here are some ways you can contribute: -* [Report bugs](https://github.com/LLK/scratch-www/wiki/Reporting-Bugs) -* [Work on bugs](https://github.com/LLK/scratch-www/wiki/Workflow-for-Repo-Contributions) - * Make sure to check out how to [assign yourself bugs](https://github.com/LLK/scratch-www/wiki/Assigning-Yourself-Bugs) too. - - -We’re currently building Scratch using [React](https://facebook.github.io/react/) and [SCSS](http://sass-lang.com/documentation/file.SASS_REFERENCE.html). Here are some resources to help you get acquainted with how we’re working on the Scratch codebase: -* [Style Guide](https://github.com/LLK/scratch-www/wiki/Style-Guide) -* [Testing Guide](https://github.com/LLK/scratch-www/wiki/Testing-Guide) -* [Localization Guide](https://github.com/LLK/scratch-www/wiki/Localization-Guide) -* [Map of the repository](https://github.com/LLK/scratch-www/wiki/Repo-Map) diff --git a/README.md b/README.md index f7e16a814..3f970b71e 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,21 @@ [![Build Status](https://magnum.travis-ci.com/LLK/scratch-www.svg?token=xzzHj4ct3SyBTpeqxnx1)](https://magnum.travis-ci.com/LLK/scratch-www) +### Where am I? +Physically? No idea. + +Digitally? You’re at Scratch’s open source web client! + +We’re working to update the [Scratch website](https://scratch.mit.edu) to use a new codebase, contained in this repository. + +We’re currently building Scratch using [React](https://facebook.github.io/react/) and [SCSS](http://sass-lang.com/documentation/file.SASS_REFERENCE.html). Here are some resources to help you get acquainted with how we’re working on the Scratch codebase: + +* [Style Guide](https://github.com/LLK/scratch-www/wiki/Style-Guide) +* [Testing Guide](https://github.com/LLK/scratch-www/wiki/Testing-Guide) +* [Localization Guide](https://github.com/LLK/scratch-www/wiki/Localization-Guide) +* [Map of the repository](https://github.com/LLK/scratch-www/wiki/Repo-Map) + + ### Before Getting Started * make sure you have node and npm [installed](https://docs.npmjs.com/getting-started/installing-node) From c76533bf3847e37b792bf0152a986de03235a644 Mon Sep 17 00:00:00 2001 From: Andrew Sliwinski Date: Sun, 31 Jan 2016 13:07:21 -0500 Subject: [PATCH 02/15] Update license and add trademark notice --- LICENSE | 12 ++++++++++++ LICENSE.md | 13 ------------- TRADEMARK | 7 +++++++ package.json | 4 ++-- 4 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 LICENSE delete mode 100644 LICENSE.md create mode 100644 TRADEMARK diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..c9e7aa927 --- /dev/null +++ b/LICENSE @@ -0,0 +1,12 @@ +Copyright (c) 2015, Massachusetts Institute of Technology +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 8578cae57..000000000 --- a/LICENSE.md +++ /dev/null @@ -1,13 +0,0 @@ -Copyright 2015 Massachusetts Institute of Technology - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file diff --git a/TRADEMARK b/TRADEMARK new file mode 100644 index 000000000..3e1ec5bf4 --- /dev/null +++ b/TRADEMARK @@ -0,0 +1,7 @@ +The Scratch trademarks, including the Scratch name, logo, the Scratch Cat, Gobo, Pico, Nano, Tera and Giga graphics (the "Marks"), are property of the Massachusetts Institute of Technology (MIT), and the use of the Marks is governed by this policy. + +You may use the Marks to refer to Scratch in Substantially Unmodified form. + +"Substantially Unmodified" means the source code provided by MIT, possibly with minor modifications including but not limited to: bug fixes (including security), changing the locations of files for better integration with the host operating system, adding documentation, and changes to the dynamic linking of libraries. + +A version is not "Substantially Unmodified" if it incorporates features not present in a release of Scratch by MIT. If you do make a substantial modification, to avoid confusion with versions of Scratch produced by MIT you must remove all Marks from your version of the software and refrain from using any of the Marks to refer to your version. diff --git a/package.json b/package.json index 5ca221023..d6b832f86 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "type": "git", "url": "git+ssh://git@github.com/llk/scratch-www.git" }, - "author": "MIT", - "license": "MIT", + "author": "Massachusetts Institute of Technology", + "license": "BSD-3-Clause", "bugs": { "url": "https://github.com/llk/scratch-www/issues" }, From e1b9cf571635af94a7cbb954e59478f105bccc82 Mon Sep 17 00:00:00 2001 From: Technoboy10 Date: Wed, 3 Feb 2016 08:36:05 -0700 Subject: [PATCH 03/15] Removed Megan Haddadi, added Linda and Lily --- src/views/credits/credits.jsx | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index 4b4b5bacd..91ece15fe 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -157,11 +157,6 @@ var Credits = React.createClass({ Dalton Miner -
  • - Megan Avatar - Megan Haddadi -
    • -
  • Christina Avatar Christina Huang @@ -171,6 +166,16 @@ var Credits = React.createClass({ Annie Avatar Annie Whitehouse
    • + +
  • + Linda Avatar + Linda Fernsel +
    • + +
  • + Lily Avatar + Lily Kim +

    • Previous MIT Scratch Team Members

    @@ -180,7 +185,7 @@ var Credits = React.createClass({ Andrés Monroy-Hernández (who led the development of the first Scratch community website), Amos Blanton, Champika Fernando, Shane Clements, Abdulrahman idlbi, Evelyn Eastmond, Amon Millner, Eric Rosenbaum, Jay Silver, Karen Brennan, Leo Burd, Oren Zuckerman, Gaia Carini, - Michelle Chung, Margarita Dekoli, Dave Feinberg, Chris Graves, Tony Hwang, Di Liu, Tammy Stern, + Michelle Chung, Margarita Dekoli, Dave Feinberg, Megan Haddadi, Chris Graves, Tony Hwang, Di Liu, Tammy Stern, Lis Sylvan, and Claudia Urrea.

    From 2a6f30cdb7143b2ee3e8b90ab07ccc3e59f08105 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 5 Feb 2016 07:59:09 -0500 Subject: [PATCH 04/15] word-wrap for p elements Should fix #354, I'll test on a local machine. --- src/views/credits/credits.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/credits/credits.scss b/src/views/credits/credits.scss index 7ce371d02..7cd1d0655 100644 --- a/src/views/credits/credits.scss +++ b/src/views/credits/credits.scss @@ -3,6 +3,7 @@ #view { p { line-height: 1.5rem; + word-wrap: break-word; } ul { From 3939dde44e82dfb15e07ebf1b42f61041751d548 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Mon, 8 Feb 2016 08:10:41 -0500 Subject: [PATCH 05/15] Update credits.scss --- src/views/credits/credits.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/credits/credits.scss b/src/views/credits/credits.scss index 7cd1d0655..b560f4971 100644 --- a/src/views/credits/credits.scss +++ b/src/views/credits/credits.scss @@ -3,9 +3,12 @@ #view { p { line-height: 1.5rem; - word-wrap: break-word; } + a { + word-wrap: break-word; /* Overrides: https://github.com/LLK/scratch-www/blob/develop/src/main.scss#L43-L47 */ + } + ul { display: flex; margin: 0; From f99472afe1aa43500c28213b07fc5eab6c34e407 Mon Sep 17 00:00:00 2001 From: Technoboy10 Date: Mon, 8 Feb 2016 10:08:32 -0700 Subject: [PATCH 06/15] fixed horizontal scrollbar --- src/main.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.scss b/src/main.scss index 768545b5c..edba5c192 100644 --- a/src/main.scss +++ b/src/main.scss @@ -10,6 +10,7 @@ body { padding: 0; color: $type-gray; font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif; + overflow-x: hidden; } /* Typography */ From 91f3de0682ce681a0623b9198679fd8ec819a5b9 Mon Sep 17 00:00:00 2001 From: The_Grits Date: Mon, 8 Feb 2016 14:50:56 -0500 Subject: [PATCH 07/15] link formatting in paragraphs --- src/views/credits/credits.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/credits/credits.scss b/src/views/credits/credits.scss index b560f4971..11dc0ded7 100644 --- a/src/views/credits/credits.scss +++ b/src/views/credits/credits.scss @@ -3,10 +3,9 @@ #view { p { line-height: 1.5rem; - } - - a { - word-wrap: break-word; /* Overrides: https://github.com/LLK/scratch-www/blob/develop/src/main.scss#L43-L47 */ + a { + word-wrap: break-word; /* Overrides: https://github.com/LLK/scratch-www/blob/develop/src/main.scss#L43-L47 */ + } } ul { From 26669755082751644aab46c5a55d79c5dddfdf8f Mon Sep 17 00:00:00 2001 From: Technoboy10 Date: Tue, 9 Feb 2016 08:14:59 -0700 Subject: [PATCH 08/15] removed padding --- src/main.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main.scss b/src/main.scss index edba5c192..5769126a7 100644 --- a/src/main.scss +++ b/src/main.scss @@ -10,7 +10,6 @@ body { padding: 0; color: $type-gray; font-family: "Helvetica Neue", "Helvetica", Arial, sans-serif; - overflow-x: hidden; } /* Typography */ @@ -81,7 +80,7 @@ a:hover { /* NOTE: Margin should match height in navigation.scss */ margin-top: 50px; background-color: $background-color; - padding: 20px 1px; + padding: 20px 0px; min-width: 100%; min-height: 768px; } From a4c24b2c6cda89d4952fdc31ca9976ae00c357c5 Mon Sep 17 00:00:00 2001 From: Technoboy10 Date: Tue, 9 Feb 2016 08:19:29 -0700 Subject: [PATCH 09/15] oops --- src/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.scss b/src/main.scss index 5769126a7..64dd346bb 100644 --- a/src/main.scss +++ b/src/main.scss @@ -80,7 +80,7 @@ a:hover { /* NOTE: Margin should match height in navigation.scss */ margin-top: 50px; background-color: $background-color; - padding: 20px 0px; + padding: 20px 0; min-width: 100%; min-height: 768px; } From 7992c43b87e995ae09a3860fb6cdea88251a1dec Mon Sep 17 00:00:00 2001 From: The_Grits Date: Fri, 12 Feb 2016 07:37:25 -0500 Subject: [PATCH 10/15] Update credits.jsx Travis was complaining that link 188 had over 120 characters, this should fix it. --- src/views/credits/credits.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/credits/credits.jsx b/src/views/credits/credits.jsx index 91ece15fe..bded78d60 100644 --- a/src/views/credits/credits.jsx +++ b/src/views/credits/credits.jsx @@ -185,8 +185,8 @@ var Credits = React.createClass({ Andrés Monroy-Hernández (who led the development of the first Scratch community website), Amos Blanton, Champika Fernando, Shane Clements, Abdulrahman idlbi, Evelyn Eastmond, Amon Millner, Eric Rosenbaum, Jay Silver, Karen Brennan, Leo Burd, Oren Zuckerman, Gaia Carini, - Michelle Chung, Margarita Dekoli, Dave Feinberg, Megan Haddadi, Chris Graves, Tony Hwang, Di Liu, Tammy Stern, - Lis Sylvan, and Claudia Urrea. + Michelle Chung, Margarita Dekoli, Dave Feinberg, Megan Haddadi, Chris Graves, Tony Hwang, Di Liu, + Tammy Stern, Lis Sylvan, and Claudia Urrea.

    Design and Development Partners

    From 1d2fa70e4e97e9c83b34d324b708c2cb129db7fd Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Thu, 18 Feb 2016 15:16:49 -0500 Subject: [PATCH 11/15] Add new travis badge to readme Fixes #358 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f970b71e..8b6f28dfd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## scratch-www #### Standalone web client for Scratch -[![Build Status](https://magnum.travis-ci.com/LLK/scratch-www.svg?token=xzzHj4ct3SyBTpeqxnx1)](https://magnum.travis-ci.com/LLK/scratch-www) +[![Build Status](https://travis-ci.org/LLK/scratch-www.svg)](https://travis-ci.org/LLK/scratch-www) ### Where am I? Physically? No idea. From 7488715b9ae9eed3f8a86f4f09949a64d9fbc23a Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Thu, 18 Feb 2016 15:54:03 -0500 Subject: [PATCH 12/15] Attempt to fix travis deployment It seems to not like underscores anymore. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd732d591..8ba9a974d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,8 @@ before_deploy: - zip -qr $BUILD_ARCHIVE . deploy: - provider: elasticbeanstalk - access_key_id: $EB_AWS_ACCESS_KEY_ID - secret_access_key: $EB_AWS_SECRET_ACCESS_KEY + access-key-id: $EB_AWS_ACCESS_KEY_ID + secret-access-key: $EB_AWS_SECRET_ACCESS_KEY bucket_name: $EB_AWS_BUCKET_NAME bucket_path: $EB_APP zip_file: $BUILD_ARCHIVE @@ -37,8 +37,8 @@ deploy: - hotfix/* - release/* - provider: elasticbeanstalk - access_key_id: $EB_AWS_ACCESS_KEY_ID - secret_access_key: $EB_AWS_SECRET_ACCESS_KEY + access-key-id: $EB_AWS_ACCESS_KEY_ID + secret-access-key: $EB_AWS_SECRET_ACCESS_KEY bucket_name: $EB_AWS_BUCKET_NAME bucket_path: $EB_APP zip_file: $BUILD_ARCHIVE From e294b68b77c5f890b79e4628e1f11d33004d236f Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Thu, 18 Feb 2016 16:00:31 -0500 Subject: [PATCH 13/15] Revert "Attempt to fix travis deployment" This reverts commit 7488715b9ae9eed3f8a86f4f09949a64d9fbc23a. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ba9a974d..fd732d591 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,8 @@ before_deploy: - zip -qr $BUILD_ARCHIVE . deploy: - provider: elasticbeanstalk - access-key-id: $EB_AWS_ACCESS_KEY_ID - secret-access-key: $EB_AWS_SECRET_ACCESS_KEY + access_key_id: $EB_AWS_ACCESS_KEY_ID + secret_access_key: $EB_AWS_SECRET_ACCESS_KEY bucket_name: $EB_AWS_BUCKET_NAME bucket_path: $EB_APP zip_file: $BUILD_ARCHIVE @@ -37,8 +37,8 @@ deploy: - hotfix/* - release/* - provider: elasticbeanstalk - access-key-id: $EB_AWS_ACCESS_KEY_ID - secret-access-key: $EB_AWS_SECRET_ACCESS_KEY + access_key_id: $EB_AWS_ACCESS_KEY_ID + secret_access_key: $EB_AWS_SECRET_ACCESS_KEY bucket_name: $EB_AWS_BUCKET_NAME bucket_path: $EB_APP zip_file: $BUILD_ARCHIVE From ab6bdfbd6a65a201013c74a1cb04dc8eaa33efbe Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Tue, 23 Feb 2016 08:39:44 -0500 Subject: [PATCH 14/15] Add new keys --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd732d591..894263ca5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ notifications: secure: ezESiG7JnuSLZc2/PPhOvWUv5BHBCr+g86MsuLLw+S+zz3DUfzWHMQ1g5tUvkeSDTPmfEIX41EnPkaoWtsD3OGO0PGXgseAfA8+6Z4N1rICNZZrhXZB2s6UdwRK1e+0Jol4W3kHmt96BHyN2scLNgJYeWMgSJllVsuPhMTlKBZIXI9u540NH8Nxjl3f2WvoIg64Q1mZvMxkpPbw4xssx6U4HSFE8kTTE6+EFsSxzombFX0cLGjPiJ9QZgGVUk4UkIjyiFLQQDfQlLllCaUpqJ9+qbuCNoMSKA2yty/qyZ8Y+r4OlMberjmBzR9GRLLyXWWcaAfMIgwlRhjtLYIDAUSsGM1iwUWCgyB9maG2IiXuYLSueuMx8DcDwbpUepoDgnqBYnM2AJmT8gcsxqlKYzJpYpHDgZgBlLZQgMXqjrVJHs/Tf9XVcLS6HAn1Ww0OOT01jThfy4gClpAuqLayYexsXOoL+RaFg25E2NzuTtaFWgRfWZgcAeqYNDiUzwun2D4vZ5I+NtdRP0gzpbG2fxhFz05vAqyf1Kp6ZYb17Li3A38dIm6Lsvv3qawAIAgNaZpIZX3f89+uq6jHU8kJy1Iv823JK2Xac3vEz3SHUKJnuXFF0LO07om9AcNEXhP/JrJ617S8nfvDtZRJODMFhz8qQwie+65Ql1I871goBpVs= env: global: - - secure: kXRyOECCfmTmIyibSKyHFz9cC5YGDsLIZJyiSpepvjRvuuJErxpD3yokp++JCJXdj/CRfJKazeMPkgek78zGiI/xnHR2aVxuQraU5ELIVNBCaFDtM4lKxtTVvEAtErwhWrH9zMiJkgXGF/MwID0QgZVlD/hpKI3MoS8sS1dmvDlqlregTvUZWBnlqMnrQuOXFNLPT+/QPgO6myd+nJn+XogSw8HceUo76cOADBphLtxFvE+R3FEbkHOwgJzUR3p8FstNXjmXZocSAYlGEgf1QIAN7M+3fH3wBHUBL2XELlr3w6eFr0qPCT5GCIxc4DNYsNt1360nmhSUqcm+k30HcbGmM5oWiRTmo2NrNpKhCUyF9wKHKmS4JYqGBEBjLxkTZe/zCv18gNVy0s9x/IXP3qP9SoRnlNEt9H6MjaxBc3lWD47UmcDJoLrs7OUdM4HDxgmPJyTzJsg059GEWgHuEMGIGGCYBGdpNlu4ZH6yEgsji73+kAkYbnVzhz4QtfhGNgQv3kEhTmDHW5muca5EMuSyOLW5v4ffpLJgirJQi9lvjZ/pZ+XJU0DSfIHdViqop6hRrsPxo2ewle3RcZrlQuw7lJJp9IoDT5Ku2PU1m8+705CR8S96DrMP8UtbC1Plcv91MMGmwgPwYAQwEcTnj7Fsq9QKReus+CTUXYqaMQM= - - secure: D7TVtzhDPvSsipXB9jiokA00rUAENWjK5Lrv+JOgdNe35D9j3tSSgT+iKj2Et5LcSeKXpvC2gMDXakHMflo2tT8uYPx7NI6J9XZMro2VP+ebTHlG57Fuoves9XxwCvHDFk2yW/K7uma8a92rs4PNydJRB6SPm3pWjL29Ih2n9ZFy37ZHCdL26R61EJ9SZh5siOVuXhqB36mu0Z9ANjXeXcLrKzpRf8mmORsK9NT/0A9kg4a0Q9ZKiHhUp3Wh3VKfDlDvqYszdofBNSpUGSyj/J4IlpYld8q+o+husxr3yLbV+FR1xdJ8NS04iXEmd1yOhJKy7ienpNQJ7NLwSOgDQ+Y8VZJUf0ZvSX/acHqNFQC86tW15KTAEVfnY8Js7mqmZrsWoY6+jzC8RyaQoZiD1HQfJLHkG+uqrfPYhWy1BNz+4QtBwnnQO+E/B2CM+fGAmjoJ+UjquWQo+sHWwoatNrG85JumA3GsA1FSlkzEVy3AAcST/CFZ1IyGCDVTar++2VwYCH691DuJy1gyeqSukSbRQIhGTSktArv0FjIiVsoMTCB/Ntg8HcfL6ADTfsijZVL9v5hN2VUXg3BjuF4TEBsrN78WMNI+U3g1+W1UW+036eP09Z7QDxIvLoQdIaQncGBny2KnR2j/Gmgz9eG0eg4dlV+2W+9DqE4y+tmU4Jw= + - secure: Dp/+BDnB9NcaDl6/1dkqoxvC++TZRptV9/C55Hz5h1WHzYVeTvjHTdDaPIwb+IrWiBOVnx0/VHmR4xoBXWxacWzAVBJ+S6Ay2oxTM6oXoEfE8/zPgTFBVilAzXgfjHUaplGfmFOrJpKvFTaIOAqC5OCnquxdUYyLqAmzWlvLPtQI8LtY45S1yltEPyOQMBLKCKtQm50u9KvMTZ0i2mRTJHpvmxN92ZUYkU3CezXhCzIlHfCHmBdk7Wck52D6AdXve9Z2TsLE3vxVSEuIbOxxJ6NuYxV+ReD5Bcc01ZZ2Hu8fy5CyN4+HKZIt3tt4MVOk0Ij9azxUS0eK5m9mre1YPQKze6bU0WaGHC8amSleX8l0RAPVZgC5D5vVSyLc/sZMOofw3aVe57Xc6q80eOd5XoSs1p/QYsbCoOo4xJfC5Rr5jRwBgJNelrvBT5qhXLGBWPxzOvIreAIa5DexfYx67/sm+9FHe+R2fMBKLIX5uHypCtJYOuYBM2UWFenTfWuoIigmdoSUjI6VMbqOEPkuyIoBJUaa+AuTF8rfs94WXZt78hS29U9XYxBjWKj+664lJa9e/K49I6mJSwp2Lk9O+sNyJY482QNuAvqcR90MsSXWa4HAYnMJYz4DDwyY6u2Agxn4mtkGHef8GlV63Yv0G4izFISVa1jNn7/dXY+fDO8= + - secure: Lafhvn4G0Wp2yAiI+pTqty6C+qLzkhrUwzGESJbm5HZmJvFLmfMDE+p/hNdwL9Pn43kdCZP9ve54gJbLZyMmV9cQ/jsBEF1K9QfgmLOik44/laYNvApFQAmuDaTbiUu/CPtc81EnHmsGyXm1DO3ozm8d+6VOs05Hqs/DebdoTlFny1rwbMFMRRiodfzyjZIYNqPxXu4oSFEGuaVwtfAO1FPcMkQNIANgtU5O9EQs3wf584hdGzmkj3B9M4iiZgw+SIskpxe1Xl+Ln7c5++Jq+B3l60e4mnB7KfgSNGLYQZHbZrp6V864mRm4sFldVjEXLoE7VXBdNsQmtLlnIabUueH3xQdem9ElrvSthpxUOwLGYQvNTbVvCO8hRUDmYCj1nXsD5ct7+oHUUlDz0wEie9TdvWJv6egC+ZQ9MgXihqGlHjtoky8oD40FydcJCqqCD8BxNx7k+bu8snu9dkGbzSRwyoBw8EnT9YstszujXIOvpqfb3O6jNZij1BTN7309eCZPFBdDk2W1PE98uSWzQhW0pPah83G7B4MYDKDDK9ZogEO3LgcAyceazMQYav4uB1zBJzKmcqinlz9QkucC9YaP044xDy/VtpmF0OKmminVAiZBrQrJ0Win/keD0Y5MOMSJ4us+e8e/WESRnA5vJwfCRMz89YfHz1biueC0Smo= - EB_REGION=us-east-1 - EB_APP=scratch-www - EB_AWS_BUCKET_NAME=elasticbeanstalk-us-east-1-307680192167 From 9dc4195bbfb94ee12edfa3ef0cd7d2a0a6d08a34 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Tue, 23 Feb 2016 08:48:19 -0500 Subject: [PATCH 15/15] add key again --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 894263ca5..26f9adf3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ notifications: secure: ezESiG7JnuSLZc2/PPhOvWUv5BHBCr+g86MsuLLw+S+zz3DUfzWHMQ1g5tUvkeSDTPmfEIX41EnPkaoWtsD3OGO0PGXgseAfA8+6Z4N1rICNZZrhXZB2s6UdwRK1e+0Jol4W3kHmt96BHyN2scLNgJYeWMgSJllVsuPhMTlKBZIXI9u540NH8Nxjl3f2WvoIg64Q1mZvMxkpPbw4xssx6U4HSFE8kTTE6+EFsSxzombFX0cLGjPiJ9QZgGVUk4UkIjyiFLQQDfQlLllCaUpqJ9+qbuCNoMSKA2yty/qyZ8Y+r4OlMberjmBzR9GRLLyXWWcaAfMIgwlRhjtLYIDAUSsGM1iwUWCgyB9maG2IiXuYLSueuMx8DcDwbpUepoDgnqBYnM2AJmT8gcsxqlKYzJpYpHDgZgBlLZQgMXqjrVJHs/Tf9XVcLS6HAn1Ww0OOT01jThfy4gClpAuqLayYexsXOoL+RaFg25E2NzuTtaFWgRfWZgcAeqYNDiUzwun2D4vZ5I+NtdRP0gzpbG2fxhFz05vAqyf1Kp6ZYb17Li3A38dIm6Lsvv3qawAIAgNaZpIZX3f89+uq6jHU8kJy1Iv823JK2Xac3vEz3SHUKJnuXFF0LO07om9AcNEXhP/JrJ617S8nfvDtZRJODMFhz8qQwie+65Ql1I871goBpVs= env: global: - - secure: Dp/+BDnB9NcaDl6/1dkqoxvC++TZRptV9/C55Hz5h1WHzYVeTvjHTdDaPIwb+IrWiBOVnx0/VHmR4xoBXWxacWzAVBJ+S6Ay2oxTM6oXoEfE8/zPgTFBVilAzXgfjHUaplGfmFOrJpKvFTaIOAqC5OCnquxdUYyLqAmzWlvLPtQI8LtY45S1yltEPyOQMBLKCKtQm50u9KvMTZ0i2mRTJHpvmxN92ZUYkU3CezXhCzIlHfCHmBdk7Wck52D6AdXve9Z2TsLE3vxVSEuIbOxxJ6NuYxV+ReD5Bcc01ZZ2Hu8fy5CyN4+HKZIt3tt4MVOk0Ij9azxUS0eK5m9mre1YPQKze6bU0WaGHC8amSleX8l0RAPVZgC5D5vVSyLc/sZMOofw3aVe57Xc6q80eOd5XoSs1p/QYsbCoOo4xJfC5Rr5jRwBgJNelrvBT5qhXLGBWPxzOvIreAIa5DexfYx67/sm+9FHe+R2fMBKLIX5uHypCtJYOuYBM2UWFenTfWuoIigmdoSUjI6VMbqOEPkuyIoBJUaa+AuTF8rfs94WXZt78hS29U9XYxBjWKj+664lJa9e/K49I6mJSwp2Lk9O+sNyJY482QNuAvqcR90MsSXWa4HAYnMJYz4DDwyY6u2Agxn4mtkGHef8GlV63Yv0G4izFISVa1jNn7/dXY+fDO8= - - secure: Lafhvn4G0Wp2yAiI+pTqty6C+qLzkhrUwzGESJbm5HZmJvFLmfMDE+p/hNdwL9Pn43kdCZP9ve54gJbLZyMmV9cQ/jsBEF1K9QfgmLOik44/laYNvApFQAmuDaTbiUu/CPtc81EnHmsGyXm1DO3ozm8d+6VOs05Hqs/DebdoTlFny1rwbMFMRRiodfzyjZIYNqPxXu4oSFEGuaVwtfAO1FPcMkQNIANgtU5O9EQs3wf584hdGzmkj3B9M4iiZgw+SIskpxe1Xl+Ln7c5++Jq+B3l60e4mnB7KfgSNGLYQZHbZrp6V864mRm4sFldVjEXLoE7VXBdNsQmtLlnIabUueH3xQdem9ElrvSthpxUOwLGYQvNTbVvCO8hRUDmYCj1nXsD5ct7+oHUUlDz0wEie9TdvWJv6egC+ZQ9MgXihqGlHjtoky8oD40FydcJCqqCD8BxNx7k+bu8snu9dkGbzSRwyoBw8EnT9YstszujXIOvpqfb3O6jNZij1BTN7309eCZPFBdDk2W1PE98uSWzQhW0pPah83G7B4MYDKDDK9ZogEO3LgcAyceazMQYav4uB1zBJzKmcqinlz9QkucC9YaP044xDy/VtpmF0OKmminVAiZBrQrJ0Win/keD0Y5MOMSJ4us+e8e/WESRnA5vJwfCRMz89YfHz1biueC0Smo= + - secure: A138rYuXDsOmpEwYxZ31WyXEeq5fgr9qyqsQh1nTFsjBKpFtNM+CN9e0QJQFT3PLs4wH/lWTRSyHxakxKQS1sxq828f9gHed+f15REKk/fRUplcCYIexT9xKVtU3D8CRNn/KBFWk75fZyZt20eyOVIv4h3pInKQz7y84J6PWzB1BCrAFvADrzS1X68Z3NJJLyxnz0YEurzz8mC2v4D0s/XifKTWvRtefD4QM6pE0C2iYyk+ThrLwg7i9FDHVfo0MrkgcdX7mz37SnTr7p7mHWnGXrGngi/NiDRQ+Uwwq/sr2UIww0rCwS1xsOcS//dC4NNqrrt1kUTsoC1Yt87Ny+gI0nUplsfEpdKajAkOYdANC5bJUGqPdSlOds1v9aJs9Hx48uGamWkm/3cFmoJ5uA2ZzUwbSGjTkWbnhwzT0YRvcLGhP1WE/EswaIyK5qMp522E79mP1yH6M750iUvi4N39+QW1BNX3ADkOwyAI67ArX5on5gWP83RXcJ15im7XsBpsmVn/KXi6AouWPb8jmSmKCj0QZCzfLY7ivM42IugYpK2NV7kFB38DpXQamJ5eskgwYa3elRmednIFUuwb1QDnONvJogVjk4CLmoSxssC2mJnnrUItM7l8G6As81GMI+6lTtl86hAuXBjUk60FMbgTAQDX9ll26LgpBy8jHSx8= + - secure: EX1fyov+f6ytWN2ZSL4dLslwrVkp6Ho/uoSLO38/qNG3XdGmBN4VprxddcQiWfo+Mrg3GdWcfcM/VazhhStBi1uLfZiw3RHZaSGuWbiuD2EtzqtlC+OVvoajgy91QFajh9Zzuwa0rYbEPd/sw01R53NoWJYl0GSteWk7C8Wv6anl4FUJCqgvvTV2ZEcyTtGcVJgUhKi1MfNpTSM6JWBy0DWszcyxj7C8LSs1+l9ZjAtnlUBWY13HsrNu8G5d+FwqGHZLUAjdu2O602wxV897/xLARLduZ+01ALpVefNEEGMB1Wd+xMw4dm2B0Uk86a4TBRCeOgJZ1yoJoPpGPOHTo+dgNXcU8ReszGVoy7uOjFWwu82FQq8gzfcf75yzaRJgG8/BJ6BkJfa0EmFg3iO5CwixQyHR5+CqsedtoLAWVT8zlOfQ/Z6yx4Pm7jXQSOkyvo09YJ2QIn4IFGPvwOVS7Firzi+fLl8GYApeSV9G10e1IzA4pPrKdJMRA4qRMPt9zJGq7ZO1J/d9aW/5KIsJUDnodnl7yXJyDMOyNeljT9I82ciHZcURxRRY080vrW6dgNJE1V9jxBhWEvr2iCeWMMedWaGuC41I7K9L79eW8lmaE+cQ+OZrzpOJP4GbfmIiXrh+0M4ChL/xBpjtiFwpNdkCXXhzWMnjJ4wCrii4yuc= - EB_REGION=us-east-1 - EB_APP=scratch-www - EB_AWS_BUCKET_NAME=elasticbeanstalk-us-east-1-307680192167