scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
433 commits 216 branches 1 tag 464 MiB
Commit graph

433 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Sliwinski
731f6a93d4 Merge pull request #242 from mewtaylor/update-dependencies 
Version Bump: Upgrade react modules for 0.14 compatibility
 2015-11-18 20:14:40 -05:00
Andrew Sliwinski
87dd5e7bf3 Migrate static images for about view 2015-11-18 20:09:29 -05:00
Andrew Sliwinski
82eedaaf13 Resolve merge conflicts 2015-11-18 20:06:54 -05:00
Andrew Sliwinski
8a2ac5f24e Resolve lint errors 2015-11-18 20:06:05 -05:00
Andrew Sliwinski
f2561fbc03 Migrate about view. Resolves GH-63 2015-11-18 19:57:07 -05:00
Matthew Taylor
ebd2c080c8 Upgrade react modules for 0.14 
They are now completely 0.14 compatible, so we can remove our port'd versions now.
 2015-11-16 09:58:18 -05:00
Matthew Taylor
810602fa1d Merge pull request #235 from mewtaylor/issue/228-donate-link 
#228 – donate link point to scratch foundation, not code to learn
 2015-11-13 14:10:02 -05:00
Matthew Taylor
15641ee244 scratch foundation, not code to learn 2015-11-13 10:07:28 -05:00
Ray Schamp
b32019ab5f Merge pull request #234 from LLK/develop 
Sentry hotfix
 2015-11-12 17:34:06 -05:00
Ray Schamp
e5b3e4f514 Merge pull request #233 from rschamp/bugfix/sentry-dsn 
Split CLIENT_ and NODE_ SENTRY_DSN vars
 2015-11-12 17:05:34 -05:00
Ray Schamp
8536006416 Split CLIENT_ and NODE_ SENTRY_DSN vars 2015-11-12 17:00:19 -05:00
Ray Schamp
2596dc04d8 Merge pull request #227 from LLK/2.2.3-hotfix 
2.2.3 hotfix
 2015-11-12 14:28:35 -05:00
Ray Schamp
7ed45cb5dd Stop spinner and display XHR errors if they occur 
Resolves GH-232
 2015-11-12 12:49:40 -05:00
Ray Schamp
c15b6a9681 Remove headers entirely to avoid XDR error 
Even "no headers" is seen as setting headers to IE.
 2015-11-12 10:44:17 -05:00
Ray Schamp
7c0363e99b Merge pull request #211 from rschamp/bugfix/GH-195 
Fix GH-195: Use a spinner component to convey activity while logging in
 2015-11-11 11:11:02 -05:00
Ray Schamp
e25eb1fc90 Merge pull request #225 from rschamp/bugfix/GH-224 
Use XDR when making cross-origin api requests
 2015-11-11 11:10:23 -05:00
carljbowman
9d8129f3c5 Merge pull request #226 from carljbowman/HOC-content-update 
Update HOC tutorials and linking
 2015-11-10 18:42:54 -08:00
carljbowman
4cfd7cc02e Add new backgrounds for Dance and Name 2015-11-10 16:20:48 -08:00
carljbowman
37843fa3a2 Merge branch 'develop' of github.com:LLK/scratch-www into HOC-content-update 2015-11-10 16:12:55 -08:00
Ray Schamp
a8a05c4fdc Merge pull request #220 from rschamp/bugfix/activity-key-warnings 
Quiet warnings about keys in Activity component
 2015-11-10 14:55:02 -05:00
Ray Schamp
09d9d194cf Merge pull request #221 from rschamp/feature/sentry 
Log Javascript errors to Sentry
 2015-11-10 14:43:59 -05:00
carljbowman
96b1dba277 Update HOC tutorials and linking 
- Swapped Pong Game with B-Ball Hoops
- Changed Bearstack Story's thumbnail to clear up confusion around similar thumbnails
- Added 'B-Ball Hoops' to localization JSON
- Added anchor link to resource section for easy acess.
 2015-11-10 10:58:08 -08:00
Ray Schamp
51734e4f1e Use XDR when making cross-origin api requests 
Fixes GH-224. IE < 10 needs to use "cross domain requests" for cross-origin XHR requests.  These don't support custom headers which doesn't affect us at the moment, but might become annoying later.
 2015-11-10 13:33:06 -05:00
Matthew Taylor
ca10232498 Clean up build-locales and add tests for it. 
1. Use md5 compare instead of string compare for determining presence of translation
2. Strip out whitespace before doing md5 compare
 2015-11-09 11:40:36 -05:00
Ray Schamp
aa2eeab353 Log Javascript errors to Sentry 2015-11-06 17:08:50 -05:00
Ray Schamp
958497cf1d Merge pull request #219 from LLK/release/2.2.3 
Release 2.2.3 – HOC
 2015-11-06 12:22:44 -05:00
