chrisgarrity
0b857892d2
Merge pull request #1137 from chrisgarrity/issue/gh1113-tttwording
...
Update wording of Animate a Name TTT
2017-01-04 08:55:17 -05:00
Matthew Taylor
6c589e1dc7
remove test ref
...
whoopsie :)
2016-12-28 10:03:11 -05:00
Matthew Taylor
5da9514f4d
Don’t validate username server side if error
...
Fixes #1097 by not making the server-side username validation call if the client side validations have failed. This is not the ideal way to do this, since it’s getting the input from an array. However, to make this different would require significant refactor.
2016-12-28 09:54:46 -05:00
morantsur
e763f8a9bf
Merge pull request #1095 from morantsur/microworlds_projects
...
Add a microworlds homepage, and point microworlds pages at the new microworlds projects.
2016-12-22 12:36:03 -05:00
chrisgarrity
1ba27684c8
Update wording of Animate a Name TTT
...
Don’t encourage scratchers to share personal info
2016-12-21 14:37:33 -05:00
The_Grits
4595377ed8
Remove spaces from other strings
2016-12-21 14:23:17 -05:00
morantsur
0df1eec3e0
Merge pull request #1122 from morantsur/fix_fashion
...
Fix #1118 - broken link to fashion microworld video
2016-12-21 12:13:05 -05:00
morant
66f8ee201f
Remove bannerUrl, as it’s only used in the modal.
2016-12-21 12:06:48 -05:00
The_Grits
66c9e14c15
Remove spaces
2016-12-21 11:18:29 -05:00
morantsur
e95caef368
Merge branch 'develop' into microworlds_projects
2016-12-20 13:02:46 -05:00
morant
012321721c
Remove isRequired from description and onGuideClick, and fix naming on l10n strings.
2016-12-20 12:58:16 -05:00
morant
485d3903e0
- Fix routes
...
- move functions to inline rendering in ttt-tile and mw homepage
2016-12-20 12:06:58 -05:00
Matthew Taylor
dbee423814
Update bulk account creation faq string
...
/cc @kaschm
2016-12-20 09:07:16 -05:00
The_Grits
5cc8b2c124
Update Flash Link
...
As per #1130
2016-12-20 00:27:37 -05:00
Matthew Taylor
967b2beb42
Update bulk creation faq content
2016-12-19 17:50:45 -05:00
Ray Schamp
afe63af707
Provide intl to TeacherRegistration
2016-12-19 17:02:03 -05:00
Ray Schamp
c901675b41
Allow empty response, again
...
Missed in #1128 , this fixes the rest of the handler to not expect a body from the request. Fixes #1124 again.
2016-12-19 15:41:32 -05:00
Ray Schamp
3b396019ab
Allow empty responses
...
Fixes #1124 by not assuming there is any body associated with the response. That we don't send one is news to me, but we should cover this possibility in any case.
2016-12-19 13:43:33 -05:00
Matthew Taylor
ccd6713ef1
get formatMessage
from props
...
Fixes #1125 . I had fixed this last iteration, not sure how it got re-introduced.
2016-12-18 22:08:17 -05:00
morant
647bc74ec3
Fix #1118 - broken link to fashion microworld video
2016-12-16 14:03:51 -05:00
morant
7bbb498a4f
- Stop using ttt cscc files, and remove all references to ttt that are not needed.
...
- Update translation strings that are specific to microworlds to have microworlds as prefix.
- Address other comments
2016-12-16 12:18:16 -05:00
Matthew Taylor
134dbbd3a8
Remove routeAlias
from splash redirect
...
It’s not necessary, and I believe is causing confusion for the faslty config.
2016-12-16 10:41:45 -05:00
Matthew Taylor
34ff8fc50f
Merge pull request #1116 from mewtaylor/issue/remove-hoc-banner
...
Remove HOC Banner
2016-12-16 10:33:57 -05:00
morant
e3025ea3e9
Added a microworlds homepage, based on the ttt page, at /microworlds/go.
...
Changed ttt-tile to only show “see guides…” if they exist.
2016-12-15 16:59:48 -05:00
Matthew Taylor
3c3f1c2f8f
Remove HOC Banner
...
Reverts #1073
2016-12-15 15:58:29 -05:00
Matthew Taylor
0111278fa5
Update id string for general error message strings
...
Fixes #1112 , which was created by moving the error message into `general`
2016-12-15 15:32:40 -05:00
Ray Schamp
2539c4cf63
Merge pull request #1110 from rschamp/bugfix/fallback-registration-error
...
Provide fallback error messages
2016-12-13 15:08:42 -05:00
Ray Schamp
64ceb2ae56
Provide fallback error messages
...
In case the response does not supply `msg` or `errors`, provide a default. If `registrationError(s)` is empty, we do not show the error card, which causes "silent" failures.
2016-12-13 12:12:23 -05:00
Matthew Taylor
ba50840809
only apply right margin to radio input
...
fixes #1101 . I wanted to apply a custom class to the input, however that is unfortunately obscured and unreachable with our current implementation of `formsy-react-components`
2016-12-13 12:11:24 -05:00
Matthew Taylor
cbd983baf8
Merge pull request #932 from TheGrits/patch-3
...
Fix gh-678: Retain Search Term
2016-12-12 22:52:38 -05:00
The_Grits
0b2c1fff1a
Squish
2016-12-12 16:01:06 -05:00
Matthew Taylor
83f6bc6892
add slash
...
thanks @rschamp!
2016-12-08 17:37:34 -05:00
Matthew Taylor
d3e6fd48cd
Move out to redirect
2016-12-08 17:20:34 -05:00
Matthew Taylor
b1595caa95
Handle double slash in splash pattern
...
This fixes https://github.com/LLK/scratchr2/issues/4195 by updating the regex to catch two slashes. I decided to intentionally not catch more than 2 – it’ll 404 on 3 or more, which seems appropriate.
2016-12-08 10:19:17 -05:00
Matthew Taylor
11828d2d44
Merge pull request #1099 from mewtaylor/issue/gh-966
...
Fix GH-966: Localize default “required” message
2016-12-08 09:35:57 -05:00
Matthew Taylor
9ae4e5a963
Move validationRequired
into general
...
thanks @rschamp!
2016-12-07 17:24:48 -05:00
Matthew Taylor
6be9fc1084
Localize default “required” message
...
Fixes #966 . I was trying, if possible, to not introduce localization at the component level in order to keep it in the views – but that seemed a bit too involved given that the fix in this way is only a few lines long.
2016-12-06 11:36:24 -05:00
Matthew Taylor
afa25dc1c2
Move other input to be the label for the button
...
thanks @rschamp! Never would’ve thought label would accept html.
2016-12-05 14:05:27 -05:00
Matthew Taylor
cc0496619d
use width for radio buttons, not margin
...
This fixes #962 – the margin was causing flex to overflow the radio buttons when the text was long, causing the male and other options to render on top of each other. This fixes that by giving the radio buttons a fixed with relative to the parent container, and by ensuring that languages with long localizations will still be visible in overflow text.
2016-12-05 12:53:04 -05:00
Matthew Taylor
16d638672e
Merge pull request #1012 from jwzimmer/issue/gh-942-clarify-compatibility-FAQ
...
Fix gh-942: update compatibility & support FAQ response
2016-12-05 09:54:28 -05:00
Matthew Taylor
48865c279f
Merge pull request #1000 from TheGrits/patch-5
...
Fix gh-997: Update General and Teacher FAQs
2016-12-05 09:53:39 -05:00
Matthew Taylor
6309c30667
Merge branch 'release/hoc-nov-21' of https://github.com/LLK/scratch-www into develop
...
* 'release/hoc-nov-21' of https://github.com/LLK/scratch-www :
Match tutorial ordering to ttt top row
Turn off related videos in embed
Move margin to flex-row element
Add finalized video
Add event row text
Add temporary video for testing
Add windows device manager url
Add `ignoreUrls` to max-len lint rules
switch to column in tablet
Add hoc event row
Update wedo2 text for new Windows deploy
Add “open” string to l10n.json
Add link to TTT page to educators page
Add hoc banner
Move padding to splash element
trello-ize title banner h1,p styling
# Conflicts:
# src/views/explore/explore.jsx
# src/views/search/search.jsx
2016-12-02 10:55:38 -05:00
morant
a17ec2f72c
Point microworlds pages at the new microworlds projects (created by the Scratch user “microworlds”
2016-12-01 22:21:29 -05:00
Matthew Taylor
eef7135a6d
Match tutorial ordering to ttt top row
...
Forgot to do this, sorry.
2016-12-01 08:35:44 -05:00
Matthew Taylor
010ed3c530
Merge pull request #1080 from mewtaylor/issue/gh-930
...
Fix GH-930: Update wedo2 text for new Windows deploy
2016-11-30 09:24:26 -05:00
Matthew Taylor
55a73241d4
Merge pull request #1091 from mewtaylor/issue/hoc-event-row-tweaks
...
Turn off related videos in event row embed
2016-11-30 09:21:13 -05:00
Matthew Taylor
e9d6b58d5e
Turn off related videos in embed
...
See https://github.com/LLK/scratch-www/pull/1081#issuecomment-263746724 . Also adjusts padding to accommodate https://github.com/LLK/scratch-www/pull/1081#issuecomment-263747658 .
2016-11-30 08:33:15 -05:00
Matthew Taylor
435021658b
Move margin to flex-row element
...
so that the header elements are evently aligned vertically. fixes #1089
2016-11-30 08:28:05 -05:00
Matthew Taylor
f84df573a3
Add finalized video
...
but – let the record show: Who has two thumbs and is a Hufflepuff? I’M A HUFFLEPUFF!
2016-11-29 17:40:40 -05:00
Matthew Taylor
d63dcb19fd
Add event row text
...
somehow this got lost from the PR, not sure how.
2016-11-29 16:59:52 -05:00
Matthew Taylor
eb21456b51
Merge pull request #1081 from mewtaylor/feature/gh-982
...
Implement GH-982: Add hoc event row
2016-11-29 16:42:31 -05:00
Matthew Taylor
7e167cc441
Add temporary video for testing
2016-11-29 16:37:42 -05:00
Matthew Taylor
f2cd0d3777
Add windows device manager url
2016-11-29 15:13:16 -05:00
Matthew Taylor
971c520f83
switch to column in tablet
...
since that’s whats in the specs, and it handles centering with `align-items`. Fixes #1083
2016-11-29 12:49:26 -05:00
Matthew Taylor
2daa882331
Add hoc event row
...
still missing the video for content, otherwise should be good to go
2016-11-29 11:13:00 -05:00
Matthew Taylor
14fcef7478
Update wedo2 text for new Windows deploy
...
Fixes #930
2016-11-29 10:06:30 -05:00
Matthew Taylor
636c27bdcb
Add “open” string to l10n.json
...
Fixes #1078 . This also fixes #1076 and https://github.com/LLK/scratch-www/issues/981#issuecomment-263301322 by updating the styling accordingly.
2016-11-29 08:59:14 -05:00
chrisgarrity
110a7f2dc0
Merge pull request #1025 from TheGrits/patch-6
...
Fix gh-1023: Localize Explore Title and Dropdown
2016-11-28 13:48:40 -05:00
chrisgarrity
546ae19065
Merge pull request #1067 from TheGrits/patch-4
...
Fix gh-1066: Localize Search Header
2016-11-28 13:17:19 -05:00
chrisgarrity
02a7cece6b
Merge pull request #1074 from chrisgarrity/issue/gh905-educator-hoc
...
Add link to TTT page to educators page
2016-11-23 13:38:48 -05:00
Matthew Taylor
2e7336ff55
Merge branch 'feature/gh-981' into release/hoc-nov-21
...
* feature/gh-981:
Add hoc banner
Move padding to splash element
trello-ize title banner h1,p styling
# Conflicts:
# src/components/title-banner/title-banner.scss
# src/views/hoc/hoc.jsx
2016-11-23 11:17:47 -05:00
chrisgarrity
a21587a658
Add link to TTT page to educators page
...
Replace ‘Help’ link with ‘Things to Try’: fixes #905
2016-11-23 10:25:54 -05:00
Matthew Taylor
12e7326f49
Merge pull request #1069 from mewtaylor/issue/go-page-querystring
...
Remove extra $
2016-11-22 14:58:06 -05:00
Matthew Taylor
788b034f32
Remove extra $
2016-11-22 14:56:27 -05:00
Matthew Taylor
20bc8b874c
Merge pull request #1065 from mewtaylor/issue/go-page-querystring
...
[Staging] Hotfix: allow querystrings for `/go`
2016-11-22 14:22:21 -05:00
The_Grits
52a57b05a7
Localize Search Header
2016-11-22 12:15:17 -05:00
Matthew Taylor
a182367a4e
allow querystrings for /go
...
again, the same as #1004 , but needed too soon for a full fix of this issue.
2016-11-22 10:40:35 -05:00
Matthew Taylor
f98cf53455
Merge pull request #1062 from mewtaylor/hotfix/localized-pdfs-bug
...
remove uri from path
2016-11-21 16:54:16 -05:00
Matthew Taylor
cf67ec0e4b
remove uri from path
2016-11-21 16:52:46 -05:00
Matthew Taylor
0c9f2561f9
Merge branch 'release/hoc-2016-1' into release/2.2.15
...
* release/hoc-2016-1:
Merge pull request #1027 from TheGrits/patch-7
Additional content changes
Fix TTT content
Redirect hoc page to `/go`
Merge pull request #1037 from chrisgarrity/patch-column-count
update ttt content
Update ttt content
Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
Merge pull request #1018 from mewtaylor/issue/gh-995
Merge pull request #1008 from mewtaylor/issue/gh-980
Update pattern so rewrite accepts querystring too
# Conflicts:
# src/components/modal/ttt/modal.jsx
# src/views/jobs/jobs.jsx
# src/views/thingstotry/l10n.json
2016-11-21 15:01:53 -05:00
Matthew Taylor
e84427fcc0
Merge pull request #1050 from mewtaylor/issue/hoc-redirect
...
Implement GH-906: Redirect hoc page to `/go`
2016-11-21 12:41:39 -05:00
Matthew Taylor
bfaf5b35ba
Merge pull request #1027 from TheGrits/patch-7
...
Fix gh-1026: Trust and Safety Manager URL update
# Conflicts:
# src/views/jobs/jobs.jsx
2016-11-21 12:40:13 -05:00
chrisgarrity
58656aea17
Additional content changes
...
- new FlyCards.pdf (fixes shortcut url on title page)
- changes ‘download’ to ‘open’ for PDFs
2016-11-21 11:06:12 -05:00
chrisgarrity
bb777baf4c
Fix TTT content
...
ttt.subtitle:
- ‘try theTutorial’ instead of ‘try a Tutorial’
- Hide and Seek instead of Hide-and-Seek Game
- change <b> to <strong>
title-banner.scss
- add explicit rule to bold <strong> within title-banner for windows browsers
2016-11-21 11:06:02 -05:00
Matthew Taylor
edd41205bc
Redirect hoc page to /go
...
Implements #906
2016-11-20 13:55:00 -05:00
chrisgarrity
b58163c420
Merge pull request #1037 from chrisgarrity/patch-column-count
...
fix column count for IE and Edge
2016-11-18 17:42:20 -05:00
Matthew Taylor
e77e02d5a6
Update ttt content
...
Still missing `FashionGuide`, may need to remove that guide.
2016-11-18 17:42:09 -05:00
Matthew Taylor
b7bfaec438
Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
...
Fix gh-979: TTT page
2016-11-18 17:41:58 -05:00
Matthew Taylor
e6de0d0ba4
Merge pull request #1018 from mewtaylor/issue/gh-995
...
Fix GH-995: Make cards tweaks
2016-11-18 17:41:49 -05:00
Matthew Taylor
9ca54e83ce
Merge pull request #1008 from mewtaylor/issue/gh-980
...
Implement GH-980: add new TTT modal component
2016-11-18 17:41:26 -05:00
chrisgarrity
0ab62689ce
fix column count for IE and Edge
...
Set column-count for all widths since it’s needed for Firefox, IE and Edge browsers
2016-11-18 17:08:23 -05:00
The_Grits
f22b698bb6
Bitly URL
2016-11-16 15:24:20 -05:00
The_Grits
62c6a57ff5
Update Trust and Safety Manager URL
...
I have a feeling Travis won't like this
2016-11-16 14:58:58 -05:00
The_Grits
e1f58662d0
Add localization strings
...
For #1023
2016-11-16 14:23:16 -05:00
The_Grits
015cca13f4
Localize Explore Title and Dropdown
...
As per #1023
2016-11-16 14:20:43 -05:00
Matthew Taylor
c4f42b3673
Add hoc banner
2016-11-16 08:52:18 -05:00
Matthew Taylor
e65ba61e7a
Move padding to splash element
...
Having it in the nav was causing issues with positioning the banner, as evidenced by the teacher banner’s `-20px` setting
2016-11-16 08:51:57 -05:00
Matthew Taylor
fe70dd0f9e
trello-ize title banner h1,p styling
...
we need it to be different for the hoc banner, so make it need a class name in order to be styled correctly
2016-11-16 08:50:00 -05:00
Matthew Taylor
e4231e9d57
Update ttt content
...
Still missing `FashionGuide`, may need to remove that guide.
2016-11-15 07:42:36 -05:00
Matthew Taylor
ac46cce989
Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
...
Fix gh-979: TTT page
2016-11-15 07:22:16 -05:00
Matthew Taylor
faa8c879be
Merge pull request #1018 from mewtaylor/issue/gh-995
...
Fix GH-995: Make cards tweaks
2016-11-15 07:21:37 -05:00
chrisgarrity
9693a5a526
Merge pull request #999 from TheGrits/patch-4
...
Fix gh-996: Update Privacy Policy
2016-11-14 16:59:37 -05:00
chrisgarrity
de9fb22fc8
last tweak
...
use .map (.., key) instead of tile.title just in case we ever have two tiles with the same title.
2016-11-14 16:42:06 -05:00
chrisgarrity
a27fea51e6
Integrated ttt-modal
...
integrated modal and added guide pdfs.
Catch and Pet Guides are still missing. We may need to remove them from the TTT list. Wanted to get this committed in any case to start review.
2016-11-14 14:34:45 -05:00
Matthew Taylor
370164c585
Make cards tweaks
...
Fixes #995
2016-11-14 13:35:13 -05:00
chrisgarrity
986a368d2b
Remove Story and Fashion TTTs
...
Create a Story and Fashion Game are not ready, so removing from the ttt json. Leaving in the l10n files so that translations can get started.
2016-11-14 10:37:19 -05:00
chrisgarrity
5854e9ccc9
Adding data for tutorials/guides/cards
2016-11-14 10:31:40 -05:00
Matthew Taylor
1b95e643a9
fix for linting
2016-11-14 10:31:40 -05:00
Matthew Taylor
d72a605e69
Last tweaks
...
thanks @rschamp!
2016-11-14 10:31:40 -05:00
Matthew Taylor
688ab935d1
Some last tweaks
...
based on feedback from @rschamp, thanks!
1. make `ref` into method
2. remove accidental inclusion of prototype modal
3. use `omit` for props so that we don’t need a separate object for wrapped component properties
2016-11-14 10:31:40 -05:00
Matthew Taylor
438dbb21e1
Edits based on feedback
...
thanks @rschamp !
2016-11-14 10:31:40 -05:00
Matthew Taylor
fa380a7148
edit copy/paste error
...
Thanks @chrisgarrity !
2016-11-14 10:31:40 -05:00
Matthew Taylor
95b6d6bd5c
Update microworld iframe modal
2016-11-14 10:31:40 -05:00
Matthew Taylor
484e3d2544
Add ttt modal component
...
This assumes that the parent view that renders it will contain the strings that are specific to the ttt element.
2016-11-14 10:31:40 -05:00
Matthew Taylor
b1e37360f3
Refactor modal components
...
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
2016-11-14 10:31:40 -05:00
Matthew Taylor
25f61fdb77
Merge pull request #1008 from mewtaylor/issue/gh-980
...
Implement GH-980: add new TTT modal component
2016-11-14 10:09:00 -05:00
Matthew Taylor
24aa9be30d
fix for linting
2016-11-14 09:58:42 -05:00
Matthew Taylor
652c328cbd
Last tweaks
...
thanks @rschamp!
2016-11-14 08:39:19 -05:00
Matthew Taylor
402efd8046
Some last tweaks
...
based on feedback from @rschamp, thanks!
1. make `ref` into method
2. remove accidental inclusion of prototype modal
3. use `omit` for props so that we don’t need a separate object for wrapped component properties
2016-11-10 17:13:44 -05:00
Matthew Taylor
d2474c87a5
Edits based on feedback
...
thanks @rschamp !
2016-11-10 15:00:33 -05:00
chrisgarrity
1f8d26186c
Add all the banners
...
Removed the getting started placeholder.
Added all the banners from #980 , updated ttt.json with banner location
2016-11-10 11:32:58 -05:00
jwzimmer
8fce4f3e03
update compatibility & support FAQ response
2016-11-10 11:13:10 -05:00
Matthew Taylor
c6cd701464
edit copy/paste error
...
Thanks @chrisgarrity !
2016-11-10 09:39:52 -05:00
Matthew Taylor
cbaab105f1
Update microworld iframe modal
2016-11-10 09:39:23 -05:00
The_Grits
6f35550ff4
Add Tutorials Button
...
For #1009
2016-11-09 21:32:58 -05:00
chrisgarrity
145da5f872
Styling and formatting clean up pass
...
Went over styles with Carl. Some notes:
renamed tutorial button tutorial tag as it’s not really a button and is unique to ttt.
Found out why cols4 wasn’t working - if your browser default font isn’t 16px, rem isn’t 16px. Opening a separate issue and using cols4 where it should be.
2016-11-09 21:25:35 -05:00
The_Grits
5fb1dd6230
Thanks Travis
...
A more thorough search of the error Travis returned helped me realize the problem.
2016-11-09 12:48:39 -05:00
chrisgarrity
ca7d0cf30e
Next draft
...
Includes new SVGs for banner and resources link
MasonryGrid does the reordering of items
Using react-responsive MediaQuery to change columns
Brought in ../forms/button.scss for button styling, and then modified for TTT
Still needs Modal
Final styling pass with Carl
2016-11-09 09:28:59 -05:00
Matthew Taylor
5af05466f6
Add ttt modal component
...
This assumes that the parent view that renders it will contain the strings that are specific to the ttt element.
2016-11-08 14:44:50 -05:00
Matthew Taylor
c9de1d73d9
Refactor modal components
...
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
2016-11-08 14:44:03 -05:00
chrisgarrity
c6f2fa68a7
First version of TTT page
2016-11-07 15:07:19 -05:00
Ray Schamp
0b6d87fa91
Update pattern so rewrite accepts querystring too
2016-11-07 12:14:50 -05:00
Ray Schamp
c83ffbef46
Merge pull request #1005 from LLK/hotfix/hoc-url
...
[Develop] Allow querystring in /hoc URL
2016-11-07 11:54:22 -05:00
Ray Schamp
7be6704b51
Allow querystring in /hoc URL
...
We should fix this for every URL, but that is too large of a change for a hotfix
2016-11-07 11:13:32 -05:00
The_Grits
2c1106adf7
Fix Travis
2016-11-07 11:12:59 -05:00
The_Grits
bfc0b5994e
gotcha
2016-11-07 11:09:44 -05:00
The_Grits
d9df101a66
One Commit More ( #23 )
...
* Update reducer.js
* Update search.jsx
2016-11-07 11:02:33 -05:00
Matthew Taylor
f7f4ed466e
Merge pull request #985 from TheGrits/patch-2
...
Fix gh-706: "This field is required" when phone number is null
2016-11-07 10:28:31 -05:00
The_Grits
21941ecf86
Phone Number 'Required' Validation
2016-11-04 11:51:48 -04:00
The_Grits
eba009b132
Student Data Privacy Strings
2016-11-03 17:33:48 -04:00
The_Grits
d3f432d247
Add law compliance strings
2016-11-03 17:22:49 -04:00
The_Grits
f3579a2976
Update Privacy Policy
...
Add policy, fix typo, and update update date.
2016-11-03 17:10:02 -04:00
Ray Schamp
ae106a866a
Merge pull request #993 from LLK/release/2.2.14
...
[Develop] Release 2.2.14
2016-10-31 16:25:13 -04:00
The_Grits
8be3e11486
Travis and Other Stuffs
2016-10-31 10:19:35 -04:00
The_Grits
9f2cda0eaa
Bugs and Connections
2016-10-31 10:05:08 -04:00
St19_Galla
2fd2118fe0
change community manager name
2016-10-28 11:29:50 -04:00
St19_Galla
d93212818d
Remove jobs
2016-10-28 11:16:20 -04:00
Matthew Taylor
c6ccf78b2f
Revert "Update requirement string" temporarily
...
This reverts commit 9f93340539
. This is temporary, and we will add it back in once the Windows tool is ready.
2016-10-28 08:00:14 -04:00
Matthew Taylor
7e04ae1088
Add w/o slash to the whitelist paths
...
as recommended in https://github.com/LLK/scratchr2/pull/4127#issuecomment-256484893
2016-10-27 08:38:17 -04:00
The_Grits
10e49d87b3
Empty Phone Number Validation
...
Separated the null check from the area code check so that when the field is null the 'required' popup will be displayed.
2016-10-26 14:15:54 -04:00
The_Grits
379ac78551
Navigation Redux
2016-10-26 10:20:16 -04:00
The_Grits
f77b22b07b
Update with Reducer
2016-10-20 21:30:32 -04:00
chrisgarrity
fa1b6c6c00
Merge pull request #948 from TheGrits/patch-1
...
Fix gh-924: Localize Developers Page
2016-10-20 17:52:16 -04:00
Connor Hudson
dc890d6db8
Merge pull request #964 from technoboy10/gh899-searchbarundefined
...
Fix GH-899: Re-searching should not search for 'undefined'
2016-10-20 12:51:50 -07:00
Technoboy10
3777ab825c
make fix simpler by using value instead of defaultValue
2016-10-20 13:17:23 -06:00
Matthew Taylor
f2b7d4fcf7
Merge pull request #976 from mewtaylor/issue/gh-856
...
Implement GH-856: Add new cards and card thumbs to www
2016-10-20 11:23:57 -04:00
Matthew Taylor
88a78480ba
Back to hide-and-seek with new cards
2016-10-19 16:54:24 -04:00
Matthew Taylor
cdf8059995
Change name to “Hide and Show”
2016-10-19 16:39:51 -04:00
Matthew Taylor
dc48dbb34a
use var
not const
...
We’re not at es6 yet. My baaaaaaaaaaddddd
2016-10-19 15:41:56 -04:00
chrisgarrity
991ce989be
Merge pull request #929 from tmickel/feature/developers-scratchjr
...
Add ScratchJr to developers page
2016-10-19 15:29:25 -04:00
Matthew Taylor
e01afa0161
Add new cards and card thumbs to www
...
Fixes #856 . This also updates the styling of the `cards.jsx` view to follow the trello style guide, as previously discussed.
2016-10-19 13:45:37 -04:00
Matthew Taylor
f8a6d975c7
Merge pull request #951 from mewtaylor/issue/ban-whitelist
...
Don’t redirect banned user on community guidelines
2016-10-18 16:35:08 -04:00
St19_Galla
bb20fa3375
single quotes whoops!
2016-10-13 17:31:57 -04:00
St19_Galla
5775cedc7a
add space
2016-10-13 17:26:46 -04:00
St19_Galla
d6680f129f
Update l10n.json
2016-10-13 17:25:44 -04:00
St19_Galla
e3452e3ea1
Add space in curator row
2016-10-13 15:51:17 -04:00
Technoboy10
4a610296e2
Add check for undefined formData
2016-10-12 16:09:00 -06:00
chrisgarrity
4074b986c2
Merge pull request #960 from chrisgarrity/gh940-missing-i18n
...
Fix gh-940: missing translations
2016-10-12 16:28:34 -04:00
chrisgarrity
29b104741f
Added tests for duplicate strings in build-locales merge
...
Also took out default messages for strings that are in the l10n json files.
2016-10-12 09:41:06 -04:00
The_Grits
8de70e8882
FormattedHTMLMessage fix
2016-10-11 20:38:01 -04:00
chrisgarrity
5b2ff1a4ca
Update md5map fixtures for tests
...
Also cleaned up comments from @mewtaylor
2016-10-11 19:28:13 -04:00
Matthew Taylor
36992e7d8d
Merge pull request #939 from TheGrits/patch-2
...
Fix gh-938: Update Privacy Policy
2016-10-11 15:12:18 -04:00
chrisgarrity
1339683a73
Fix #940
...
Most problems were due to strings being duplicated and overwriting each other. Updated the build-locales script to keep track of duplicates.
Project Curated by on the splash page was just missing the formatMessage call.
2016-10-11 12:33:31 -04:00
The_Grits
9f93340539
Fix #930 : Update requirement string
2016-10-11 12:33:30 -04:00
Matthew Taylor
cd9720f0f1
Merge pull request #954 from mewtaylor/issue/smarty-streets-strict
...
[Develop] Hotfix: loosen restrictions on smartystreets check
2016-10-06 16:46:57 -04:00
Matthew Taylor
7540ee45e3
loosen restrictions on smartystreets check
...
re-fixes #828 by loosening restrictions on the check once again (see https://smartystreets.com/docs/us-street-api#match-strategy )
2016-10-06 16:36:27 -04:00
St19_Galla
b83a3825e9
Add Travis-CI
2016-10-06 15:55:00 -04:00
The_Grits
dd4550899b
unbold
2016-10-06 10:44:08 -04:00
The_Grits
009b6eb75a
Finish Localization and Implementation
2016-10-05 23:03:23 -04:00
Matthew Taylor
e1e9455866
Don’t redirect banned user on comm. guideliens
...
Goes along with https://github.com/LLK/scratchr2/pull/4127 .
2016-10-05 17:49:18 -04:00
The_Grits
e0026d5c44
Part 1
2016-10-05 00:05:03 -04:00
Matthew Taylor
603a1336ce
Merge pull request #931 from TheGrits/patch-1
...
Fix gh-930: Update requirement string
2016-10-04 20:47:58 -04:00
Matthew Taylor
6bcc7eeae3
Update make it fly hoc image to be higher res
...
Higher res AND SMALLER FILE SIZE?!?! This really is 2016. We live in an amazing time.
2016-10-03 16:40:57 -04:00
The_Grits
53e3e34a52
Update link, add reviewed date
2016-10-03 16:12:14 -04:00
Matthew Taylor
c44742e668
Slight content edits to hoc page
...
updates the studio links, and also fixes a link issue for the dance activity. Thanks @jwzimmer!
2016-10-03 16:04:19 -04:00
Ray Schamp
6fa1c13cfb
Move Randy Jou to previous Scratch Team section
2016-10-03 11:39:21 -04:00
Matthew Taylor
99cedec978
Put label for “Not Required” above input
...
Fixes #933
2016-09-30 15:02:05 -04:00
The_Grits
195930bc53
Merge!
2016-09-30 13:54:34 -04:00
The_Grits
d90f62c316
Create navigation.js
2016-09-30 13:48:57 -04:00
The_Grits
4413213caa
Fix #930 : Update requirement string
2016-09-28 08:10:11 -04:00
Tim Mickel
aea35c5b8c
Add ScratchJr to developers page
2016-09-26 11:57:52 -04:00
Matthew Taylor
0156fe8c77
Add cards for fly and make music
2016-09-19 15:59:40 -04:00
Matthew Taylor
cd6a60e5b8
Change bearstack/bball to hide and dance
...
Also make updates to style scoping based on feedback from @rschamp
2016-09-15 11:44:33 -04:00
Matthew Taylor
f4b0b26b5c
make multiline formatting for img
uniform
2016-09-15 08:21:38 -04:00
Matthew Taylor
469d7a35bb
Update hoc page with new tutorials
...
Adds:
1. Make it Fly
2. Make Music
Removes:
1. Hide-and-Seek
2. Dance, Dance, Dance
2016-09-15 08:15:37 -04:00
The_Grits
2b2f4a03e8
Fix lint
2016-09-13 11:49:34 -04:00
The_Grits
68d37e0506
Update Video Link
...
As per @sleggss on #918
2016-09-13 11:41:39 -04:00
Ray Schamp
60f0ee1ded
Merge pull request #913 from rschamp/bugfix/empty-bodies
...
Don't set state to undefined API response bodies
2016-09-12 13:52:54 -04:00
Matthew Taylor
bd911c52d1
Merge pull request #867 from morantsur/feature/microworlds
...
Adding routes to microworlds
2016-09-12 12:06:27 -04:00
Ray Schamp
3efa1fd7c8
Merge pull request #911 from rschamp/feature/html-webpack-plugin
...
Use html-webpack-plugin for html rendering
2016-09-09 15:52:52 -04:00
Ray Schamp
c274de7295
Make template variables a bit less verbose
...
Move the rest of the configuration into template-config.js. This way the options are explicitly in the same namespace so we won't be surprised when we add a variable with the same name as an html-webpack-plugin option.
Rename template extension to ejs for syntax-coloring purposes.
2016-09-09 09:21:03 -04:00
Ray Schamp
c0eb1608bd
Don't set state to undefined API response bodies
...
This resolves the "Cannot read property 'x' of undefined" errors that occur when the API returns non-JSON responses. For instance if the proxy endpoints return 500 error responses from scratchr2.
2016-09-08 17:23:49 -04:00
morant
89faccfc6f
Remove caret from routhAlias
2016-09-08 17:06:24 -04:00
Ray Schamp
e44e958fe0
Move permissions storage to client-side cookie
...
Instead of retrieving the permission from the session cookie, store permission data from /session/, and cache it in a cookie. On subsequent page loads, the permission information will be retrieved from the cookie more quickly than the /session/ endpoint returns. When the session changes, the cookie and permissions state is updated to reflect the new state.
2016-09-08 12:53:05 -04:00
Ray Schamp
a497fed338
Remove token storage
...
We're not using it yet, and it won't be coming from the cookie when we do.
2016-09-08 12:48:07 -04:00
Ray Schamp
3fbd9fab36
Use html-webpack-plugin for html rendering
...
This plugin will likely be updated when webpack is updated.
2016-09-08 09:59:37 -04:00
morant
850def5cf0
- Remove commented out content from microword pages, as they are not displayed.
...
- Change art microworld text to not refer to videos.
2016-09-07 16:27:46 -04:00
morant
96c52dc223
Fixing route alias + adding new line
2016-09-07 13:35:14 -04:00
Matthew Taylor
1b4eaf0f0f
Merge pull request #902 from TheGrits/patch-3
...
Fix gh-894: Community Guidelines Image
2016-09-06 11:28:51 -04:00
Matthew Taylor
e454544abd
Merge pull request #901 from St19Galla/patch-1
...
Fix gh-900 // Update Credits
2016-09-06 10:56:20 -04:00
Matthew Taylor
2e3aee25d9
cover undefined
case as well
...
thanks @rschamp!
2016-09-01 16:22:45 -04:00
Matthew Taylor
ffa249c3c5
Check for username before sending
...
the `//` for an empty username that gets sent to the backend causes a 500 error. This is an edge case in formsy, as it has not detected a change value yet, so handle it in the username validation method. Fixes #872
2016-09-01 14:59:02 -04:00
The_Grits
c224284d81
oops
...
Just realized I took the whole footer off, not just the image.
2016-08-31 21:24:10 -04:00
The_Grits
bf24d592ad
Update guidelines.scss
...
Update to hide page's footer image when the screen is too small.
2016-08-31 21:11:19 -04:00
St19_Galla
f2c176a521
Update Credits
2016-08-31 14:59:03 -04:00
Matthew Taylor
ee088e6384
Merge pull request #896 from mewtaylor/issue/gh-825-zip
...
Fix GH-825: Only require zip code for US addresses
2016-08-29 13:14:22 -04:00
morant
ecdc544dff
Disable lint on require('react') lines as they are required implicitly.
2016-08-29 12:40:17 -04:00
Matthew Taylor
33d06e9721
Merge pull request #865 from St19Galla/patch-2
...
Fix gh-864 // Update Conference Text
2016-08-29 11:57:48 -04:00
morant
2af34efa98
Fix some failed tests.
2016-08-26 15:51:42 -04:00
Matthew Taylor
e7b0415a6b
Only require zip code for US addresses
...
Since we only check for the US, only require for that country. Other countries have zip codes, but it seems better to do it this way than codify which countries do/do not have zip codes (in case local practices are not the same as international information). Fixes #825
2016-08-26 11:14:26 -04:00
Matthew Taylor
fae45f191e
Merge pull request #873 from TheGrits/patch-2
...
Fix gh-853: Update Community Guidelines
2016-08-26 10:27:47 -04:00
Matthew Taylor
45d206315f
Merge pull request #863 from St19Galla/patch-1
...
Fix gh-860 // Update FAQ
2016-08-26 10:27:00 -04:00
St19_Galla
5ca03b4e3a
remove on from anchor
2016-08-25 08:05:32 -04:00
Matthew Taylor
ab6f8e1049
Add in an Oxford Comma
...
*whistles as he commits
see https://github.com/LLK/scratch-www/pull/819#issuecomment-242195194
2016-08-24 16:39:03 -04:00
Matthew Taylor
5dd80c1020
additional reformatting
2016-08-24 10:55:13 -04:00
Matthew Taylor
fb5d9788f8
Re-structure grid styling a bit
...
combine stylings where possible, re-name some of the variables to be used more often
2016-08-24 10:24:01 -04:00
Matthew Taylor
28f96a1d0d
Align grid items on the left
...
use `flex-start` with margins to ensure proper spacing between, while still starting at the left of each row.
2016-08-24 10:23:26 -04:00
Matthew Taylor
9a11e49444
Add device-width
by default
...
Now that we have mobile nav/footer
2016-08-24 07:54:08 -04:00
The_Grits
c0c7a1a7e0
Update Community Guidelines
...
As per @Paddle2See on #853
2016-08-23 16:31:43 -04:00
Technoboy10
32ef37e3bf
remove unused variable
2016-08-23 11:10:02 -06:00
Technoboy10
f0703b9f46
fix styling error
2016-08-23 09:26:22 -06:00
Technoboy10
55f95bb2a8
remove inactive class on tabs
2016-08-23 09:26:22 -06:00
Technoboy10
f27e99f1a4
move card styling to grid.scss, use card as default grid style
2016-08-23 09:26:22 -06:00
Technoboy10
6394d3e8cf
make search bar on 4 column layout look right
2016-08-23 09:26:22 -06:00
Technoboy10
647c925a1c
search redesign
2016-08-23 09:26:22 -06:00
Technoboy10
4d0efd1268
explore redesign
2016-08-23 09:26:21 -06:00
Technoboy10
017df9da20
redo tabs component
2016-08-23 09:26:21 -06:00
Technoboy10
3fa6fa95fd
add card display to grid and thumbnail components
2016-08-23 09:26:21 -06:00
Technoboy10
278f7c8819
more tweaks
2016-08-23 09:26:21 -06:00
Technoboy10
cca9b4a7ed
style tweaks
2016-08-23 09:26:21 -06:00
Technoboy10
55163d2c86
more work on user avatar in thumbnail
2016-08-23 09:26:21 -06:00
Technoboy10
432b621079
wip
2016-08-23 09:24:44 -06:00
Technoboy10
f883ecfbae
commit changes
2016-08-23 09:24:44 -06:00
morant
191d78fab3
Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/microworlds
2016-08-22 13:43:04 -04:00
morant
28aa4f0b2c
Fixing microword pages and adding routes to them.
...
- Remove temp "open in Scratch" button, now that we have a permanent one.
- Fix microworld pages to work with new changes to environment.
- Fix alignment issues.
- Connect routes to microworld pages.
- Add soccer microworld.
- Comment out videos and tips from arts microworls, so it can be shown publicly.
2016-08-22 13:31:44 -04:00
St19_Galla
2123fc9af8
Updates
2016-08-22 11:04:31 -04:00
St19_Galla
ceb6b38106
whoops
2016-08-22 09:46:47 -04:00
St19_Galla
4f3f978b86
Update FAQ
2016-08-22 09:41:44 -04:00
Matthew Taylor
70eb82f7cb
remove .card
-specific stylings
2016-08-19 15:16:35 -04:00
Matthew Taylor
baf0676f99
move .validation-message
out`
...
It doesn’t need to be specifically styled, as we have no use for it inside `.card` but outside `.row` yet. Thanks @rschamp!
2016-08-19 15:06:12 -04:00
Matthew Taylor
bc0263531b
align gender/org input msg with others
...
Because the `input` field is already to the right, they were being transformed too far over. This overrides the transform to be correct, and also scopes some css in more detail
2016-08-19 14:11:24 -04:00
Matthew Taylor
db2b7ebc34
Merge pull request #851 from St19Galla/patch-1
...
Fix GH-850 // Add image links
2016-08-19 06:42:40 -04:00
Matthew Taylor
9882aea9f0
Merge pull request #855 from mewtaylor/issue/gh-843
...
Fix GH-843: Add link to teacher accounts registration in faq
2016-08-19 06:42:13 -04:00
St19_Galla
43bcbaf2ac
what was i thinking lol
2016-08-17 18:30:39 -04:00
Ray Schamp
2c9e53310e
Merge pull request #852 from rschamp/bugfix/3895
...
Allow an optional / in teacher registration URL
2016-08-17 12:59:14 -04:00
Matthew Taylor
34a0cfc4e7
Add link to teacher accounts registration in faq
...
also re-order questions based on feedback
2016-08-17 12:55:58 -04:00
St19_Galla
4ca603b050
One more update for '/'
2016-08-17 10:11:00 -04:00
St19_Galla
880413a61d
fix (hopefully)
2016-08-16 21:30:52 -04:00
St19_Galla
5d5e1d9fdf
update to relative
2016-08-16 21:21:29 -04:00
Ray Schamp
f18be588a0
Allow an optional / in teacher registration URL
...
Resolves #3895
2016-08-16 11:48:46 -04:00