scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
1261 commits 216 branches 1 tag 474 MiB
Commit graph

819 commits

Author SHA1 Message Date
Technoboy10
74afd163b5 fix typo 2016-07-20 14:28:46 -04:00
Ray Schamp
754859f35f Update image format for API change 
Removed default `image` field convention
 2016-07-20 13:47:43 -04:00
Ray Schamp
a3b56dcbf1 Fix lint errors, l10n issues 2016-07-20 12:07:19 -04:00
Technoboy10
285c4c2d69 revert irrelevant change 2016-07-20 09:58:37 -04:00
Technoboy10
4e6efae667 Remove IE weird input additions, fallback to mobile error style on IE, fix some mobile error issues 2016-07-20 09:46:51 -04:00
Ray Schamp
6d5b7d3c02 Update description of demographics step 2016-07-19 22:58:50 -04:00
Matthew Taylor
90a4277a8a Change copy for Wait for Approval 
Fixes #715
 2016-07-19 16:54:38 -04:00
Ray Schamp
1c5940cc05 Add student registration flow 2016-07-19 16:51:28 -04:00
Ray Schamp
47ebef1b6f Scope message strings more reusably 2016-07-19 16:51:10 -04:00
Ray Schamp
67ecb60f48 Make registration styles reusable 2016-07-19 16:49:12 -04:00
Ray Schamp
5b6a1fe8b9 Fix whitespace 2016-07-19 09:24:07 -04:00
Connor Hudson
637b1352cd Merge pull request #727 from technoboy10/gh674-ie11-card-margin 
Fix GH-674: Waiting room cards should be centered in IE
 2016-07-18 11:16:07 -04:00
Technoboy10
8c260032fa card margin auto 2016-07-18 10:39:13 -04:00
Technoboy10
db049b871f fix IE11 select background, indent issues 2016-07-18 10:17:22 -04:00
Matthew Taylor
7741cb2c7e Merge pull request #685 from St19Galla/patch-1 
Fix gh-684 - Changing error message
 2016-07-12 19:04:16 -04:00
Matthew Taylor
6fd1d08d56 Merge pull request #720 from mewtaylor/issue/usernames-search 
[Develop] GH-710: only show username in search and explore
 2016-07-11 20:21:58 -04:00
Matthew Taylor
27b5afddfb Forgot search 
thanks @thisandagain!
 2016-07-11 19:59:13 -04:00
Matthew Taylor
845ddb2966 only show username in search and explore 
fixes #710
 2016-07-11 16:35:03 -04:00
Andrew Sliwinski
f8ee125bfe Update job listings 2016-07-11 16:16:46 -04:00
Matthew Taylor
d8a0436525 Forgot a few 2016-07-11 11:09:15 -04:00
Matthew Taylor
87a0350b02 Allow urls with ajax to pass through 
Needed for https://github.com/LLK/scratchr2/pull/3804
 2016-07-11 10:29:22 -04:00
Matthew Taylor
075f1481a2 Add custom validation for organization and phone 
It appears that the `required` field is not applied in the way we'd like it to be for the custom checkbox group and custom phone input fields, so do a `required` check on form submission. Additionally, this adds in a few style fixes. Fixes #695, #694, #693, #691
 2016-07-07 16:56:51 -04:00
St19_Galla
ea6cd2ab2c final fix 2016-07-07 14:18:16 -04:00
Matthew Taylor
7f466aacc6 Add language to search / explore api requests 
Fixes #686, thanks @thisandagain !
 2016-07-07 08:38:10 -04:00
St19_Galla
16a985212c alphanumeric only text fix 2016-07-06 21:20:46 -04:00
Technoboy10
717a2319b4 remove button, use div instead 2016-07-06 14:16:08 -04:00
Technoboy10
66c3a02340 default cursor on coming soon, make cards into links 2016-07-06 12:27:42 -04:00
Ray Schamp
b7c46f483e Don't error on null children 
Was throwing a `TypeError` when child was null/undefined.
 2016-07-05 15:48:21 -04:00
Ray Schamp
c50ac03a48 Merge pull request #671 from rschamp/bugfix/669 
Disable default style for select elements in IE
 2016-07-05 14:39:58 -04:00
Ray Schamp
edf0c1e475 Disable default style for select elements in IE 
Fixes #669
 2016-07-05 14:39:08 -04:00
Matthew Taylor
9a037fda81 don't use let yet for variable definitions 
Fixes #670
 2016-07-05 14:21:40 -04:00
Ray Schamp
6f9c16a7a5 Merge pull request #667 from rschamp/bugfix/647 
Add style to general error messages
 2016-07-05 14:18:49 -04:00
Matthew Taylor
0d23964771 Merge pull request #664 from mewtaylor/issue/gh-628-focusout 
Fix GH-628: Add box shadow for focus state on checkboxes
 2016-07-05 14:02:51 -04:00
