scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 02:56:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2671 commits 217 branches 1 tag 479 MiB
Commit graph

2671 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
bdc2260531
Merge pull request #1944 from BryceLTaylor/Selenium-Helper-Update 
Selenium helper update
 2018-07-05 15:55:22 -04:00
BryceLTaylor
6cb52fca5c Fully remove Selenium_Promise_Manager=0 from tests 2018-07-05 14:22:58 -04:00
BryceLTaylor
f678c97727 Make Selenium Helper file more resemble GUI and Update Tests to use it 2018-07-05 14:22:58 -04:00
BryceLTaylor
3ef4278385 Remove use of var from selenium-helpers.js 2018-07-05 14:16:36 -04:00
BryceLTaylor
5edb9fe425 remove path to tap in package.json 2018-07-05 13:24:31 -04:00
BryceLTaylor
8231453bab Fully remove Selenium_Promise_Manager=0 from tests 
# Conflicts:
#	test/integration/smoke-testing/test_footer_links.js
#	test/integration/smoke-testing/test_navbar_links.js
#	test/integration/smoke-testing/test_project_rows.js
 2018-07-05 13:23:47 -04:00
Ray Schamp
ff662b37c5
Merge pull request #1946 from JoelGritter/JoelGritter-patch-1 
Fix gh-1899: Add Console Warning
 2018-06-29 10:24:04 -04:00
Joel Gritter
b4c35122b9
eslint-disable for console.log's 
Should resolve the Travis-CI errors
 2018-06-29 09:57:46 -04:00
Joel Gritter
1a6fa9466f
Add console warning 2018-06-29 09:23:55 -04:00
Connor Hudson
289e17195d
Merge pull request #1932 from technoboy10/feature/projects-extension-display 
Preview - Implement extension info strip
 2018-06-27 16:59:47 -04:00
Colby Gutierrez-Kraybill
02c45300d6
Merge pull request #1940 from LLK/hotfix/update-conference-2018-2 
[DEVELOP] Conference site updates
 2018-06-27 12:37:03 -04:00
Ray Schamp
d22dceffeb
Merge pull request #1943 from colbygk/hotfix/gh-ops-369 
[DEVELOP] Remove keys from .travis.yml
 2018-06-27 10:50:22 -04:00
Colby Gutierrez-Kraybill
9d58c73eb0 Moving EB_AWS* key pairs into the travis settings for this repository 2018-06-27 10:00:39 -04:00
Sean Hickey
05fd133f27 Updated LEGO Foundation logo to LEGO Education logo. Removed Thursday dinner from expect page. 2018-06-26 15:04:55 -04:00
Connor Hudson
55f4b5b92a
Merge pull request #1937 from technoboy10/bugfix/gh-1935-firefox-description-overflow 
Fix notes/instructions layout on Firefox
 2018-06-26 09:48:00 -04:00
Connor Hudson
da1fe6a6fc Use lib/log instead of console.log for project parsing error 2018-06-26 08:41:06 -04:00
Connor Hudson
5ab0aa50ad Add min-height: 0 to description block to fix notes layout on Firefox 2018-06-25 16:41:39 -04:00
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