scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-22 21:42:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11119 commits 222 branches 1 tag 526 MiB
Commit graph

11119 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
0816b0ec0f Clarify username field is not for logging in 2016-06-30 16:16:31 -04:00
Connor Hudson
7f3af0f8be Merge pull request #639 from technoboy10/gh637-relativepaths 
Fix GH-637: Make links to help and tips window relative
 2016-06-30 15:57:43 -04:00
Ray Schamp
a0a82ef5a7 Merge pull request #646 from rschamp/bugfix/608 
Fix localization of address validation message
 2016-06-30 15:55:26 -04:00
Ray Schamp
d91bac94bb Merge pull request #644 from mewtaylor/issue/gh-643-null-redux 
Fix GH-643: use empty string if no cookie value found
 2016-06-30 15:54:50 -04:00
Ray Schamp
554e21cd15 Fix localization of address validation message 
Fixes #608
 2016-06-30 15:54:32 -04:00
Matthew Taylor
5cc6eb3ecb use empty string if no cookie value found 
redux doesn't like getting null values for actions, so give empty ones

/cc @rschamp
 2016-06-30 15:29:53 -04:00
Matthew Taylor
300831c1e1 Merge pull request #641 from mewtaylor/issue/gh-636-tfaq-link 
Fix GH-636: point landing page to teacher faq page
 2016-06-30 13:48:57 -04:00
Matthew Taylor
2017e1573d point landing page to teacher faq page 
Fixes #636
 2016-06-30 13:37:12 -04:00
Matthew Taylor
5976c566cf Merge pull request #640 from mewtaylor/issue/gh-626-empty-banner 
Fix GH-626: Set null contents to null instead of error throw
 2016-06-30 13:19:19 -04:00
Matthew Taylor
04aa7e01ef check for the null value in get 
thanks @rschamp!
 2016-06-30 11:40:05 -04:00
Matthew Taylor
794c3e2cba Set null contents to null instead of error throw 
Before, if a cookie didn't exist, it would throw an error, not causing permissions/tokens to change to empty values. This fixes that (and #626) by setting the value to undefined instead.
 2016-06-30 11:27:46 -04:00
Technoboy10
b5bf0298d7 Make s.m.e links relative 2016-06-30 10:06:10 -04:00
Connor Hudson
4ef6b22b05 Merge pull request #638 from technoboy10/fix-youtube 
Fix #633, #634, and #635: Embedded player fixes
 2016-06-30 09:54:21 -04:00
Technoboy10
088eb7cc66 inherit width on iframe 2016-06-30 09:46:39 -04:00
Technoboy10
b0f0bce211 enable fullscreen, fix border radius and aspect ratio 2016-06-30 09:43:24 -04:00
Matthew Taylor
1045e6219e Merge pull request #632 from mewtaylor/issue/gh-618-login-style 
Fix GH-617: switch ordering in defaults
 2016-06-30 08:04:02 -04:00
Matthew Taylor
f2b8e9025d switch ordering in defaults 
This was assigning `props` to defaults, rather than the other way around. Fixes #618.
 2016-06-30 08:00:40 -04:00
Matthew Taylor
d973d905c2 Merge pull request #631 from mewtaylor/issue/gh-618-login-style 
Fix GH-618: Override devault input style for login
 2016-06-29 15:03:45 -04:00
Matthew Taylor
b874d05bda Override devault input style for login 
so that it looks like it used to, and not to tall. Fixes #618.
 2016-06-29 14:54:00 -04:00
Matthew Taylor
d82783fed5 Merge pull request #630 from mewtaylor/issue/gh-627-error-reg 
Fix GH-627: style error-step like last-step
 2016-06-29 14:15:28 -04:00
Matthew Taylor
9fb6170569 style error-step like last-step 
Since they're both mostly info cards. Fixes #627.
 2016-06-29 14:08:16 -04:00
Connor Hudson
9bafdf6067 Merge pull request #619 from technoboy10/darken-dropdown 
Darken Account Nav Link when Menu Open
 2016-06-29 13:31:27 -04:00
Technoboy10
41d9b1f526 use classNames before return 2016-06-29 13:24:37 -04:00
Matthew Taylor
1422c3938d Merge pull request #629 from mewtaylor/issue/gh-625-faq-404 
Fix GH-625: fix educator faq link
 2016-06-29 12:37:28 -04:00