Matthew Taylor
aa3cbe552a Make category options into key/value 
so that we can store the query string with the tab name, since it's not the same in every instance. fixes #666, and makes a couple other style tweaks.
 2016-07-05 13:38:51 -04:00
Ray Schamp
d990dee755 Move location of the general error message 
From review of the style with @carljbowman

Requires a bit of magic, where the Form component manually adds the "all" value. But without a major overhaul of the validation system, I don't see how else to put the general error among the other fields.
 2016-07-05 12:06:10 -04:00
Ray Schamp
b15b5b8614 Add style to general error messages 
Resolves #647
 2016-07-05 12:03:27 -04:00
Matthew Taylor
2cd8019ef6 Add box shadow for focus state on checkboxes 
Fixes #628 by applying the same outline for focus as is currently applied to checked boxes.
 2016-07-05 11:39:06 -04:00
Ray Schamp
11155c429e Merge pull request #661 from rschamp/bugfix/654 
Fix JSON response parsing in IE
 2016-07-04 09:23:28 -04:00
Ray Schamp
b89d644573 Fix JSON response parsing in IE 
Fixes #654

IE does not honor responseType: 'json', and will not parse responses as JSON unless json data is present in the request. For some reason this issue can also be solved by including a `json` attribute on the xhr request, but if that's present, url encoded form data is overwritten with the contents of the json.  So just try to parse the response ourselves if it looks like it wasn't parsed.

See https://github.com/Raynos/xhr/issues/123
 2016-07-03 15:54:58 -04:00
Ray Schamp
7fe82c11be Get rid of most splash warnings in development 2016-07-03 14:49:01 -04:00
Ray Schamp
c25852b3c6 Merge pull request #657 from rschamp/bugfix/645 
Revalidate address step after invalid submissions
 2016-07-01 13:48:13 -04:00
Ray Schamp
a56f994886 Revalidate address step after invalid submissions 
I don't like that the state is being set to a calculation of existing props. When I did that calculation in `render`, it didn't update when fields were changed.

Fixes #645
 2016-07-01 11:43:18 -04:00
Connor Hudson
d432282ff4 Merge pull request #652 from technoboy10/gh649-z-index-weirdness 
Fix GH-649: Dropdown hidden by TED Talk
 2016-07-01 08:40:54 -04:00
Technoboy10
2206cb97f6 message icon tweak 2016-06-30 19:17:53 -04:00
Technoboy10
42c000d14f orangify this 2016-06-30 18:06:17 -04:00
Matthew Taylor
6db426a586 Use empty default object 
Looks as if the having one of these objects as the default causes overwriting in some way, as opposed to augmentation. Have the source object be an empty one, so that it gets the attributes of both defaults and props. Fixes #642.
 2016-06-30 16:52:46 -04:00
Technoboy10
5e5c2a4f9d Remove z-index as it wasn't needed 2016-06-30 16:46:44 -04:00
Ray Schamp
5b288e4d3e Merge pull request #648 from rschamp/feature/username-clarity 
Clarify username field is not for logging in
 2016-06-30 16:17:14 -04:00
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
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
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
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
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
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
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
8f60b020cb fix educator faq link 
`info` is not in there anymore
 2016-06-29 12:35:53 -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
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
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
Matthew Taylor
633fee162a Merge pull request #603 from TheGrits/patch-2 
Fix gh-602: Remove Community Counselor
 2016-06-24 08:58:10 -04:00
Connor Hudson
5cb46b1579 Merge pull request #601 from technoboy10/educator-landing 
Fix GH-311: Educator landing page
 2016-06-24 08:21:02 -04:00
Matthew Taylor
ebf45c6f1d Fix linting errors 
Signed-off-by: Connor Hudson <technoboy10@fake.email>
 2016-06-24 08:13:32 -04:00
Matthew Taylor
92883d3cbe swap logos in conference footer 2016-06-23 22:46:11 -04:00
The_Grits
f233f660b0 Fix gh-602: Remove Community Counselor 2016-06-23 18:28:24 -04:00
Connor Hudson
1da0978029 routes.json 2016-06-23 17:26:28 -04:00
Connor Hudson
53eb56c1df style tweaks 2016-06-23 17:23:35 -04:00
Matthew Taylor
e71aff5df1 Merge pull request #594 from St19Galla/develop 
Navbar issues; :hover
 2016-06-23 17:20:44 -04:00
St19_Galla
49f6a6bee2 Update navigation.scss 
Changed padding rather than height
 2016-06-23 17:06:40 -04:00
Matthew Taylor
74bd2b3255 Merge pull request #599 from mewtaylor/feature/teacher-registration-flow 
[Updates] Teacher registration flow
 2016-06-23 16:48:58 -04:00
Connor Hudson
7de13d029b get rid of carousel, make things centered if they need it 2016-06-23 15:46:02 -04:00
Matthew Taylor
0c1abada3a Small tweaks 
1. left-align form elements even in mobile
2. Bolden input labels, except for checkboxes and radio elements

/cc @carljbowman
 2016-06-23 15:44:14 -04:00