Commit graph

6050 commits

Author SHA1 Message Date
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
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
32de8170b1 Merge pull request #1345 from LLK/revert-1339-revert-explore
Revert "[Master] Revert PR #1324"
2017-06-09 16:37:47 -04:00
Matthew Taylor
629a784335 Merge pull request #1344 from LLK/revert-1338-revert-explore
Revert "[Develop] Revert PR #1324"
2017-06-08 15:41:45 -04:00
Matthew Taylor
7a958f0326 Revert "[Master] Revert PR #1324" 2017-06-08 15:31:37 -04: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
42c4ce0f73 Merge pull request #1339 from rschamp/revert-explore
[Master] Revert PR #1324
2017-06-02 14:37:57 -04:00
Ray Schamp
ce234260b0 Merge pull request #1338 from rschamp/revert-explore
[Develop] Revert PR #1324
2017-06-02 14:28:43 -04:00
LiFaytheGoblin
5a77a5b1a6 changed regular expression in routes.json to make all conference websites have the title Scratch Conference, instead of Scratch - Imagine, Program, Share. 2017-06-02 20:18:08 +02: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
LiFaytheGoblin
0c2da0e689 Removed unnecessary hashtags in new headings. 2017-06-02 19:56:49 +02:00
The_Grits
c29dde59a1 Update download.scss 2017-06-02 08:13:29 -04:00
Matthew Taylor
8c1bfe0452 Merge pull request #1336 from LLK/release/2.2.21
[Master] Release 2.2.21
2017-06-01 19:07:18 -04:00
LiFaytheGoblin
044b89f4ab Readme update for windows users who have difficulties getting the standalone web client to work 2017-05-27 17:47:55 +02: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
e7c04044ae remove ?$ from search expressjs expression
I don’t see a reason for this to be here, and it’s breaking the build with the explore change
2017-05-24 17:33:55 -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
jwzimmer
56b46fd861 Issue/gh 1013 remove end to end testing package dependencies from repo (#1319)
* remove selenium from package.json

* Add package.json & README for the integration directory

* add newline at end of file

* add chromedriver dependency
2017-05-24 10:12:37 -07:00
jwzimmer
bb5657587e Fix issue/gh 1313 by adding test to check for missing string ids (#1314)
* test for missing string ids

* Switched to multiple tests (1 per intl page) and changed comment style

* Add back in comment I accidentally . Add comment for the function.

* Change variable names, call function in-line
2017-05-24 10:11:07 -07:00