Commit graph

6220 commits

Author SHA1 Message Date
Eric Rosenbaum
0c53b330e7
Merge pull request #3560 from LLK/release/2019-11-21
[Develop] Release 2019-11-21
2019-11-21 14:30:18 -05:00
Eric Rosenbaum
3e737f6268
Merge pull request #3559 from LLK/release/2019-11-21
[Master] Release 2019-11-21
2019-11-21 14:06:25 -05:00
Paul Kaplan
86b8dc5f90
Merge pull request #3509 from apple502j/credits-update
Credits member update
2019-11-21 13:18:11 -05:00
Paul Kaplan
7129cb2054
Merge pull request #3545 from apple502j/goodbye-jobs-page
Goodbye jobs page
2019-11-21 13:13:02 -05:00
apple502j
af172aee7e Change routes a bit 2019-11-22 01:00:13 +09:00
Eric Rosenbaum
cb6b840146
Merge pull request #3558 from LLK/develop
Update release branch to include develop
2019-11-20 16:53:12 -05:00
DD Liu
ecc539044e
Merge pull request #3557 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191120175131
Greenkeeper/scratch gui 0.1.0 prerelease.20191120175131
2019-11-20 15:11:53 -05:00
greenkeeper[bot]
9fbad9d180
chore(package): update lockfile package-lock.json 2019-11-20 18:05:04 +00:00
greenkeeper[bot]
bdea51c10d
chore(package): update scratch-gui to version 0.1.0-prerelease.20191120175131
Closes #3556
2019-11-20 18:04:59 +00:00
chrisgarrity
e42fd54ba8
Merge pull request #3550 from LLK/hotfix/chromeos-release
HOTFIX [develop] Enable feature flag for chrome app download
2019-11-20 10:44:56 -05:00
chrisgarrity
368fd1041c
Merge pull request #3549 from LLK/hotfix/chromeos-release
HOTFIX [master] Enable feature flag for chrome app download
2019-11-20 10:44:28 -05:00
Benjamin Wheeler
9e78443427
Merge pull request #3553 from benjiwheeler/join-flow-username-symbols
if username has spaces, provide validation message specifically mentioning that
2019-11-20 08:09:27 -05:00
chrisgarrity
d0ad715229
Merge pull request #3555 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191119221930
Update scratch-gui to the latest version 🚀 - Translation update of blocks in gui.
2019-11-20 07:45:47 -05:00
greenkeeper[bot]
e733dac98f
chore(package): update lockfile package-lock.json 2019-11-19 22:36:04 +00:00
greenkeeper[bot]
8ce7a1bcd2
chore(package): update scratch-gui to version 0.1.0-prerelease.20191119221930 2019-11-19 22:36:00 +00:00
Eric Rosenbaum
f3426d0c83
Merge pull request #3554 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191119160115
Greenkeeper/scratch gui 0.1.0 prerelease.20191119160115
2019-11-19 16:47:44 -05:00
Ben Wheeler
419f996f75 revise username spaces test 2019-11-19 16:25:21 -05:00
Ben Wheeler
e915ae1927 if username has spaces, provide validation message specifically mentioning that 2019-11-19 16:21:06 -05:00
picklesrus
23c799dd3a
Merge pull request #3547 from picklesrus/change-includes
Use indexOf instead of includes because of old browsers.
2019-11-19 14:06:07 -05:00
zoebentley
a5491db7e5
Merge pull request #3546 from zoebentley/ideas-pong-fly-imagine
Add Imagine a World, Make it Fly, & Pong to Ideas Page, and reorder activities
2019-11-19 11:37:58 -05:00
greenkeeper[bot]
3880c3de22
chore(package): update lockfile package-lock.json 2019-11-19 16:13:58 +00:00
greenkeeper[bot]
a1e3f6bdf8
chore(package): update scratch-gui to version 0.1.0-prerelease.20191119160115
Closes #3552
2019-11-19 16:13:54 +00:00
Paul Kaplan
48b502a347
Enable chrome app feature flag 2019-11-18 15:23:34 -05:00
DD Liu
f1dd439f6d
Merge pull request #3543 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191118132205
Update scratch-gui to the latest version 🚀
2019-11-18 14:48:34 -05:00
picklesrus
d1c7829853 Use indexOf instead of includes because of old browsers. 2019-11-18 14:06:19 -05:00
Zoë Bentley
7c194ced62 Add Imagine a World, Make it Fly, and Pong to Ideas Page, and reorder activities 2019-11-18 13:52:00 -05:00
picklesrus
a111be6db9
Merge pull request #3540 from LLK/hotfix/join-flow
[Develop] Hotfix/join Merge hotfix that enables join flow back to develop
2019-11-18 12:44:03 -05:00
picklesrus
94f52bafd1
Merge pull request #3541 from LLK/hotfix/join-flow
[Master] Hotfix/join flow
2019-11-18 12:16:41 -05:00
apple502j
6d9a7d20da Links and test changes 2019-11-19 01:34:19 +09:00
apple502j
3f61b09889 Remove jobs page 2019-11-19 01:33:56 +09:00
picklesrus
9bc6039011
Merge pull request #3544 from picklesrus/join-flow-launch
Skip the join flow smoke test since it was put in place to make sure …
2019-11-18 10:21:21 -05:00
picklesrus
7fa103e344 Skip the join flow smoke test since it was put in place to make sure we didn't launch the new join flow by mistake. 2019-11-18 10:20:02 -05:00
greenkeeper[bot]
789c36f03a
chore(package): update lockfile package-lock.json 2019-11-18 13:47:00 +00:00
greenkeeper[bot]
ffbd71193d
chore(package): update scratch-gui to version 0.1.0-prerelease.20191118132205 2019-11-18 13:46:56 +00:00
picklesrus
25620053c8
Merge pull request #3537 from picklesrus/join-flow-launch
Roll out new Join Flow.
2019-11-15 13:26:52 -05:00
picklesrus
1ae7052e50
Merge pull request #3538 from picklesrus/join-welcome-homepage
Take user to the homepage when finishing the join flow (unless they c…
2019-11-15 13:18:10 -05:00
picklesrus
6bf2f15ed7
Merge pull request #3536 from picklesrus/join-welcome-homepage
Take user to the homepage when finishing the join flow (unless they c…
2019-11-15 13:17:19 -05:00
picklesrus
5b351b6515 Roll out new Join Flow. 2019-11-15 11:28:10 -05:00
picklesrus
378cebe5f4 Take user to the homepage when finishing the join flow (unless they came from the editor). There is replication lag that makes creating a project immediatley a bad experience. We'll fix this in a followup. 2019-11-15 11:23:54 -05:00
picklesrus
f5148c2928
Merge pull request #3523 from LLK/release/2019-11-14
[DEVELOP] Release 2019-11-14
2019-11-15 11:08:15 -05:00
chrisgarrity
0bc3df1bd2
Merge pull request #3522 from LLK/release/2019-11-14
[MASTER] Release 2019-11-14
2019-11-14 14:02:57 -05:00
chrisgarrity
02197493d4
Merge pull request #3530 from fsih/updateGuiRelease
Update gui to pull in render revert
2019-11-14 13:09:13 -05:00
DD Liu
4873884d8a Update gui to pull in render revert 2019-11-14 11:55:11 -05:00
chrisgarrity
6846f8c07f
Merge pull request #3521 from LLK/develop
Merge develop into release branch
2019-11-14 07:52:30 -05:00
apple502j
0bff005162 Member updates with latest info 2019-11-14 01:01:24 +09:00
chrisgarrity
e4c204463e
Merge pull request #3513 from chrisgarrity/download-faq
Additional ChromeOS/Android FAQs for the download page
2019-11-13 10:38:07 -05:00
picklesrus
39aa4bca60
Merge pull request #3516 from picklesrus/fix-password-field
Put the right value in the password field. This got mixed up in #3512.
2019-11-13 10:35:40 -05:00
picklesrus
a036d5d13c Put the right value in the password field. This got mixed up in #3512. 2019-11-13 10:10:14 -05:00
Chris Garrity
0d93c3faf0 Correct TM capitalization 2019-11-13 09:43:24 -05:00
Karishma Chadha
11c9ec37fe
Merge pull request #3514 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191112225310
Update scratch-gui to the latest version 🚀
2019-11-12 20:03:57 -05:00