Matthew Taylor
845ddb2966
only show username in search and explore
...
fixes #710
2016-07-11 16:35:03 -04:00
Andrew Sliwinski
ff67f7bae4
Merge pull request #718 from thisandagain/hotfix/jobs
...
[Develop] Update jobs page
2016-07-11 16:26:36 -04:00
Andrew Sliwinski
727bffdb25
Merge pull request #719 from thisandagain/hotfix/jobs
...
[Master] Update job listings
2016-07-11 16:26:30 -04:00
Andrew Sliwinski
f8ee125bfe
Update job listings
2016-07-11 16:16:46 -04:00
Matthew Taylor
e9c6213e51
Merge pull request #717 from mewtaylor/issue/gh-r2-3798
...
[Master] Hotfix: Allow urls with `ajax` to pass through
2016-07-11 15:21:56 -04:00
Matthew Taylor
3504ec1910
Merge pull request #716 from mewtaylor/issue/gh-r2-3798
...
Towards Hotfix: Allow urls with `ajax` to pass through
2016-07-11 11:16:52 -04:00
Matthew Taylor
d8a0436525
Forgot a few
2016-07-11 11:09:15 -04:00
Matthew Taylor
5e130d238b
Merge pull request #714 from mewtaylor/issue/gh-r2-3798
...
[Develop] Hotfix: Allow urls with `ajax` to pass through
2016-07-11 10:48:58 -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
6e67e3973c
Revert "Attempt 2 – reprioritize header conditionals"
...
This reverts commit 1ee9358be4
2016-07-08 10:31:17 -04:00
Matthew Taylor
1ee9358be4
Attempt 2 – reprioritize header conditionals
2016-07-08 10:18:02 -04:00
Matthew Taylor
8eaf3945f0
Revert "Trying a thing out to fix explore redirects"
...
This reverts commit dc1264e4d5
2016-07-08 09:18:40 -04:00
Matthew Taylor
dc1264e4d5
Trying a thing out to fix explore redirects
...
the route alias might be doing some weird stuff in the config.
2016-07-08 09:05:56 -04:00
Matthew Taylor
99c76ee3bf
Merge pull request #703 from LLK/release/2.2.10
...
[Develop] Release 2.2.10
2016-07-08 09:03:11 -04:00
Matthew Taylor
b5cca385a7
Merge pull request #704 from LLK/release/2.2.10
...
[Master] Release 2.2.10
2016-07-08 08:42:05 -04:00
Matthew Taylor
b02f243e26
Merge pull request #702 from mewtaylor/issue/teacher-reg-fixes
...
Fix GH-[695, 694, 693, 691] – Add custom validation for organization and phone
2016-07-07 17:02:44 -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
c26ca701fb
Merge pull request #687 from mewtaylor/issue/gh-686-language
...
Fix GH-686: Add language to search / explore api requests
2016-07-07 08:44:08 -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
Connor Hudson
ad8b43a592
Merge pull request #682 from technoboy10/gh680-681-educators-page
...
Fix GH-680 and GH-681: Educator landing style tweaks
2016-07-06 15:19:09 -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
712aa8dbc2
Merge pull request #672 from rschamp/bugfix/child-props
...
Don't error on null children
2016-07-05 15:48:56 -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
20b472f66d
Merge pull request #668 from mewtaylor/issue/gh-666-all
...
Fix GH-666: Make category options into key/value
2016-07-05 14:01:05 -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
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
