Commit graph

14386 commits

Author SHA1 Message Date
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
bfd8bcd682 Merge pull request #663 from rschamp/feature/remove-warnings
Get rid of most splash warnings in development
2016-07-03 16:01:08 -04:00
Ray Schamp
1db52c4e3b Use babel-loader for jsx transpilation
This is to remove the deprecation warning about React.__spread. It will give us other nice things too, though.
2016-07-03 15:57:13 -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
Matthew Taylor
0414f069ea Merge pull request #659 from mewtaylor/issue/gh-655-localization
Fix GH-655: use custom-defined internal separator in locale compare
2016-07-01 14:35:53 -04:00
Matthew Taylor
ce9b3561f2 use custom-defined internal separator
There is some stacking that happens in object keys that had been using the `-` to track language/view hierarchies, which was thrown off by view names that used a `-` in them. Switch to using `:`, and also make it customizable. Fixes #655
2016-07-01 14:27:41 -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
Connor Hudson
a4e9db929c Merge pull request #656 from technoboy10/gh651-stagingalert
Fix GH-651: Orangeify navbar when SCRATCH_ENV=staging
2016-07-01 08:36:51 -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
262569c74c Merge pull request #653 from mewtaylor/issue/gh-642-validation-msg
Fix GH-642: Use empty default object for validation factory
2016-06-30 17:05:23 -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
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