scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-15 10:02:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2664 commits 220 branches 1 tag 511 MiB
Commit graph

2664 commits

This branch
This branch
All branches
Author SHA1 Message Date
LiFaytheGoblin
f9a9130351 Added JT Galla to the Credits Page under 'Aknowledgements' 2017-07-25 22:11:05 +02:00
Matthew Taylor
4c77b1acba Merge pull request #1430 from mewtaylor/hotfix/camp-page-edits 
[Master] Hotfix: Edits to the scratch camp page
 2017-07-21 16:30:14 -04:00
Matthew Taylor
e2a596ea9d Squashed commit of the following: 
commit b8a05d9624
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 34a3b8b49b
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Thu Jul 20 22:28:03 2017 -0400

    Update l10n.json

commit 9c8241b92c
Merge: 3f90e98 bca79e6
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 bca79e652a
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Wed Jul 19 15:42:16 2017 -0400

    Update l10n.json (#1421)

commit 4a9418d49c
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 3f90e98593
Merge: c8afebf 84a37a6
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
 2017-07-21 12:10:48 -04:00
Matthew Taylor
b8a05d9624 only change style for links on page 
otherwise, the footer links were getting the new styling
 2017-07-21 12:06:06 -04:00
St19_Galla
34a3b8b49b Update l10n.json 2017-07-21 12:03:10 -04:00
Matthew Taylor
e264a1d2c9 Merge pull request #1426 from St19Galla/patch-2 
Fix gh-1425 // Camp Page Typo
 2017-07-21 12:02:11 -04:00
The_Grits
d936d0d9c4 Add -redirect tags + reorder 2017-07-21 09:51:45 -04:00
The_Grits
5fa9c6a05f Alphabetize Routes List v2 2017-07-21 07:30:42 -04:00
St19_Galla
110e47f1d2 Update l10n.json 2017-07-20 22:28:03 -04:00
Matthew Taylor
9c8241b92c Merge pull request #1423 from mewtaylor/hotfix/camp-page 
Hotfix Scratch Camp 2017 Page
 2017-07-20 16:36:32 -04:00
Matthew Taylor
931606c4d7 Merge pull request #1424 from mewtaylor/issue/double-api-call 
key api calls on `username` check
 2017-07-20 15:16:24 -04:00
Matthew Taylor
d0e7c29b5f key api calls on username check 
`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
 2017-07-20 15:01:36 -04:00
St19_Galla
bca79e652a Update l10n.json (#1421) 2017-07-20 14:53:36 -04:00
St19_Galla
4a9418d49c 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
 2017-07-20 14:52:42 -04:00
Matthew Taylor
b2db8cbac8 Merge pull request #1422 from mewtaylor/issue/custom-homepage-thumbnails 
Add new carousel component
 2017-07-20 14:01:19 -04:00
Matthew Taylor
8561385324 Update name for legacy carousel 2017-07-20 13:56:11 -04:00
Matthew Taylor
cb4ca51061 Add new carousel component 
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.
 2017-07-20 13:47:14 -04:00
Matthew Taylor
3d8f5eff82 Add tx config for camp page 2017-07-20 08:06:01 -04:00
Matthew Taylor
7d9b6fc5d8 Merge pull request #1415 from St19Galla/patch-2 
Fix gh-1410: Correct "Tips" Page Link
 2017-07-20 07:40:59 -04:00
Matthew Taylor
36583f0d04 Merge pull request #1416 from mewtaylor/issue/custom-rows-api 
Move custom homepage row to new api endpoints
 2017-07-19 17:19:27 -04:00
St19_Galla
9f47d504ec Update l10n.json (#1421) 2017-07-19 15:42:16 -04:00
jwzimmer
b289c42120 Fix Gh-1385 - Issue/smoke test signing in (#1411) 
* 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
 2017-07-19 12:58:50 -04:00
jwzimmer
06acfbb61c Issue/gh 1371 update tests post tips navbar change (#1412) 
* Update compatibility requirements to clarify support for ChromeOS

* update tests after changes to footer links and navbar
 2017-07-19 12:58:14 -04:00
St19_Galla
43b8f0b38f 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
 2017-07-19 11:48:29 -04:00
Matthew Taylor
36dc8283b8 move projects loved by following to new api endpoint 2017-07-19 11:25:39 -04:00
chrisgarrity
9bf5a8e6c2 Merge pull request #1418 from chrisgarrity/issue/gh1362-obsolete-strings 
remove obsolete strings
 2017-07-18 09:18:42 -04:00
Matthew Taylor
753a3e1eed Split splash into container/presentation component 
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!
 2017-07-17 12:19:49 -04:00
chrisgarrity
4cc353ab43 remove obsolete strings 
‘Help’ and ‘Discuss’ are not needed now that they’ve been replaced with the Tips page.

Fixes #1362
 2017-07-17 10:14:32 -04:00
Ray Schamp
3f90e98593 Merge pull request #1413 from rschamp/hotfix/rip-smartystreets 
[Master] Remove SmartyStreets API
 2017-07-13 16:32:51 -04:00
Matthew Taylor
8c94a04e77 Move custom homepage row to new api endpoints 
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.
 2017-07-13 15:35:18 -04:00
St19_Galla
093d8f4eb3 Update tips.jsx 2017-07-13 12:48:18 -04:00
Ray Schamp
02b36ab9f3 Merge pull request #1414 from rschamp/hotfix/rip-smartystreets 
[Develop] Remove SmartyStreets API
 2017-07-13 10:52:58 -04:00
Ray Schamp
84a37a671f Remove SmartyStreets API 
We are so lax with this that it's not actually helping us, and we don't have a plan with them anymore.
 2017-07-13 10:44:50 -04:00
Matthew Taylor
03785b78f6 Merge pull request #1406 from TheGrits/patch-3 
Fix gh-1382: Centre Align Note
 2017-07-13 10:38:04 -04:00
Matthew Taylor
71e702b002 Merge pull request #1407 from TheGrits/patch-4 
Fix gh-1399: Misplaced Periods Fix
 2017-07-13 09:48:16 -04:00
The_Grits
6533b5b50a Misplaced Periods Fix 2017-07-10 19:49:13 -04:00
The_Grits
c5f6619947 Fix gh-1382: Centre Align Note 2017-07-07 20:17:03 -04:00
Andrew Sliwinski
d705272341 Merge pull request #1402 from TheGrits/patch-3 
Fix gh-1397: Update Supporting Organizations
 2017-07-07 19:45:28 -04:00
Andrew Sliwinski
78940b1e2f Merge pull request #1405 from TheGrits/patch-4 
Fix gh-1404: Add Junior Designer Position
 2017-07-07 19:43:47 -04:00
The_Grits
a9ba27ef97 Fix gh-1404: Add Junior Designer 2017-07-07 19:34:55 -04:00
The_Grits
a3714e5348 Add transifex remove pootle 2017-07-06 23:06:23 -04:00
chrisgarrity
61d65a00a5 Merge pull request #1398 from chrisgarrity/issue/gh1396-missing-tag 
Add missing closing tag for PDF Guide
 2017-07-06 14:41:27 -04:00
chrisgarrity
24bfc18487 Add missing closing tag for PDF Guide 2017-07-05 13:42:20 -04:00
Matthew Taylor
716d332907 Merge pull request #1394 from LLK/release/2.2.22 
[Develop] Release 2.2.22
 2017-07-05 10:23:04 -04:00
Matthew Taylor
c8afebfa6d Merge pull request #1395 from LLK/release/2.2.22 
[Master] Release 2.2.22
 2017-07-05 10:12:51 -04:00
chrisgarrity
91b1784e33 Merge pull request #1392 from chrisgarrity/remove-alias-caret 
Remove unnecessary ‘^’ from routeAliases
 2017-06-29 16:38:19 -04:00
chrisgarrity
ced9339fb6 Remove unnecessary ‘^’ from routeAliases 2017-06-29 15:30:26 -04:00
chrisgarrity
89a8c3fc55 Merge pull request #1391 from chrisgarrity/issue/redirect-routes 
update /help and /info routes
 2017-06-29 14:54:47 -04:00
chrisgarrity
ece3d4a1f9 update /help and /info routes 2017-06-29 14:42:17 -04:00
Matthew Taylor
7a44be5e5b Merge pull request #1389 from TheGrits/patch-3 
Fix gh-1388: Help -> Tips on FAQ Page
 2017-06-29 09:58:17 -04:00