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

839 commits

This branch
This branch
All branches
Author SHA1 Message Date
The_Grits
2a6f30cdb7 word-wrap for p elements 
Should fix #354, I'll test on a local machine.
 2016-02-05 07:59:09 -05:00
Technoboy10
e1b9cf5716 Removed Megan Haddadi, added Linda and Lily 2016-02-03 08:36:05 -07:00
Andrew Sliwinski
faa00982fd Merge pull request #349 from thisandagain/feature/oss 
Update license and add trademark notice
 2016-01-31 17:55:47 -05:00
Andrew Sliwinski
c76533bf38 Update license and add trademark notice 2016-01-31 13:07:21 -05:00
Andrew Sliwinski
6204b52479 WIP 2016-01-31 13:02:10 -05:00
Ray Schamp
cc48811e8f Merge pull request #348 from rschamp/feature/documentation-revision 
Revise focus of CONTRIBUTING, README
 2016-01-29 15:50:02 -05:00
Ray Schamp
755e24f7ad Merge pull request #343 from LLK/release/2.2.5 
Release/2.2.5 (develop)
 2016-01-29 15:48:10 -05:00
Ray Schamp
9ef6d43636 Merge pull request #347 from LLK/release/2.2.5 
Hotfix scratch-www 2.2.5 1
 2016-01-29 15:47:40 -05:00
Ray Schamp
0603b3b9df Merge pull request #346 from rschamp/bugfix/GH-3329 
Fix GH-345: Make carousel not so tall
 2016-01-29 15:26:10 -05:00
Ray Schamp
fd584b1d67 Heed some SCSS warnings 2016-01-29 15:22:06 -05:00
Ray Schamp
f90198d7c3 Fix tall carousel 
I am mystified by how this changed. But this fixes #345.
 2016-01-29 15:22:02 -05:00
morant
7c411845c2 Remove addition to HREF 2016-01-29 12:29:17 -05:00
Ray Schamp
96a8775482 Merge pull request #339 from LLK/release/2.2.5 
Release 2.2.5
 2016-01-28 15:59:52 -05:00
Ray Schamp
72e08d5b9a Revise focus of CONTRIBUTING, README 
Introduce the repo in README, and point people to guidelines more quickly in CONTRIBUTING, since that is linked to from the pages for new issues and new pull requests
 2016-01-28 13:07:58 -05:00
Matthew Taylor
43b39feb5e Merge pull request #340 from mewtaylor/issue/gh-337-accessibility 
Fix issue GH-337: accessibility
 2016-01-28 06:35:55 -05:00
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