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
Matthew Taylor
a44894be6d
Merge pull request #191 from mewtaylor/issue/95-message-notification-persists
...
WIP #95 – Reset `unreadMessageCount` state
2015-11-03 09:48:57 -05:00
Matthew Taylor
b2d05a996f
Reset unreadMessageCount state
...
1. When the component is unmounted
2. When the user's state changes to logged out
I think this should fix any state-side issues with the persistence for #95 .
2015-11-02 22:31:27 -05:00
Ray Schamp
d7112d7a29
Truncate commit SHA and use it for BUILD_ARCHIVE
2015-11-02 17:52:30 -05:00
Ray Schamp
e639470a58
Try to get nicer EB labels/archive names
...
Also using this to test Fastly purging
2015-11-02 17:13:29 -05:00
Andrew Sliwinski
ff00b0cd53
Merge pull request #197 from mewtaylor/issue/118-missing-translations
...
Add missing translations to `en.json`
2015-11-02 09:19:10 -05:00
Matthew Taylor
311c156947
Add missing translations to en.json
...
Also add `Search` to translatable strings
2015-10-30 10:05:08 -04:00
Andrew Sliwinski
d18799d221
Merge pull request #192 from thisandagain/bugfix/og
...
Update default og:image
2015-10-30 09:56:49 -04:00
Matthew Taylor
46742459bf
Add empty host for clear-cache proxy request
...
So that it actually goes to scratchr2, not scratch-api
2015-10-30 09:14:49 -04:00
Andrew Sliwinski
b466e53a8a
Align fastly and elastic beanstalk deployments
2015-10-29 18:53:37 -04:00
Andrew Sliwinski
c0907f34cd
Update default og:image
2015-10-29 18:40:56 -04:00
Andrew Sliwinski
18cd13701f
Merge pull request #186 from mewtaylor/issue/180-clear-homepage-cache
...
#180 – Use xhr to clear cache instead of form
2015-10-29 18:36:00 -04:00
Ray Schamp
a20fc32a42
Merge pull request #173 from thisandagain/feature/minify
...
Use Minified react & react-dom in production
2015-10-29 15:49:00 -04:00
Ray Schamp
f2872739da
Merge pull request #188 from thisandagain/bugfix/put
...
Block PUT, POST, and DEL requests
2015-10-29 15:48:40 -04:00
Ray Schamp
b08bb2aa20
Merge pull request #178 from rschamp/bugfix/GH-177
...
Fix GH-177: Lower z-index for banners to 9
2015-10-29 15:48:08 -04:00
Ray Schamp
ca5d004661
Merge pull request #176 from rschamp/bugfix/GH-91
...
Expand #view to wrap contents on small screens
2015-10-29 15:47:59 -04:00
Ray Schamp
d86c72a084
Switch branches for staging/production
...
This is a temporary change for the transition to the new production cluster. It should be reverted when we are using production as production (not staging)
2015-10-29 13:47:41 -04:00
Ray Schamp
102a220c21
Zip it, zip
2015-10-29 13:36:12 -04:00
Ray Schamp
365b934eec
Merge pull request #190 from LLK/develop
...
Release 2.2.2
2015-10-29 13:29:46 -04:00
Ray Schamp
036e4d53ee
Zip the directory, not nothing
2015-10-29 13:14:18 -04:00
Ray Schamp
6bc767dc15
Use the Travis build artifact for deployment
2015-10-29 13:04:42 -04:00
