Commit graph

2842 commits

Author SHA1 Message Date
Ben Wheeler
db4e64e4c7 cleaned up debug code, formatting of addtostudio buttons 2018-06-19 12:59:27 -04:00
Connor Hudson
ea1c0ce4a2 Add initial implementation of loading extension info from sb3 project 2018-06-19 12:26:22 -04:00
Connor Hudson
11738f9a31 Add scratch-parser, scratch-storage dependencies 2018-06-19 11:26:51 -04:00
Ben Wheeler
1b874b748c further debugging addtostudio modal 2018-06-19 11:26:02 -04:00
Connor Hudson
ca91294b31 Add ScratchStorage subclass for getting project JSON 2018-06-19 11:24:54 -04:00
Connor Hudson
df0db1b2c3 Update webpack config to load scratch-* dependencies 2018-06-19 11:24:22 -04:00
Ben Wheeler
61dda43b8f further debugging addtostudio modal 2018-06-19 11:07:25 -04:00
Ray Schamp
5740fe8bf8
Merge pull request #1912 from chrisgarrity/feature/preview-restructure
Feature/preview restructure
2018-06-19 10:47:40 -04:00
Ben Wheeler
b18ddeedaf better handling of addtostudio modal scrollbar; attempting to debug its setstate calls 2018-06-19 10:47:17 -04:00
Ben Wheeler
16190f1147 got addtostudio modal state changes to work, though not updating to server yet 2018-06-19 10:13:40 -04:00
Ben Wheeler
bc0a5f64f7 add to studio modal: notes on next steps 2018-06-19 00:14:32 -04:00
Ben Wheeler
e05079a28c mocked my permissioned studios 2018-06-19 00:00:37 -04:00
Ben Wheeler
4c657a1e80 showing actual studio membership, though not unadded studios yet 2018-06-18 23:36:20 -04:00
Ben Wheeler
054824b2de added package-lock.json to .gitignore 2018-06-18 23:36:20 -04:00
Ben Wheeler
847e204efc add to studio modal scrollbar formatting works 2018-06-18 19:47:43 -04:00
Ray Schamp
9e02798f7b Lint 2018-06-18 17:19:12 -04:00
Ray Schamp
0c3221f835 Prevent wrapping the notes and credits column 2018-06-18 17:15:56 -04:00
Ben Wheeler
7949d646a8 added sentence of detail on deployment 2018-06-18 15:29:10 -04:00
Ben Wheeler
f8df3c0146 added royal blue color, button styles, small jsx fixes to Add to Studio modal 2018-06-18 15:17:19 -04:00
Andrew Sliwinski
270cb0280c
Update TRADEMARK 2018-06-18 13:16:55 -04:00
Ben Wheeler
9d9226f4a4 got rid of bug keeping page from displaying 2018-06-16 19:28:28 -04:00
Ben Wheeler
f0fbc0a57f add to studio modal appears from project page, looks horrendous 2018-06-16 19:13:50 -04:00
Ben Wheeler
20242af3de preview view comment 2018-06-16 18:19:31 -04:00
Connor Hudson
b826a1ad2f Add onExtensionAdded function to bindAll call 2018-06-15 09:52:12 -04:00
Connor Hudson
3b09bf145c Fix hasStatus prop type 2018-06-15 08:47:52 -04:00
Connor Hudson
1f5075f9d8 Initial (hacky) solution for loading EIABCW content 2018-06-14 16:54:55 -04:00
chrisgarrity
7f41771710
Merge pull request #1925 from LLK/hotfix/update-conference
[HOTFIX] [DEVELOP] - Content updates for Scratch Conference 2018 website (sponsor logos and keynote descriptions)
2018-06-14 16:32:19 -04:00
chrisgarrity
83a27f11c0
Merge pull request #1924 from LLK/hotfix/update-conference
[HOTFIX] - Content updates for Scratch Conference 2018 website (sponsor logos and keynote descriptions)
2018-06-14 16:31:15 -04:00
Connor Hudson
3eb0e12bf6 Only use extensions with preexisting data URIs for demo chips 2018-06-14 15:11:03 -04:00
Connor Hudson
b40f939566 iconSrc -> iconURI to match CategoryInfo format 2018-06-14 15:10:33 -04:00
Andrew Sliwinski
3f4f413510
Merge pull request #1923 from apple502j/patch-3
Change splash to use 30000000
2018-06-14 12:29:17 -04:00
Ray Schamp
1840b9df31 Convert presentation function component
Fixing a typo let the linter catch that this no longer needs to be a class component
2018-06-14 09:26:44 -04:00
Ray Schamp
4ce05622bc Move report options from state
These never change so don't belong there.
2018-06-14 09:22:00 -04:00
Connor Hudson
b317c12e79 Add some mockup extensions 2018-06-13 16:45:48 -04:00
Connor Hudson
e7e0ba720c Add extension list styles 2018-06-13 16:45:06 -04:00
Andrew Sliwinski
87a039c101
Merge pull request #1919 from thisandagain/bugfix/gdpr
Use 16 as offset for teacher registration
2018-06-13 16:24:28 -04:00
Colby Gutierrez-Kraybill
f9abebf86a
Merge pull request #1921 from colbygk/hotfix/funding_redirects
[Master] Add donate and connect (email list) redirects
2018-06-13 15:59:20 -04:00
Connor Hudson
f9dd4e76aa Add padding to extension status div 2018-06-13 15:35:58 -04:00
Connor Hudson
0733a5dde4 Fix class name for extension icon 2018-06-13 15:32:31 -04:00
Connor Hudson
11af7fec9b Add extension status styling, tweak margins and spacing 2018-06-13 15:24:19 -04:00
Sean Hickey
8f0b12c2a6 Updated sponsor logos and keynote descriptions 2018-06-13 15:12:50 -04:00
Ray Schamp
add01c8393
Merge pull request #1922 from colbygk/hotfix/funding_redirects
[Develop] Add donate and connect (email list) redirects
2018-06-13 14:57:50 -04:00
Connor Hudson
a9e8a06c6d Add props to ExtensionChip 2018-06-13 14:53:41 -04:00
Connor Hudson
0056e93e4a Add more margin to extension chip content, use rem where it makes sense 2018-06-13 14:53:26 -04:00
Connor Hudson
6bace1b11e Add ExtensionChip component with demo content 2018-06-13 14:05:20 -04:00
apple502j
070cbe091f
Change splash (GH-1916)
It uses "30000000 projects" by default now!
2018-06-13 17:32:35 +09:00
Colby Gutierrez-Kraybill
835b33e91e Add donate and connect (email list) redirects
* https://scratch.mit.edu/donatehttps://secure.donationpay.org/scratchfoundation/
* https://scratch.mit.edu/connecthttps://eepurl.com/cws7_f
2018-06-12 18:27:15 -04:00
Andrew Sliwinski
ca6d78d928 Use 16 as offset for teacher registration as per GDPR 2018-06-12 15:40:52 -04:00
Ray Schamp
9a48aceaf3
Merge pull request #1911 from LLK/release/may-2018
[Master] May 2018 Release
2018-06-07 15:22:01 -04:00
Ray Schamp
ee23bbf1b5
Update scratch-gui version 2018-06-05 13:21:37 -04:00