Commit graph

2754 commits

Author SHA1 Message Date
BryceLTaylor
3d42cefae2 Make NPM script have sauce defaults 2018-06-25 16:01:57 -04:00
BryceLTaylor
de9eb54f60 Setup Selenium Helpers create driver using SauceLabs 2018-06-25 15:17:15 -04:00
Connor Hudson
80dfaa6a1e Use l10n ids in extension chip 2018-06-22 10:01:12 -04:00
Connor Hudson
af1cf6bf6e Add preview l10n to .tx/config 2018-06-22 09:59:10 -04:00
Connor Hudson
1842be2f1a Add l10n strings for extension chips 2018-06-22 09:16:20 -04:00
Connor Hudson
363c0fdfb5 Update extension parsing in Preview to match updated VM PR 2018-06-22 09:02:11 -04:00
Connor Hudson
2293eebaec Try to fetch extensions in constructor of Preview 2018-06-21 09:45:53 -04:00
Connor Hudson
5dfbe422d7 Add additional check to getExtensions function 2018-06-21 09:45:32 -04:00
Connor Hudson
ccfd25d864 Use project ID from state instead of props 2018-06-20 17:08:06 -04:00
Connor Hudson
456e99f1be Catch errors in getExtensions function 2018-06-20 17:04:16 -04:00
Connor Hudson
bd47d763fa remove babel-loader options in webpack since it's not necessary 2018-06-20 16:25:42 -04:00
Connor Hudson
b2ddc50529 Remove misplaced getExtensions call in handleReportClick (5!) 2018-06-20 15:58:34 -04:00
Connor Hudson
058b851823
Remove outdated comment from storage.js
The issue pointed to was fixed by a separate commit.
2018-06-20 13:53:02 -04:00
Connor Hudson
b958567a24 Fix scss lint errors 2018-06-20 10:25:00 -04:00
Connor Hudson
a69ad0ec86 Implement extension fetching in Preview component 2018-06-20 09:55:09 -04:00
Connor Hudson
9f2304b8c9 Add check for extensions prop existence in PreviewPresentation 2018-06-20 09:48:40 -04:00
Connor Hudson
7fb7e9146b Merge upstream/develop, move logic to preview instead of presentation 2018-06-20 09:28:41 -04:00
Andrew Sliwinski
1fc9ed43a9
Merge pull request #1931 from thisandagain/bugfix/gdpr
Fix issue with error copy to match new teacher age limit.
2018-06-20 09:18:41 -04:00
Andrew Sliwinski
af1f67a70a Fix issue with error copy to match new teacher age limit. 2018-06-20 09:06:38 -04:00
Connor Hudson
bd22d573b6 extension-info.js -> extensions.js 2018-06-19 16:18:08 -04:00
Connor Hudson
168e155ac5 Use EXTENSION_INFO file in presentation.jsx 2018-06-19 16:13:47 -04:00
Connor Hudson
7539e74436 Add extension icons, extension info object 2018-06-19 16:13:25 -04:00
Connor Hudson
f7987fd568 Don't display image in extension chip if iconURI undefined 2018-06-19 15:58:54 -04:00
Ray Schamp
6ae4b25cd1
Merge pull request #1927 from benjiwheeler/develop-readme-benwheeler
added sentence of detail on deployment
2018-06-19 13:16:03 -04:00
Ray Schamp
1fd1a88c8f
Merge pull request #1928 from LLK/smoke/pin-gui-to-latest
Pin scratch-gui to `latest`
2018-06-19 13:15:01 -04:00
Ray Schamp
011c90d595
Pin scratch-gui to latest
Now that GUI deploys "stable" builds to the `latest` tag, we can pin to latest, so rebuilds pull in the latest stable GUI.
2018-06-19 12:59:28 -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
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
Ray Schamp
5740fe8bf8
Merge pull request #1912 from chrisgarrity/feature/preview-restructure
Feature/preview restructure
2018-06-19 10:47:40 -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
Andrew Sliwinski
270cb0280c
Update TRADEMARK 2018-06-18 13:16:55 -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