scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-12 00:31:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2149 commits 221 branches 1 tag 506 MiB
Commit graph

845 commits

Author SHA1 Message Date
St19_Galla
9f47d504ec Update l10n.json (#1421) 2017-07-19 15:42:16 -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
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
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
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
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
24bfc18487 Add missing closing tag for PDF Guide 2017-07-05 13:42:20 -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
The_Grits
5570632ed3 Help -> Tips 2017-06-28 16:54:42 -04:00
chrisgarrity
f7345c443d Fix blocks icon for windows 
Note for future reference - set the size for SVGs with height not width if using rem.
IE on Windows 7 doesn’t resize correctly if the width is set with rem. Height works with rem, and exact pixel width works, but that should be avoided.
 2017-06-28 09:32:08 -04:00
chrisgarrity
a712a8d28a Fix typo in tutorial URL (#1377) 
Getting started tutorial link started with `//` instead of just `/`., and typo in downloading
 2017-06-27 16:33:57 -04:00
chrisgarrity
022d2dd506 FIx layout problems (#1380) 
* removed white-space: no wrap to let buttons flow in Cards section
* Fix download link (download should be part of the link)
* Set the size of the icons to fix alignment
 2017-06-27 16:27:07 -04:00
Andrew Sliwinski
a16a189a7f Update compatibility requirements to clarify support for ChromeOS 2017-06-26 09:42:56 -04:00
Matthew Taylor
dbb4fcc8a2 tweak some styling for the download page 
Adds the numbers back in above the download steps, and also moves the “note for mac users” down into a callout.
 2017-06-23 09:23:24 -04:00
chrisgarrity
74e315dc71 Add new Tips page (#1357) 
New of tips page, uses cards from new resources server (s3)

* added get-localized-urls script to get the generated json from the s3 bucket
* added /tips route
* correct localized-urls for other pages
* remove thingstotry
* redirect /go
* fix up /info/cards view to use resources (s3).
* redirect /go to /tips
* change /hoc redirect from /go to /tips
* Add full set of cards pdf download to tips localization
* removed cards and guides from static PDFs, they are all coming from resources.scratch.mit.edu now.
* removed things to try view

Corrections for reviews:
* decided to pretty print the localized URLs
* replaced console.errors with process.stdout and fail with exit(1)
* formatted localized-urls to make it easier to read
* moved link outside  `<Button…` makes whole button clickable instead of just text
* fixed up css styles, removed unnecessary classes
* corrected “unused” resource links
 2017-06-21 16:20:18 -04:00
Matthew Taylor
c1ea4730c3 use $ui-gray instead 2017-06-19 11:41:44 -04:00
Matthew Taylor
4342ef36a3 Have behavior for default/error on version check 
This keeps the version field empty, as well as the links, until it gets a response from the `version.xml` request. It then displays an error message if there was an error trying to get the version.
 2017-06-19 11:36:33 -04:00
Matthew Taylor
49a52b634c add background gray for installation process 2017-06-19 11:35:15 -04:00
Matthew Taylor
cf863fb3d3 point links at /download 2017-06-16 10:14:01 -04:00
Matthew Taylor
6e3c255fa7 Make version dependent on xml call 
Fixes #1351 by including a call to `version.xml` to get the most up-to-date offline build version, defaulting to the current version, `456.0.3`. This also fixes #1352 by switching the route to `/download`, with a redirect from `/scratch2download/`
 2017-06-16 10:11:58 -04:00
Matthew Taylor
348fd2d860 Merge pull request #1258 from TheGrits/patch-3 
Fix gh-1254: Migrate Download Page
 2017-06-13 17:06:21 -04:00
The_Grits
5ed33945ff Centre align 2017-06-13 16:58:01 -04:00
Matthew Taylor
6ace6926c0 Merge pull request #1347 from LiFaytheGoblin/fix_issue/gh_1331_add_mark_ferrell_to_credits_page 
Fix issue/gh-1331: added mark ferrell to credits page
 2017-06-13 16:22:54 -04:00
The_Grits
dd655df674 Fix gh-1343: Update Credits Page (#1346) 
* Remove Christina Huang

* Add Christina Huang to Previous Members
 2017-06-12 09:22:58 -04:00
LiFaytheGoblin
acfb5d71ac added mark ferrell to credits page (issue 1331) 2017-06-11 12:57:26 +02:00
Matthew Taylor
69176fb572 Revert "[Develop] Revert PR #1324" 2017-06-08 15:31:09 -04:00
The_Grits
e0ab9f4f03 Remove width from download page 2017-06-06 19:43:01 -04:00
Ray Schamp
e4ba1061b9 Revert "Merge pull request #1324 from mewtaylor/issue/api-250" 
This reverts commit 949a166c0f, reversing
changes made to 56b46fd861.
 2017-06-02 14:12:54 -04:00
The_Grits
c29dde59a1 Update download.scss 2017-06-02 08:13:29 -04:00
The_Grits
8b39259ce5 Thanks Travis 
(and St19Galla)
 2017-05-24 23:48:37 -04:00
The_Grits
15d393a9e2 Update Styling of Download Page 2017-05-24 20:19:49 -04:00
Matthew Taylor
949a166c0f Merge pull request #1324 from mewtaylor/issue/api-250 
For api-250: Change explore endpoint
 2017-05-24 14:03:36 -04:00
Matthew Taylor
373c7784c6 Change conference date 
Fixes #1322
 2017-05-24 08:42:25 -04:00
Matthew Taylor
1a83b34387 Change explore endpoint 
For scratch-api#250
 2017-05-22 15:41:28 -04:00
The_Grits
d740eb586f Lint fix download page 2017-05-22 11:58:55 -04:00
The_Grits
fadf0a3346 Download Page Restyle 2017-05-20 00:24:18 -04:00
Andrew Sliwinski
afe134a898 Merge pull request #1309 from thisandagain/hotfix/cm 
[Develop] Hotfix - Remove "Trust & Safety Manager" role from jobs page
 2017-05-15 11:37:38 -04:00
Matthew Taylor
5b3341673f Merge pull request #1312 from mewtaylor/hotfix/revert-birthday-banner 
[Develop] Hotfix: Remove 10th anniversary banner
 2017-05-15 11:23:41 -04:00
Matthew Taylor
ae53dcd746 Remove 10th banner 2017-05-15 11:08:15 -04:00
Andrew Sliwinski
042ae48408 Remove 'Trust & Safety Manager' role from jobs page 2017-05-14 12:52:53 -04:00
The_Grits
f901d3b429 Restyle the Download Page 2017-05-03 16:19:56 -04:00
Andrew Sliwinski
52b6ed9eb8 Merge pull request #1271 from TheGrits/patch-5 
Fix gh-875: Double Search Bar
 2017-05-03 14:37:02 -04:00
Matthew Taylor
b1e33a2933 Merge pull request #1299 from TheGrits/patch-9 
Fix gh-1294: Unlocalize Browser Links
 2017-05-03 14:33:50 -04:00
Matthew Taylor
787040b972 Merge pull request #1297 from TheGrits/patch-8 
Fix gh-1296: Add DD Liu to Credits Page
 2017-05-03 11:48:01 -04:00
Ray Schamp
ed2cd81a7a Merge pull request #1300 from St19Galla/patch-1 
Fix gh-1282 ~ Add "United States" to faq/educators page
 2017-05-02 18:15:34 -04:00
St19_Galla
f82d5f8341 add US to educators 2017-05-02 15:34:57 -04:00
St19_Galla
5083614f48 add US to faq 2017-05-02 15:33:31 -04:00
The_Grits
a837c05ac7 Remove localized Microsoft links 2017-05-02 15:29:00 -04:00
The_Grits
5822b2facb Update Firefox Link 2017-05-02 13:38:00 -04:00
The_Grits
0a747f68bd Add DD Liu 
Resolves #1296
 2017-05-01 11:24:55 -04:00
Matthew Taylor
00b80b40f3 Merge pull request #1295 from mewtaylor/issue/r2-4586 
Implement r2-4586: Add anniversary banner
 2017-05-01 07:35:31 -04:00
Matthew Taylor
d6f8b2fa9e add card tutorial redirect 2017-04-28 13:43:18 -04:00
Matthew Taylor
a950c91725 Add studio link 2017-04-28 09:09:06 -04:00
Matthew Taylor
fc075aedaf Add anniversary banner 2017-04-28 08:51:40 -04:00
Matthew Taylor
aef7b5e834 Merge pull request #1291 from LLK/release/2.2.20 
[Master] Release 2.2.20
 2017-04-26 22:20:07 -04:00
Matthew Taylor
76c46be17b Merge pull request #1269 from mewtaylor/issue/r2-4470 
Fix R2-4470: Only allows birthdays >= 13 yrs old for teacher reg
 2017-04-19 16:41:09 -04:00
Matthew Taylor
f2e4858868 Revert "[Master] Temp Hotfix: remove custom rows" 2017-04-18 06:36:39 -04:00
Matthew Taylor
6b513f82e0 Merge pull request #1268 from mewtaylor/issue/gh-1265 
[Develop] Hotfix GH-1265: Update jobs route to include moderator
 2017-04-14 14:20:20 -04:00
Matthew Taylor
cd3fb9245a Only apply offset to teachers 
thanks @chrisgarrity!
 2017-04-14 14:18:32 -04:00
The_Grits
5cc8911b04 Thanks Travis 2017-04-14 11:13:46 -04:00
The_Grits
d7e63aadee Fix gh-875: Double Search Bar 2017-04-14 10:08:17 -04:00
Matthew Taylor
cb7ce8c71d update language for age validation 
thanks @TheGrits!
 2017-04-13 07:41:47 -04:00
Matthew Taylor
2c472b607a Only allows birthdays > 13 yrs old for teacher reg 
Helps fix https://github.com/LLK/scratchr2/issues/4470 from the UX side of things
 2017-04-12 17:41:43 -04:00
Matthew Taylor
12e87df7c3 Merge pull request #1257 from TheGrits/patch-4 
Nit-picky Developer Class Type
 2017-04-11 12:58:09 -04:00
Matthew Taylor
5ca5c149f3 temporarily remove custom homepage rows 
redis emptied when mc1 restarted, so this is all going to mysql at the moment
 2017-04-11 09:27:19 -04:00
The_Grits
6dbf66d59d Patches and Styling 2017-04-06 10:40:46 -04:00
Matthew Taylor
b2e827f752 Merge pull request #1260 from mewtaylor/release/april-fools-rollback 
[Develop] Hotfix: Revert those changes we did last week
 2017-04-03 14:51:29 -04:00
Matthew Taylor
9affc8441c Revert "Merge pull request #1255 from LLK/release/branch" 
This reverts commit c36bde2c30, reversing
changes made to becae19f6f.
 2017-04-03 14:32:38 -04:00
The_Grits
94dec64045 Thanks Travis 
Gotta love missing semicolons
 2017-04-01 13:06:45 -04:00
The_Grits
68d10ffe32 Patch 3 wip (#30) 2017-04-01 10:55:47 -04:00
The_Grits
6255f989b0 Nit-picky Developer Class Type 
Just noticed that the type on this page was copied over from the About page. Non-blocking issue, just me being nit-picky.
 2017-04-01 10:06:40 -04:00
The_Grits
0f87a65622 importy 2017-03-31 19:35:33 -04:00
Matthew Taylor
d8ef3110e2 don’t apply to top banners 2017-03-31 10:26:56 -04:00
Matthew Taylor
0e645ce954 Reset banner on new login 2017-03-31 10:00:40 -04:00
Matthew Taylor
d66e11fced Banner updates 2017-03-31 09:02:54 -04:00
Matthew Taylor
3a299e06f7 Merge pull request #1240 from TheGrits/patch-3 
Fix gh-1239: Update Conference Dates
 2017-03-22 08:32:54 -04:00
Matthew Taylor
e9f7748fdf Merge pull request #1243 from TheGrits/patch-4 
Fix gh-1242: Update Credits Page
 2017-03-16 11:57:11 -04:00
Matthew Taylor
0bb60700ba Merge pull request #1244 from mewtaylor/issue/opt-in 
[Develop] Hotfix: re-add checkbox to opt-in to email list for teacher
 2017-03-15 10:15:16 -04:00
Matthew Taylor
63c6bf59f2 Merge pull request #1149 from mewtaylor/issue/r2-4092 
For R2-4092: Add checkbox to opt-in to teacher emails
 2017-03-15 10:08:35 -04:00
The_Grits
c45663e966 Add Juanita Buitrago to Previous Members 2017-03-13 17:09:08 -04:00
The_Grits
f1880e47d5 Remove Juanita Buitrago 2017-03-13 17:08:39 -04:00
The_Grits
7e9a6ef410 Add, remove, and resort! (2) 2017-03-13 16:17:12 -04:00
The_Grits
b5cebffe11 Add, remove, resort! 2017-03-13 16:06:37 -04:00
The_Grits
715b05fbdf whoops 
12th not 15th
 2017-03-08 18:20:28 -05:00
The_Grits
1794b30079 Update dates 
Costa Rica dates were updated, plus fixed a gotcha with the China dates
 2017-03-08 18:18:22 -05:00
The_Grits
46a3cea40c Fix gh-1234: Update China Conference 2017-03-02 22:14:26 -05:00
Matthew Taylor
a170aec6d2 Merge pull request #1220 from TheGrits/patch-4 
Fix gh-1218: Community Moderator Page
 2017-02-28 09:38:44 -05:00
The_Grits
c26e42f715 Change parenthesis 2017-02-28 09:34:20 -05:00
Matthew Taylor
184947d3d9 Merge pull request #1215 from TheGrits/patch-3 
Fix gh-1214: Lowercase F in Family
 2017-02-24 13:40:53 -05:00
The_Grits
1ac7cd4b79 Bump Path 2017-02-23 12:29:23 -05:00
The_Grits
5eed0fe430 Remove sharing links 2017-02-23 12:14:40 -05:00
The_Grits
90aaf6140f Remove Back-End Engineer 2017-02-23 11:54:38 -05:00