scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-13 01:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2574 commits 220 branches 1 tag 508 MiB
Commit graph

2574 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
15c11acaf3 Merge pull request #334 from rschamp/feature/deploy-hotfix-release-branches 
Deploy hotfix and release branches to staging
 2016-01-25 09:34:38 -05:00
Matthew Taylor
c46e42e83c fix test 2016-01-25 09:07:55 -05:00
Matthew Taylor
581f071c0e Add missing alt tags 2016-01-25 08:30:10 -05:00
Ray Schamp
478fb499a7 Deploy hotfix and release branches to staging 2016-01-22 11:55:49 -05:00
Matthew Taylor
75ea8a7304 Merge pull request #329 from mewtaylor/bugfix/localize-nonlocalized-views 
Add general localizations to nonlocalized pages
 2016-01-22 10:25:09 -05:00
Matthew Taylor
1ad1380eff simplify to one loop 
thanks @rschamp!
 2016-01-22 10:16:18 -05:00
Matthew Taylor
73875552a0 Merge pull request #330 from mewtaylor/issue/gh-322-typeerror 
Fix GH-322: surround redirect check in try/catch
 2016-01-20 15:56:43 -05:00
Matthew Taylor
41c23f76c0 Get rid of superfluous checks 
thanks @rschamp!
 2016-01-20 14:01:51 -05:00
Matthew Taylor
e85563c96e surround redirect check in try/catch 
based on the suggestion by @rschamp!
 2016-01-20 08:36:05 -05:00
Matthew Taylor
2e79a5aa6b Merge pull request #323 from mewtaylor/bugfix/readme-update 
Added some more documentation
 2016-01-19 16:11:49 -05:00
Matthew Taylor
5858bb94bb Added a bit more info on what csrf does 
Thanks @rschamp for the suggestion!
 2016-01-19 16:04:08 -05:00
Matthew Taylor
a0d92dacfc Add general localizations to nonlocalized pages 
For nav/footer purposes.
 2016-01-19 15:52:42 -05:00
morant
6e682269fb Align tips slider with the rest of the studios 2016-01-15 12:23:39 -05:00
morant
f7fe1125c8 fix play button positioning 2016-01-15 11:40:21 -05:00
Matthew Taylor
5e055fb6ea Merge pull request #321 from mewtaylor/issue/scratchr2-3245-logout-post 
Change logout to do a POST request
 2016-01-15 11:23:44 -05:00
Matthew Taylor
923186d533 Merge pull request #326 from mewtaylor/issue/324-dropdown-hidden 
Fix GH-324: import `main.scss` in render.jsx
 2016-01-14 22:25:17 -05:00
Matthew Taylor
49f6f734ba Merge pull request #327 from mewtaylor/issue/gh-325-caching 
Fix GH-325: Make template caching strong
 2016-01-14 22:24:52 -05:00
Matthew Taylor
a53aa67d21 Make template caching strong 
Fixes #325
 2016-01-14 15:54:10 -05:00
Matthew Taylor
7303b7963b import main.scss in render.jsx 
Fallout from #305, fixes #324
 2016-01-14 14:55:24 -05:00
Matthew Taylor
dddc867c1e Merge pull request #319 from mewtaylor/feature/gh-288-accessibility 
GH-288: accessibility
 2016-01-14 10:27:29 -05:00
Matthew Taylor
112cad14e3 Added some more documentation 2016-01-14 10:25:03 -05:00
Matthew Taylor
9e58efc7e2 Merge pull request #305 from mewtaylor/feature/266-componentize-locale-strings 
GH-266: view-ify locale strings
 2016-01-14 10:10:02 -05:00
Matthew Taylor
98d0f0de6e Updates based on feedback 
1. changes intl filenames to `[view].intl.js`
2. Move nav/footer rendering to `render.jsx`
3. Set locale cookie before submitting language change form

Thanks @thisandagain !
 2016-01-14 08:32:43 -05:00
