Ray Schamp
d3f1046a42
Merge pull request #730 from rschamp/feature/3679-student-flow
...
Add student registration flow
2016-07-20 15:57:47 -04:00
Connor Hudson
1b5284fbf1
Merge pull request #733 from technoboy10/gh732-pluginstudio
...
Fix GH-732: Plug-In Studios -> Plug-In Studio
2016-07-20 14:57:06 -04:00
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
2065bc91a4
Parse with babel-eslint
...
Allows us to use the now-available es6 features without lint errors.
2016-07-19 16:46:08 -04:00
Ray Schamp
5b6a1fe8b9
Fix whitespace
2016-07-19 09:24:07 -04:00
Ray Schamp
e3378d0f6a
Merge pull request #662 from rschamp/feature/use-babel-develop
...
Use babel-loader for jsx transpilation
2016-07-18 13:07:23 -06: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
Connor Hudson
f538016b47
Merge pull request #726 from technoboy10/gh701-ie11-ms-value
...
Fix GH-701, GH-700: IE11 select form background, indent issues
2016-07-18 10:52:51 -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
15dd4db718
Merge pull request #721 from mewtaylor/issue/usernames-search
...
[Master] GH-710: only show username in search and explore
2016-07-12 07:35:37 -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
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
