Commits · ee342dfbdb6453e57b5876e657e2391f731ae92b · xpstem / scratch-www

31 Jul, 2017 3 commits
- Merge pull request #1447 from rschamp/jobs · ee342dfb
  Ray Schamp authored Jul 31, 2017
```
[Master] 	Add Senior Backend Engineer job posting
```
  ee342dfb
- Add Senior Backend Engineer job posting · e369a439
  Ray Schamp authored Jul 31, 2017
  
  e369a439
- Merge pull request #1443 from St19Galla/patch-4 · fcb635b5
  Matthew Taylor authored Jul 28, 2017
```
Fix gh-1442: Remove Moderator Position
```
  fcb635b5
27 Jul, 2017 1 commit
- Merge pull request #1441 from LLK/release/2.2.23 · 6f0521cc
  Matthew Taylor authored Jul 27, 2017
```
[Master] Release 2.2.23
```
  6f0521cc
21 Jul, 2017 6 commits

Merge pull request #1430 from mewtaylor/hotfix/camp-page-edits · 4c77b1ac
Matthew Taylor authored Jul 21, 2017
```
[Master] Hotfix: Edits to the scratch camp page
```
4c77b1ac

Squashed commit of the following: · e2a596ea

Matthew Taylor authored Jul 21, 2017

commit b8a05d96
Author: Matthew Taylor <mewtaylor@gmail.com>
Date:   Fri Jul 21 12:06:06 2017 -0400

    only change style for links on page

    otherwise, the footer links were getting the new styling

commit 34a3b8b4
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Thu Jul 20 22:28:03 2017 -0400

    Update l10n.json

commit 9c8241b9
Merge: 3f90e985 bca79e65
Author: Matthew Taylor <mewtaylor@gmail.com>
Date:   Thu Jul 20 16:36:32 2017 -0400

    Merge pull request #1423 from mewtaylor/hotfix/camp-page

    Hotfix Scratch Camp 2017 Page