Ray Schamp
ae8c25e2c4 Update sass-lint 
This reverts commit bad6e1cca6.
 2015-11-06 11:52:16 -05:00
Ray Schamp
bad6e1cca6 sass-lint pls 2015-11-06 11:46:47 -05:00
Ray Schamp
5dc6cd220d Quiet warnings about keys in Activity component 2015-11-06 11:36:35 -05:00
Andrew Sliwinski
35a3e4c192 Merge pull request #216 from rschamp/bugfix/GH-128 
Fix GH-128: Use table layout in IE 9 for navigation and homepage
 2015-11-06 10:14:22 -05:00
Ray Schamp
b1694c1adc Fix GH-128 again: use table layout for IE 9 2015-11-05 19:33:02 -05:00
Ray Schamp
bfaccaaed4 Fix navigation for IE9 2015-11-05 18:42:16 -05:00
Ray Schamp
0420457bdc Use blue for the spinner color. H/t @carljbowman 2015-11-04 14:30:58 -05:00
Matthew Taylor
1d9be73aed Merge pull request #213 from mewtaylor/issue/212-wrong-link-dance-studio 
212 – Fix HOC links
 2015-11-04 10:35:28 -05:00
Matthew Taylor
21e1e73c95 Fix HOC links 
bearstack, dance studio
 2015-11-04 10:33:26 -05:00
Matthew Taylor
a5e6ea4a61 Merge pull request #189 from mewtaylor/feature/hoc 
Update hoc page formatting
 2015-11-04 06:22:45 -05:00
Matthew Taylor
a76d972bd0 Merge pull request #210 from rschamp/bugfix/GH-128 
Fix GH-128: Make video float right of the intro
 2015-11-04 00:08:26 -05:00
Matthew Taylor
ad8d32474f Update HOC page with new mobile, styling & content 
Mobile styling is from the frameless framework from #198 (ht @rthorn!). Localization also in as well.

Use `white-space: normal` instead of `inline-block`

Prep for componetizing Sub-Nav

- Fixed top banner extra margin
- Updated HTML containers and SCSS

Add subnavigation component

Added more content

- More projects (still need photos)
- Added section about Studios (need to create links to studios)

WIP: adding frameless to HOC page

Remove Grid elements on Sections

Made the implmentation more granular with breakpoints in mind.

More formatting adjustments

Cards in box now working.

Update responsive behavior and spacing

Updated all elements to respond to new grid system breakpoints.

Update content and organize HOC assets

- Added studios section with studio elements
- Reorganized the image assets for HOC 2015

Fix SCSS linting errors

Update addtional activities photo assets

Generalize `info` class on subnav

Move onto one line

left-align single-column studio links

Add strings for localization

Some rebase conflicts

Code review feedback

ht @thisandagain!

Fix alignment of studios

Keep `inline-block` for mobile
 2015-11-03 23:50:51 -05:00
Ray Schamp
6f50282fc3 Lint 2015-11-03 19:02:28 -05:00
Ray Schamp
1304f9e7ba Use a Spinner to convey activity when logging in 
Resolves GH-195
 2015-11-03 18:47:10 -05:00
Ray Schamp
f97e3f51ee Add Spinner component 
Using one found on http://tobiasahlin.com/spinkit/ for now. @carljbowman please help
 2015-11-03 18:45:38 -05:00
Ray Schamp
40b5727613 Fix GH-128: Make video float right of the intro 2015-11-03 15:20:05 -05:00
Andrew Sliwinski
b4e7eaa94e Merge pull request #207 from rschamp/feature/make-deploy 
Add `deploy` make target
 2015-11-03 15:18:14 -05:00
Ray Schamp
86b4e8aa66 Merge pull request #208 from thisandagain/release/hotfix 
Hotfix
 2015-11-03 13:46:47 -05:00
Andrew Sliwinski
1232628df4 Merge branch 'master' of github.com:llk/scratch-www into release/hotfix 2015-11-03 13:21:07 -05:00
Andrew Sliwinski
deb9e8a311 Merge pull request #206 from thisandagain/bugfix/199 
Bind server environment to `window`
 2015-11-03 13:15:16 -05:00
Ray Schamp
b278aa05f5 Add deploy make target 
Now that we send the build artifact to EB from Travis, we have to do the same thing locally.
 2015-11-03 12:51:45 -05:00
Andrew Sliwinski
f247761390 Merge branch 'develop' of github.com:llk/scratch-www into bugfix/199 2015-11-03 10:49:39 -05:00
Andrew Sliwinski
06de644ae6 Remove ./src/environment from Webpack config and bind environment to window. Resolves GH-199. 2015-11-03 10:49:32 -05:00
Andrew Sliwinski
0bfd6e1430 Update environment defaults 2015-11-03 10:44:56 -05:00