scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2025 commits 218 branches 1 tag 463 MiB
Commit graph

2025 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Ray Schamp
3f90e98593 Merge pull request #1413 from rschamp/hotfix/rip-smartystreets 
[Master] Remove SmartyStreets API
 2017-07-13 16:32:51 -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
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
chrisgarrity
f1cfeeca81 Merge pull request #1390 from chrisgarrity/issue/gh1387 
Add /info redirect
 2017-06-29 07:33:07 -04:00
chrisgarrity
ed056701c4 Add /info redirect 2017-06-28 17:25:36 -04:00
The_Grits
5570632ed3 Help -> Tips 2017-06-28 16:54:42 -04:00
chrisgarrity
0672ba0e05 Merge pull request #1383 from chrisgarrity/issue/windows7-icon 
Fix blocks icon for windows
 2017-06-28 10:18:00 -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
d2353075b1 Merge pull request #1368 from LLK/hotfix/chromeos 
Update compatibility requirements to clarify support for ChromeOS
 2017-06-26 11:19:38 -04:00
Matthew Taylor
970db19b44 Merge pull request #1370 from mewtaylor/issue/r2-4571 
Add `/store` to footer
 2017-06-26 10:48:24 -04:00
Matthew Taylor
b22aaa8465 Add /store to footer 2017-06-26 10:35:29 -04:00
Andrew Sliwinski
16691792b7 Merge pull request #1369 from LLK/bugfix/chromeos 
Update compatibility requirements to clarify support for ChromeOS
 2017-06-26 09:48:33 -04:00
Andrew Sliwinski
a16a189a7f Update compatibility requirements to clarify support for ChromeOS 2017-06-26 09:42:56 -04:00
Andrew Sliwinski
c7fcec4f54 Update compatibility requirements to clarify support for ChromeOS 2017-06-26 09:29:52 -04:00
Matthew Taylor
df2b7fd7df Merge pull request #1367 from mewtaylor/issue/gh-1364 
Fix GH-1364: Change `help` to `tips` in footer
 2017-06-23 16:39:19 -04:00
chrisgarrity
6469ac3362 Simplify /help redirect pattern (#1366) 
Restrict /help redirect to just `/help` or `/help/`. Anything else following help should get handled by scratchr2.
 2017-06-23 12:02:15 -04:00
Matthew Taylor
c1e5c7cb03 Change help to tips in footer 
Fixes #1364
 2017-06-23 11:55:43 -04:00
chrisgarrity
39b1400705 Handle /help redirect (#1363) 2017-06-23 10:28:34 -04:00
Matthew Taylor
80ae291b9d Merge pull request #1365 from mewtaylor/issue/download-tweaks 
Tweak some styling for the download page
 2017-06-23 09:51:36 -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
Matthew Taylor
dd923aa586 change download route 2017-06-22 10:57:30 -04:00
Matthew Taylor
b0a81d24d2 add download tx config 2017-06-22 10:57:19 -04:00
Matthew Taylor
6225ddbaf3 update .tx/config with new file changes 
1. Remove ttt
2. Add tips
 2017-06-22 10:35:17 -04:00
Andrew Sliwinski
124c8e36d7 Update navigation. Resolves GH-1262 (#1285) 2017-06-22 09:40:34 -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
chrisgarrity
df15cb9dfb Install c++ compiler to build native extensions (#1360) 
The ubuntu image that we’re using doesn’t include a C++11 compliant compiler. Followed Travis instructions to install a compiler:
https://docs.travis-ci.com/user/languages/javascript-with-nodejs#Node.js-v4-(or-io.js-v3)-compiler-requirements
 2017-06-21 13:08:11 -04:00
jwzimmer
bc84e2c95a Fix issue/gh 1274 by adding a test for the statistics page (#1317) 
* added a test for the stats page

* add newline at end of file

* added additional tests for more charts on the stats page

* fixed starting URL value (should be staging, not prod)

* Put close parens on new lines

* change comment style

* Add waits to prevent intermittent failure

* Switch root url back again to staging

* try new style of test & remove breaking tests

* moving away from t.ok

* check for class value rather than t.ok

* remove comments, use correct comment style, note not testable on staging atm

* add messages for tests

* more arrow functions
 2017-06-21 09:48:22 -07:00
Matthew Taylor
af01f7fce1 Merge pull request #1358 from mewtaylor/issue/store 
[Master] Hotfix: Add redirect for store
 2017-06-20 22:36:52 -04:00
Matthew Taylor
2c7cc52a70 Merge pull request #1359 from mewtaylor/issue/store 
[Develop] Hotfix: add redirect for store
 2017-06-20 15:37:35 -04:00
Matthew Taylor
73b88c850b Add redirect for store 2017-06-20 14:38:14 -04:00
chrisgarrity
10623c3857 Add dependency for node-dir 0.1.16 (#1354) 
FIxes problem where webpack wasn’t copying static or intl to the build directory.

Gory details:
node-dir is a dependency of copy-webpack-plugin. If you don’t already have it installed, the latest version (0.1.17) gets installed and that one breaks copy-webpack (https://github.com/fshost/node-dir/issues/50). Webpack build will complete. but there will be an error `ERROR in this is not a typed array.` We didn’t see it earlier because node-modules are cached.
 2017-06-20 12:17:39 -04:00
Matthew Taylor
77a503dc7b Merge pull request #1329 from LiFaytheGoblin/update-readme/information-for-windows-users 
Readme update for running standalone client on Windows
 2017-06-20 09:30:43 -04:00
Matthew Taylor
19a015cc8a Merge pull request #1353 from mewtaylor/issue/gh-1351 
Fix GH-1351: Make version dependent on xml call
 2017-06-20 09:29:11 -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
670633a459 s/view/redirect 
thanks @chrisgarrity :)
 2017-06-19 11:35:33 -04:00
Matthew Taylor
49a52b634c add background gray for installation process 2017-06-19 11:35:15 -04:00
Matthew Taylor
6e995eb65d Merge pull request #1340 from LiFaytheGoblin/fix_issue/gh-1188_browser_to_display_Scratch_Conference 
Fix issue/gh 1188 changes to routes.json to make browser tab show correct conference page title
 2017-06-19 10:45:49 -04:00
LiFaytheGoblin
b4320b5807 Fixed prior mistake of changing regular expression in routes.json and edited webpack.config.js: I switched the order of the object with the title and require template-config.js. This will lead to the page titles to be set properly. 2017-06-19 10:22:55 +02:00
Matthew Taylor
cf863fb3d3 point links at /download 2017-06-16 10:14:01 -04:00