commit bca79e65
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Wed Jul 19 15:42:16 2017 -0400

    Update l10n.json (#1421)

commit 4a9418d4
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Wed Jul 19 11:48:29 2017 -0400

    Down Deep - Scratch Camp 2017 Page (#1409)

    * Add files via upload

    * Create downdeep.jsx

    * Delete downdeep.jsx

    * Delete downdeep.scss

    * Delete l10n.json

    * Delete downdeep.jsx

    * Create dd.jsx

    * Rename dd.jsx to filler.jsx

    * Add files via upload

    * Delete dd.jsx

    * Delete filler.jsx

    * Create filler.jsx

    * Add files via upload

    * Delete filler.jsx

    * Update routes.json

    * whoops

    * travis

    * Update downdeep.jsx

    * Update downdeep.scss

    * Update downdeep.scss

    * Update _colors.scss

    * what i get for rushing

    * Update downdeep.jsx

    * Update l10n.json

    * thisandagain's changes

    * Carl's Changes

    * carl's changes

    * carl's changes

    * Update downdeep.jsx

    * Rename downdeep.jsx to camp.jsx

    * Rename downdeep.scss to camp.scss

    * Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx

    * Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss

    * Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json

    * Update camp.jsx

    * Add files via upload

    * Update camp.jsx

    * Update camp.scss

    * Update l10n.json

    * Create filler

    * Add files via upload

    * Delete bubbles.svg

    * Delete dolphin.svg

    * Delete fish-divider.svg

    * Delete fish-divider2.svg

    * Delete map.svg

    * Delete ocean-bottom.svg

    * Delete ocean-top.svg

    * Delete treasure.svg

    * Update camp.scss

    * Update camp.scss

    * Update camp.scss

    * Update camp.jsx

    * whoops

    * Update camp.scss

    * Update l10n.json

    * Update camp.scss

    * Update camp.jsx

    * Update _colors.scss

    * Update camp.scss

    * Update camp.scss

    * Update camp.scss

    * Update camp.scss

    * Update _colors.scss

    * Update camp.scss

    * Update camp.scss

commit 3f90e985
Merge: c8afebfa 84a37a67
Author: Ray Schamp <rschamp@users.noreply.github.com>
Date:   Thu Jul 13 16:32:51 2017 -0400

    Merge pull request #1413 from rschamp/hotfix/rip-smartystreets

    [Master] Remove SmartyStreets API

e2a596ea

only change style for links on page · b8a05d96
Matthew Taylor authored Jul 21, 2017
```
otherwise, the footer links were getting the new styling
```
b8a05d96
Update l10n.json · 34a3b8b4
St19_Galla authored Jul 20, 2017

34a3b8b4
Merge pull request #1426 from St19Galla/patch-2 · e264a1d2
Matthew Taylor authored Jul 21, 2017
```
Fix gh-1425 // Camp Page Typo
```
e264a1d2
Update l10n.json · 110e47f1
St19_Galla authored Jul 20, 2017

110e47f1

20 Jul, 2017 10 commits

Merge pull request #1423 from mewtaylor/hotfix/camp-page · 9c8241b9
Matthew Taylor authored Jul 20, 2017
```
Hotfix Scratch Camp 2017 Page
```
9c8241b9
Merge pull request #1424 from mewtaylor/issue/double-api-call · 931606c4
Matthew Taylor authored Jul 20, 2017
```
key api calls on `username` check
```
931606c4

key api calls on `username` check · d0e7c29b

Matthew Taylor authored Jul 20, 2017

`this.props.user` will now return `true` because there is a default user object that’s empty. So, instead, wait for an actual user object

d0e7c29b

Update l10n.json (#1421) · bca79e65
St19_Galla authored Jul 19, 2017

bca79e65

Down Deep - Scratch Camp 2017 Page (#1409) · 4a9418d4

St19_Galla authored Jul 19, 2017

* Add files via upload

* Create downdeep.jsx

* Delete downdeep.jsx

* Delete downdeep.scss

* Delete l10n.json

* Delete downdeep.jsx

* Create dd.jsx

* Rename dd.jsx to filler.jsx

* Add files via upload

* Delete dd.jsx

* Delete filler.jsx

* Create filler.jsx

* Add files via upload

* Delete filler.jsx

* Update routes.json

* whoops

* travis

* Update downdeep.jsx

* Update downdeep.scss

* Update downdeep.scss

* Update _colors.scss

* what i get for rushing

* Update downdeep.jsx

* Update l10n.json

* thisandagain's changes

* Carl's Changes

* carl's changes

* carl's changes

* Update downdeep.jsx

* Rename downdeep.jsx to camp.jsx

* Rename downdeep.scss to camp.scss

* Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx

* Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss

* Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json

* Update camp.jsx

* Add files via upload

* Update camp.jsx

* Update camp.scss

* Update l10n.json

* Create filler

* Add files via upload

* Delete bubbles.svg

* Delete dolphin.svg

* Delete fish-divider.svg

* Delete fish-divider2.svg

* Delete map.svg

* Delete ocean-bottom.svg

* Delete ocean-top.svg

* Delete treasure.svg

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update camp.jsx

* whoops

* Update camp.scss

* Update l10n.json

* Update camp.scss

* Update camp.jsx

* Update _colors.scss

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update _colors.scss

* Update camp.scss

* Update camp.scss

4a9418d4

Merge pull request #1422 from mewtaylor/issue/custom-homepage-thumbnails · b2db8cba
Matthew Taylor authored Jul 20, 2017
```
Add new carousel component
```
b2db8cba
Update name for legacy carousel · 85613853
Matthew Taylor authored Jul 20, 2017

85613853

Add new carousel component · cb4ca510

Matthew Taylor authored Jul 20, 2017

1. Moves carousel to `LegacyCarousel` since it currently is designed to handle JSON from proxy endpoints
2. Add separate `Carousel` endpoint to handle data from project models in scratch’s new api, the standard moving forward.

cb4ca510

Add tx config for camp page · 3d8f5eff
Matthew Taylor authored Jul 20, 2017

3d8f5eff
Merge pull request #1415 from St19Galla/patch-2 · 7d9b6fc5
Matthew Taylor authored Jul 20, 2017
```
Fix gh-1410: Correct "Tips" Page Link
```
7d9b6fc5

19 Jul, 2017 6 commits

Merge pull request #1416 from mewtaylor/issue/custom-rows-api · 36583f0d
Matthew Taylor authored Jul 19, 2017
```
Move custom homepage row to new api endpoints
```
36583f0d
Update l10n.json (#1421) · 9f47d504
St19_Galla authored Jul 19, 2017

9f47d504

Fix Gh-1385 - Issue/smoke test signing in (#1411) · b289c421

jwzimmer authored Jul 19, 2017

* add tests for signing in and my stuff

* flesh out tests, reorganize a bit

* add more tests

* tests for my stuff & signing in

* fix some of the errors causing build to fail

* pass in credentials from commandline rather than uncommitted file

* switch root back to staging

* address pr review comments, rename username & password vars

* update testing readme

b289c421

Issue/gh 1371 update tests post tips navbar change (#1412) · 06acfbb6

jwzimmer authored Jul 19, 2017

* Update compatibility requirements to clarify support for ChromeOS

* update tests after changes to footer links and navbar

06acfbb6

Down Deep - Scratch Camp 2017 Page (#1409) · 43b8f0b3

St19_Galla authored Jul 19, 2017

* Add files via upload

* Create downdeep.jsx

* Delete downdeep.jsx

* Delete downdeep.scss

* Delete l10n.json

* Delete downdeep.jsx

* Create dd.jsx

* Rename dd.jsx to filler.jsx

* Add files via upload

* Delete dd.jsx

* Delete filler.jsx

* Create filler.jsx

* Add files via upload

* Delete filler.jsx

* Update routes.json

* whoops

* travis

* Update downdeep.jsx

* Update downdeep.scss

* Update downdeep.scss

* Update _colors.scss

* what i get for rushing

* Update downdeep.jsx

* Update l10n.json

* thisandagain's changes

* Carl's Changes

* carl's changes

* carl's changes

* Update downdeep.jsx

* Rename downdeep.jsx to camp.jsx

* Rename downdeep.scss to camp.scss

* Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx

* Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss

* Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json

* Update camp.jsx

* Add files via upload

* Update camp.jsx

* Update camp.scss

* Update l10n.json

* Create filler

* Add files via upload

* Delete bubbles.svg

* Delete dolphin.svg

* Delete fish-divider.svg

* Delete fish-divider2.svg

* Delete map.svg

* Delete ocean-bottom.svg

* Delete ocean-top.svg

* Delete treasure.svg

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update camp.jsx

* whoops

* Update camp.scss

* Update l10n.json

* Update camp.scss

* Update camp.jsx

* Update _colors.scss

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update camp.scss

* Update _colors.scss

* Update camp.scss

* Update camp.scss

43b8f0b3

move projects loved by following to new api endpoint · 36dc8283
Matthew Taylor authored Jul 19, 2017

36dc8283

18 Jul, 2017 1 commit
- Merge pull request #1418 from chrisgarrity/issue/gh1362-obsolete-strings · 9bf5a8e6
  chrisgarrity authored Jul 18, 2017
```
remove obsolete strings
```
  9bf5a8e6
17 Jul, 2017 2 commits

Split splash into container/presentation component · 753a3e1e

Matthew Taylor authored Jul 17, 2017

This does a bit of upkeep based on recs from @rschamp that:

1. Splits splash into container/presentation components
2. Updates the default project count to 20 million
3. makes the api calls that get info from the api take in arguments rather than use the session
4. Updates `MapStateToProps` to be more specific in what it uses beyond just `session` and `permissions`

Thanks @rschamp!

753a3e1e

remove obsolete strings · 4cc353ab

chrisgarrity authored Jul 17, 2017

‘Help’ and ‘Discuss’ are not needed now that they’ve been replaced with the Tips page.

Fixes #1362

4cc353ab

13 Jul, 2017 7 commits
- Merge pull request #1413 from rschamp/hotfix/rip-smartystreets · 3f90e985
  Ray Schamp authored Jul 13, 2017
```
[Master] Remove SmartyStreets API
```
  3f90e985
- Move custom homepage row to new api endpoints · 8c94a04e
  Matthew Taylor authored Jul 13, 2017
```
This goes along with https://github.com/LLK/scratch-api/pull/292. This can be updated if we choose to migrate the `lovedByFollowing` endpoint off of proxy as well.
```
  8c94a04e
- Update tips.jsx · 093d8f4e
  St19_Galla authored Jul 13, 2017
  
  093d8f4e
- Merge pull request #1414 from rschamp/hotfix/rip-smartystreets · 02b36ab9
  Ray Schamp authored Jul 13, 2017
```
[Develop] Remove SmartyStreets API
```
  02b36ab9
- Remove SmartyStreets API · 84a37a67
  Ray Schamp authored Jul 13, 2017
```
We are so lax with this that it's not actually helping us, and we don't have a plan with them anymore.
```
  84a37a67
- Merge pull request #1406 from TheGrits/patch-3 · 03785b78
  Matthew Taylor authored Jul 13, 2017
```
Fix gh-1382: Centre Align Note
```
  03785b78
- Merge pull request #1407 from TheGrits/patch-4 · 71e702b0
  Matthew Taylor authored Jul 13, 2017
```
Fix gh-1399: Misplaced Periods Fix
```
  71e702b0
10 Jul, 2017 1 commit
- Misplaced Periods Fix · 6533b5b5
  The_Grits authored Jul 10, 2017
  
  6533b5b5
08 Jul, 2017 1 commit
- Fix gh-1382: Centre Align Note · c5f66199
  The_Grits authored Jul 07, 2017
  
  c5f66199
07 Jul, 2017 2 commits
- Merge pull request #1402 from TheGrits/patch-3 · d7052723
  Andrew Sliwinski authored Jul 07, 2017
```
Fix gh-1397: Update Supporting Organizations
```
  d7052723
- Merge pull request #1405 from TheGrits/patch-4 · 78940b1e
  Andrew Sliwinski authored Jul 07, 2017
```
Fix gh-1404: Add Junior Designer Position
```
  78940b1e