Matthew Taylor
8f60b020cb fix educator faq link 
`info` is not in there anymore
 2016-06-29 12:35:53 -04:00
Matthew Taylor
af1013635e Merge pull request #624 from mewtaylor/issue/gh-623-reg-icon 
Fix GH-623: Add link to splash page around registration icon
 2016-06-29 11:01:57 -04:00
Matthew Taylor
19bbd5ae7b Link icon to splash page 
fixes #623
 2016-06-29 10:53:55 -04:00
Connor Hudson
42ccc6c0a0 Merge pull request #622 from technoboy10/gh620-coming-soon 
Fix GH-620: Replace "Request account" with "Coming Soon"
 2016-06-29 10:41:28 -04:00
Technoboy10
ce4069fdb1 tweak padding 2016-06-29 09:56:15 -04:00
Technoboy10
db039739dd change request account button to coming soon 2016-06-29 09:51:23 -04:00
Connor Hudson
221170a9ff Merge pull request #616 from technoboy10/gh537-dropdown-gap 
Fix GH-537: Logged-in user dropdown gap
 2016-06-29 08:58:16 -04:00
Matthew Taylor
fa5551ac0d Merge pull request #615 from mewtaylor/bugfix/teacher-banner-login 
[Bugfix] Add permissions dispatch for `WillReceiveProps`
 2016-06-29 08:55:21 -04:00
Technoboy10
52d834c3fa darken account nav link when menu open 2016-06-28 21:10:33 -04:00
Matthew Taylor
7bb52c25fe move permissions checks to mirror session more 
thanks @rschamp!
 2016-06-28 14:25:11 -04:00
Technoboy10
c4a98c5571 close gap, use border-box for box-sizing 2016-06-28 13:50:58 -04:00
Matthew Taylor
f2310170b2 Add permissions dispatch for WillReceiveProps 
We still need `componentWillMount` to handle the initial render for a logged in teacher first visting the page. Fixes issue in which a teacher would not see the banner immediately after dynamic login.
 2016-06-28 13:30:36 -04:00
Matthew Taylor
16fe86b2fd Fix scratch ed links 
they are not domain agnostic. fyi @rschamp
 2016-06-28 08:35:01 -04:00
Matthew Taylor
c5f85022f3 Copy edits for conference site 2016-06-28 07:51:49 -04:00
Matthew Taylor
91de6f7912 Merge pull request #614 from mewtaylor/issue/gh-611-teacher-banner 
Fix GH-611: Connect `TeacherBanner` to redux
 2016-06-27 22:40:13 -04:00
Connor Hudson
afccf3caa9 Merge pull request #612 from technoboy10/gh607-languagechooser-width 
Fix #607 - Language chooser should not be 100% width
 2016-06-24 11:44:11 -04:00
Technoboy10
5f62e5ffaf scoping tweak 2016-06-24 11:42:35 -04:00
Matthew Taylor
c4a365a0e8 Connect TeacherBanner to redux 
whoops! Thanks @rschamp. Fixes #611
 2016-06-24 11:40:50 -04:00
Technoboy10
172dd3cd62 set the size of the language chooser 2016-06-24 11:34:11 -04:00
Matthew Taylor
ef881a07f9 Merge pull request #610 from mewtaylor/cleanup/teacher-styling 
styling cleanup for teacher registration
 2016-06-24 11:25:25 -04:00
Connor Hudson
49edaf0247 Merge pull request #609 from technoboy10/gh605-language-dropdown-state 
Fix GH-605: Make languagechooser keep locale state
 2016-06-24 11:22:54 -04:00
Matthew Taylor
97516b1e1d styling cleanup for teacher registration 
some scoping, as well as class labeling
 2016-06-24 11:19:41 -04:00
Technoboy10
93054cf393 change from defaultValue to value because of formsy 2016-06-24 11:13:05 -04:00
Connor Hudson
5724a4c609 Merge pull request #606 from technoboy10/gh604-localize-educator-landing 
Fix GH-604: Localize Educator Landing Page
 2016-06-24 10:51:34 -04:00
Technoboy10
0277b96698 move teacher accounts string to general 2016-06-24 10:39:55 -04:00
Technoboy10
3d18f04a43 localize educator landing page 2016-06-24 10:05:44 -04:00