Matthew Taylor
4f704a3a4b Make error output optional for filestream 2016-01-14 08:14:38 -05:00
morant
d002e0c63a Turn microworld to a component, and create paths to all three microworlds 2016-01-13 14:21:59 -05:00
Matthew Taylor
ab53122e76 Merge pull request #320 from mewtaylor/issue/gh-297-credits-link 
Fix credits link
 2016-01-13 14:18:14 -05:00
Matthew Taylor
a15842a582 Add back in the session refresh 
Thanks @thisandagain!
 2016-01-13 13:36:36 -05:00
morant
793b8c025d remove unneeded imports, and show design studio without a propmpt project as a carousel 2016-01-13 12:32:53 -05:00
Matthew Taylor
f00d07b0bf edit all indentation 
ht @thisandagain!
 2016-01-13 11:52:38 -05:00
Matthew Taylor
31d4173ef5 Change logout to do a POST request 2016-01-13 11:36:04 -05:00
Matthew Taylor
592f66c9a8 Fix credits link 
Fixes #297
 2016-01-13 10:35:26 -05:00
Matthew Taylor
2ac3e5337f Add alternative labels for input and links 
See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_01
 2016-01-12 13:27:36 -05:00
Matthew Taylor
01975b7e4d Add alt attribute to image tags 
See https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02
 2016-01-12 13:27:09 -05:00
Matthew Taylor
4821383d00 Merge pull request #315 from mewtaylor/issue/gh-289-overlapping-text 
Fix GH-289: Allow white space to wrap in welcome text
 2016-01-12 10:30:02 -05:00
Andrew Sliwinski
029a27dcce Merge pull request #318 from thisandagain/bugfix/316 
Fix error in parsing count from updated API route
 2016-01-12 08:12:42 -05:00
Andrew Sliwinski
3721ecfd14 Fix error in parsing count from updated API route. Re: GH-316 2016-01-11 19:10:38 -05:00
morant
2cf6befeaf add hip hop and fashion JSONs, and minor fixes to microworlds.jsx 2016-01-11 18:38:15 -05:00
Matthew Taylor
c88fc6f27d Make general nowrap more specific to paragraphs 
And remove the overrides that were already there. ht @rschamp and @carljbowman!
 2016-01-11 14:58:55 -05:00
Andrew Sliwinski
04766a82af Merge pull request #317 from thisandagain/bugfix/316 
Migrate to new API route for message count
 2016-01-11 14:23:05 -05:00
Andrew Sliwinski
86c93df740 Migrate to new API route for message count. Resolves GH-316 Resolves GH-95 2016-01-11 14:13:34 -05:00
Matthew Taylor
d578d4a800 Allow white space to wrap in welcome text 
It's in an href, so override the default and include wrapping. Fixes #289.
 2016-01-11 09:11:13 -05:00
Matthew Taylor
4ab7cfef6b Merge pull request #314 from mewtaylor/issue/gh-251-ban-undefined 
Fix GH-251: log error for session request if there
 2016-01-11 08:26:54 -05:00
Matthew Taylor
1382fc48f6 log error for session request if there 
And only try to update the session if a body is present
 2016-01-11 08:15:08 -05:00
morant
6aa93b1711 Error Handling - when a component isn't declared, don't show it. 2016-01-08 18:35:17 -05:00
morant
2593d7aaf5 Generic version of the Microworlds. 
No arts specific features anymore.
Still fails when a component is missing
 2016-01-08 16:18:51 -05:00
morant
cca175154c First version of generic microworlds. 
Reads videos information from JSON, other parts still not generic.
 2016-01-08 14:43:39 -05:00
morant
5c919506cf Add tips 2016-01-08 14:42:35 -05:00
Matthew Taylor
ceec694b2a Revert "Migrate to using a loader method" 
This reverts commit 214430b0c4.
 2016-01-08 13:50:58 -05:00
Matthew Taylor
214430b0c4 Migrate to using a loader method 
This moves all locale/translation building to a dependency, `scratch-www-intl-loader`, as well as tests associated with it. Also gets rid of the `make translations` step.
 2016-01-07 17:01:57 -05:00
Matthew Taylor
d5ffd9fcc0 Flatten messages for components into one object 
thanks @rschamp!
 2016-01-07 11:02:14 -05:00