Commit graph

6186 commits

Author SHA1 Message Date
picklesrus
c5bb61c288
Merge pull request #2854 from LLK/develop
Merge develop into release 3-21-2019
2019-03-21 07:49:54 -04:00
apple502j
d50157e447 Update SiegelFamily Endowment Logo 2019-03-21 10:40:04 +09:00
picklesrus
d6bf35324e
Merge pull request #2851 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190320192801
Update scratch-gui to the latest version 🚀
2019-03-20 16:28:00 -04:00
greenkeeper[bot]
26cc75510d chore(package): update scratch-gui to version 0.1.0-prerelease.20190320192801 2019-03-20 19:40:03 +00:00
Paul Kaplan
35aff3592b
Merge pull request #2850 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190320190756
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-20 15:26:31 -04:00
Paul Kaplan
24cb6edcf6
Merge pull request #2846 from LLK/greenkeeper/scratch-parser-5.0.0
Update scratch-parser to the latest version 🚀
2019-03-20 15:26:04 -04:00
greenkeeper[bot]
2c1147195a chore(package): update scratch-gui to version 0.1.0-prerelease.20190320190756
Closes #2848
2019-03-20 19:20:03 +00:00
Paul Kaplan
c653353b53
Merge pull request #2847 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190318205056
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-19 08:36:08 -04:00
Ben Wheeler
5977796822 trying out a 3-icon resources for educators section 2019-03-18 18:05:20 -04:00
greenkeeper[bot]
b740997d9e chore(package): update scratch-gui to version 0.1.0-prerelease.20190318205056
Closes #2843
2019-03-18 21:07:27 +00:00
greenkeeper[bot]
33390aa63c fix(package): update scratch-parser to version 5.0.0 2019-03-18 21:06:36 +00:00
Benjamin Wheeler
ce9d520cf0
Merge pull request #2841 from LLK/release/03-14-2019
[develop] Release 03/14/2019
2019-03-14 14:11:03 -04:00
Benjamin Wheeler
e89a4d5ae9
Merge pull request #2842 from LLK/release/03-14-2019
[master] Release 03/14/2019
2019-03-14 14:08:02 -04:00
Paul Kaplan
d8580f1967
Downgrade to leave out the VM microbit queue 2019-03-14 12:04:07 -04:00
Paul Kaplan
7aae78da3e
Merge pull request #2840 from LLK/develop
Merge develop into release branch for 3/14/2019
2019-03-14 08:56:55 -04:00
Paul Kaplan
73f6bf4de1
Merge pull request #2839 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190314120510
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-14 08:55:25 -04:00
greenkeeper[bot]
d103b81617 chore(package): update scratch-gui to version 0.1.0-prerelease.20190314120510
Closes #2836
2019-03-14 12:20:15 +00:00
Ben Wheeler
815aa31f91 refactored the Resources for Educators section to have icons 2019-03-12 09:57:31 -04:00
Paul Kaplan
1b1c3b95cf
Merge pull request #2835 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190311150203
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-11 13:19:27 -04:00
greenkeeper[bot]
2b737c7b8d chore(package): update scratch-gui to version 0.1.0-prerelease.20190311150203
Closes #2829
2019-03-11 17:13:12 +00:00
Colby Gutierrez-Kraybill
110b2badd3
Merge pull request #2826 from LLK/release/03-07-2019
[develop] Release/03 07 2019
2019-03-07 13:38:33 -05:00
Colby Gutierrez-Kraybill
9f34d2021b
Merge pull request #2825 from LLK/release/03-07-2019
[Master] Release 03/07/2019
2019-03-07 13:38:11 -05:00
Bryce Taylor
699d37e38d
Merge pull request #2819 from BryceLTaylor/Update-Footer-Integration-Tests
Update the integration test for the Scratch Conference link in the fo…
2019-03-07 11:59:31 -05:00
BryceLTaylor
3f120ad830 futureproof test for conference link 2019-03-07 11:41:50 -05:00
Ray Schamp
0124c50692
Merge pull request #2828 from chrisgarrity/webpack-tutorial-images
Copy the gui localized image chunks to static
2019-03-07 10:33:28 -05:00
chrisgarrity
37ecc177ef Copy the gui localized image chunks to static
Support for dynamically loading translated images.
2019-03-07 16:21:47 +01:00
Ray Schamp
8e12ebb7a8
Merge pull request #2827 from LLK/fix-pify
Run pify package through babel loader
2019-03-07 09:23:34 -05:00
Ray Schamp
8df59a1c6a
Run pify package through babel loader 2019-03-07 09:22:53 -05:00
Paul Kaplan
77e7393307
Merge pull request #2824 from LLK/develop
Merge develop to release branch 03-07-2019
2019-03-07 08:30:58 -05:00
Paul Kaplan
b3d9978c71
Merge pull request #2823 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190306221121
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-07 08:29:25 -05:00
greenkeeper[bot]
fb2eab0e4f chore(package): update scratch-gui to version 0.1.0-prerelease.20190306221121
Closes #2816
2019-03-07 00:13:38 +00:00
Ben Wheeler
ee2cb00cc8 switched order of scratch in practice, other text in resources for educators 2019-03-05 15:40:11 -05:00
BryceLTaylor
3132dc696e Update the integration test for the Scratch Conference link in the footer 2019-03-05 15:29:07 -05:00
chrisgarrity
3aa37d5a82
Merge pull request #2748 from kyleplo/patch-4
Migrate Starter Projects
2019-03-05 12:40:58 +01:00
kyleplo
1aa87a74c8 Create starter-projects.jsx
* add messages for localization
* define projects to include in starter-projects.json
* add new route and redirect
2019-03-05 12:23:41 +01:00
Andrew Sliwinski
ddec919073
Merge pull request #2807 from LLK/issue-2806
Updated mod job description
2019-03-04 09:57:56 -05:00
seotts
32bbb1ae96 removed extra line breaks 2019-03-04 09:14:32 -05:00
Sarah Otts
2e5d93d933
Merge branch 'develop' into issue-2806 2019-03-04 09:10:44 -05:00
Andrew Sliwinski
c69a6b1ed9
Merge pull request #2773 from jakel181/patch-1
Update moderator requirements.
2019-02-28 17:39:22 -05:00
Ray Schamp
11ce158f95
Merge pull request #2811 from LLK/release/02-28-2019
[Master] Release 02/28/2019
2019-02-28 15:26:32 -05:00
Benjamin Wheeler
13d3d1f232
Merge pull request #2813 from LLK/develop
Sync develop with release, to include conferences fixes
2019-02-28 11:16:54 -05:00
Benjamin Wheeler
962184f2d1
Merge pull request #2812 from benjiwheeler/fix-conferences-2019-page
corrected mail list form; links use _blank; redirect conference url; logo links to main site
2019-02-28 11:06:54 -05:00
Ben Wheeler
e6f1a701f1 use long version of mailing list url 2019-02-28 10:57:44 -05:00
Ben Wheeler
2a4e076339 corrected mail list form; links use _blank; redirect conference url; logo links to main site 2019-02-28 10:44:30 -05:00
Paul Kaplan
6f303b5216
Merge pull request #2810 from LLK/develop
Merge develop to release branch for 02/28/2019
2019-02-28 09:23:17 -05:00
Paul Kaplan
0c8441a12f
Merge branch 'release/02-28-2019' into develop 2019-02-28 09:23:03 -05:00
Paul Kaplan
87a066e9ac
Merge pull request #2809 from LLK/paulkaplan-patch-5
Bump GUI
2019-02-28 09:20:56 -05:00
Paul Kaplan
6e568ceae9
Bump GUI 2019-02-28 09:20:25 -05:00
Benjamin Wheeler
600205b7b7
Merge pull request #2795 from benjiwheeler/regional-conferences
Add 2019 Regional conferences page
2019-02-28 06:59:10 -05:00
Eric Rosenbaum
fb09d904f9 URL is /vernier 2019-02-27 21:13:46 -05:00