Matthew Taylor
603a1336ce
Merge pull request #931 from TheGrits/patch-1
...
Fix gh-930: Update requirement string
2016-10-04 20:47:58 -04:00
Ray Schamp
4083479c9e
Merge pull request #944 from LLK/release/2.2.13
...
[Develop] Release 2.2.13
2016-10-04 15:48:24 -04:00
Ray Schamp
040d1a4d6f
Merge pull request #943 from LLK/release/2.2.13
...
[Master] Release 2.2.13
2016-10-04 15:48:11 -04:00
Matthew Taylor
6bcc7eeae3
Update make it fly hoc image to be higher res
...
Higher res AND SMALLER FILE SIZE?!?! This really is 2016. We live in an amazing time.
2016-10-03 16:40:57 -04:00
The_Grits
53e3e34a52
Update link, add reviewed date
2016-10-03 16:12:14 -04:00
Matthew Taylor
c44742e668
Slight content edits to hoc page
...
updates the studio links, and also fixes a link issue for the dance activity. Thanks @jwzimmer!
2016-10-03 16:04:19 -04:00
Ray Schamp
d3452ad256
Merge pull request #937 from rschamp/update-credits
...
Move Randy Jou to previous Scratch Team section
2016-10-03 11:40:11 -04:00
Ray Schamp
6fa1c13cfb
Move Randy Jou to previous Scratch Team section
2016-10-03 11:39:21 -04:00
Matthew Taylor
5c3cba2a89
Merge pull request #935 from mewtaylor/issue/gh-933
...
Fix GH-933: Put label for “Not Required” above input
2016-10-02 11:46:02 -04:00
Matthew Taylor
99cedec978
Put label for “Not Required” above input
...
Fixes #933
2016-09-30 15:02:05 -04:00
The_Grits
195930bc53
Merge!
2016-09-30 13:54:34 -04:00
The_Grits
d90f62c316
Create navigation.js
2016-09-30 13:48:57 -04:00
The_Grits
4413213caa
Fix #930 : Update requirement string
2016-09-28 08:10:11 -04:00
Tim Mickel
aea35c5b8c
Add ScratchJr to developers page
2016-09-26 11:57:52 -04:00
Ray Schamp
bf10176313
Merge pull request #926 from rschamp/hotfix/deploy-cache
...
[Master] Add Cache-Control header to all S3 uploads
2016-09-21 17:01:35 -04:00
Ray Schamp
1e7bd97987
Merge pull request #910 from rschamp/bugfix/787
...
Add Cache-Control header to all S3 uploads
2016-09-21 16:51:38 -04:00
jwzimmer
5245e93176
Merge pull request #920 from jwzimmer/issue/gh-590-initial-automated-test
...
Fix GH-590: initial automated test
2016-09-21 14:13:03 -04:00
jwzimmer
7b59953d84
removed console log statement accidentally left from testing
2016-09-21 10:45:55 -04:00
jwzimmer
e06cf2b134
simplify checking that the href is at the end of the url with ray's suggestion
2016-09-21 10:41:24 -04:00
Matthew Taylor
42b6e59443
Merge pull request #921 from mewtaylor/issue/gh-903-hoc
...
Implement GH-903: Update hoc page with new tutorials
2016-09-21 08:21:03 -04:00
Ray Schamp
162aa25856
Merge pull request #923 from LLK/hotfix/session-cookie
...
Remove interactions with session cookie
2016-09-20 19:52:08 -04:00
Matthew Taylor
0156fe8c77
Add cards for fly and make music
2016-09-19 15:59:40 -04:00
jwzimmer
867c95b382
travis checks
2016-09-19 13:11:24 -04:00
jwzimmer
57ab628337
check only the href, not the URL. i'm not sure this is a good way to do this. may be too convoluted.
2016-09-19 13:02:16 -04:00
Ray Schamp
2d22f6fa3d
Merge pull request #912 from rschamp/bugfix/http-only-session
...
Remove interactions with session cookie
2016-09-19 12:04:17 -04:00
jwzimmer
579ec72818
removed ^ prefix from selenium dev dependency
2016-09-15 14:10:47 -04:00
jwzimmer
eaaa2faf2a
replaced tab with 4 spaces
2016-09-15 13:28:17 -04:00
jwzimmer
eb788acac0
require statements on separate lines and travis check failires
2016-09-15 13:22:53 -04:00
Matthew Taylor
cd6a60e5b8
Change bearstack/bball to hide and dance
...
Also make updates to style scoping based on feedback from @rschamp
2016-09-15 11:44:33 -04:00
jwzimmer
e21a2eadb1
Added selenium to devDependencies using npm install --save-dev
2016-09-15 11:40:46 -04:00
jwzimmer
3855926a15
Tried to fix the errors for travis check, but wasn't sure how to handle some of them
2016-09-15 10:36:47 -04:00
Matthew Taylor
f4b0b26b5c
make multiline formatting for img uniform
2016-09-15 08:21:38 -04:00
Matthew Taylor
469d7a35bb
Update hoc page with new tutorials
...
Adds:
1. Make it Fly
2. Make Music
Removes:
1. Hide-and-Seek
2. Dance, Dance, Dance
2016-09-15 08:15:37 -04:00
jwzimmer
052819f8c5
Clarified inline comments
2016-09-14 15:33:45 -04:00
jwzimmer
a49d209c29
folder and file for the initial automated test, checking the navbar create link URL is correct
2016-09-14 15:28:45 -04:00
Matthew Taylor
974b364a23
Merge pull request #919 from TheGrits/patch-1
...
Fix gh-918: Update Video Link
2016-09-14 09:43:33 -04:00
The_Grits
2b2f4a03e8
Fix lint
2016-09-13 11:49:34 -04:00
The_Grits
68d37e0506
Update Video Link
...
As per @sleggss on #918
2016-09-13 11:41:39 -04:00
Ray Schamp
60f0ee1ded
Merge pull request #913 from rschamp/bugfix/empty-bodies
...
Don't set state to undefined API response bodies
2016-09-12 13:52:54 -04:00
Matthew Taylor
bd911c52d1
Merge pull request #867 from morantsur/feature/microworlds
...
Adding routes to microworlds
2016-09-12 12:06:27 -04:00
Ray Schamp
3efa1fd7c8
Merge pull request #911 from rschamp/feature/html-webpack-plugin
...
Use html-webpack-plugin for html rendering
2016-09-09 15:52:52 -04:00
Ray Schamp
b40da9060b
Merge pull request #912 from rschamp/bugfix/http-only-session
...
Remove interactions with session cookie
2016-09-09 10:02:32 -04:00
Ray Schamp
fb3de8526a
Don't try to output HTML for redirect routes
2016-09-09 09:34:36 -04:00
Ray Schamp
c274de7295
Make template variables a bit less verbose
...
Move the rest of the configuration into template-config.js. This way the options are explicitly in the same namespace so we won't be surprised when we add a variable with the same name as an html-webpack-plugin option.
Rename template extension to ejs for syntax-coloring purposes.
2016-09-09 09:21:03 -04:00
Ray Schamp
3256164fdf
Merge pull request #910 from rschamp/bugfix/787
...
Add Cache-Control header to all S3 uploads
2016-09-08 17:46:58 -04:00
Ray Schamp
b5870e006d
Reduce cache expiration to one hour
2016-09-08 17:36:57 -04:00
Ray Schamp
c0eb1608bd
Don't set state to undefined API response bodies
...
This resolves the "Cannot read property 'x' of undefined" errors that occur when the API returns non-JSON responses. For instance if the proxy endpoints return 500 error responses from scratchr2.
2016-09-08 17:23:49 -04:00
morant
89faccfc6f
Remove caret from routhAlias
2016-09-08 17:06:24 -04:00
Ray Schamp
e44e958fe0
Move permissions storage to client-side cookie
...
Instead of retrieving the permission from the session cookie, store permission data from /session/, and cache it in a cookie. On subsequent page loads, the permission information will be retrieved from the cookie more quickly than the /session/ endpoint returns. When the session changes, the cookie and permissions state is updated to reflect the new state.
2016-09-08 12:53:05 -04:00
Ray Schamp
a497fed338
Remove token storage
...
We're not using it yet, and it won't be coming from the cookie when we do.
2016-09-08 12:48:07 -04:00
