Commit graph

11160 commits

Author SHA1 Message Date
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
EdwardGeneralov
b2f34adc07 add zulu language menu
Scratch share user
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
chrisgarrity
8093814e54 Merge pull request #1003 from EdwardGeneralov/patch-6
Add Zulu to Language Menu
2016-11-10 09:34:44 -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
Ray Schamp
36b28e69f4 Merge pull request #1004 from LLK/hotfix/hoc-url
[Master] Allow querystring in /hoc URL
2016-11-07 16:39:41 -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
EdwardGeneralov
296591f171 add zulu language menu
Scratch share user
2016-11-07 13:56:45 +03: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
Ray Schamp
dacc51d1ae Merge pull request #992 from LLK/release/2.2.14
[Master] Release 2.2.14
2016-10-31 16:25:04 -04:00
Ray Schamp
8976349d47 Merge branch 'master' of github.com:LLK/scratch-www into release/2.2.14 2016-10-31 16:06:08 -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
Andrew Sliwinski
a49e378c02 Merge pull request #991 from thisandagain/bugfix/coverage
Add coverage and dependency badges to README
2016-10-31 10:02:56 -04:00
Matthew Taylor
70f57103b0 Merge pull request #989 from St19Galla/patch-1
Fix gh-988: Update jobs page
2016-10-31 09:55:24 -04:00
Andrew Sliwinski
decf7cf1cf Add coverage and dependency badges to README 2016-10-31 09:15:47 -04:00
Andrew Sliwinski
df62a2d407 Merge pull request #986 from jzoldak/zoldak/add-coverage
Measure test coverage
2016-10-31 09:07:49 -04:00