Paul Kaplan
|
8d11d2a3da
|
Merge pull request #3579 from LLK/develop
Merge develop into release branch
|
2019-12-04 12:09:21 -05:00 |
|
DD Liu
|
f842fa4cca
|
Merge pull request #3578 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191204144806
Update scratch-gui to the latest version 🚀
|
2019-12-04 10:57:20 -05:00 |
|
greenkeeper[bot]
|
a5f347704d
|
chore(package): update lockfile package-lock.json
|
2019-12-04 15:11:02 +00:00 |
|
greenkeeper[bot]
|
8c4422802c
|
chore(package): update scratch-gui to version 0.1.0-prerelease.20191204144806
|
2019-12-04 15:10:58 +00:00 |
|
Paul Kaplan
|
4cc4eb728c
|
Merge pull request #3577 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191204143415
Update scratch-gui to the latest version 🚀
|
2019-12-04 09:47:08 -05:00 |
|
greenkeeper[bot]
|
85ab0f35aa
|
chore(package): update lockfile package-lock.json
|
2019-12-04 14:45:52 +00:00 |
|
greenkeeper[bot]
|
dba2c9b452
|
chore(package): update scratch-gui to version 0.1.0-prerelease.20191204143415
|
2019-12-04 14:45:47 +00:00 |
|
Ben Wheeler
|
5aa27c31d1
|
Remove comments
|
2019-12-03 21:22:52 -05:00 |
|
Ben Wheeler
|
c9cbb4a1e0
|
have join flow use refreshSessionWithRetry()
|
2019-12-03 21:19:14 -05:00 |
|
Ben Wheeler
|
39c32e7c5f
|
Add lib/session.js, add refreshSessionWithRetry()
|
2019-12-03 21:18:00 -05:00 |
|
Benjamin Wheeler
|
16cd07ce8f
|
Merge pull request #3568 from benjiwheeler/readme-refactor
major reformat of README, with changes to indenting and testing instructions
|
2019-12-02 15:22:47 -05:00 |
|
Ben Wheeler
|
9e38129fa9
|
removed unnecessary section about using in your own project
|
2019-12-02 14:50:29 -05:00 |
|
Ben Wheeler
|
bfbeb6645a
|
changes to Windows and Node instructions per adroitwhiz suggestions
|
2019-12-02 09:20:51 -05:00 |
|
Ben Wheeler
|
03576f0707
|
Corrected list of scratchr2 pages; added intro text
|
2019-12-01 23:05:43 -05:00 |
|
Ray Schamp
|
f6de9721a1
|
Merge pull request #3573 from LLK/hotfix/hoc-2019
[Develop] CSEdWeek 2019 homepage banners
|
2019-11-27 16:23:43 -05:00 |
|
Ray Schamp
|
38b88f1b4c
|
Merge pull request #3572 from LLK/hotfix/hoc-2019
[Master] CSEdWeek 2019 homepage banners
|
2019-11-27 16:22:51 -05:00 |
|
rschamp
|
b9e7c10866
|
Skip tests that fail when hoc banners are active
|
2019-11-27 15:56:31 -05:00 |
|
rschamp
|
fdddad3516
|
Review feedback
|
2019-11-27 15:45:35 -05:00 |
|
rschamp
|
d83769be71
|
Set real start date
|
2019-11-27 12:25:45 -05:00 |
|
rschamp
|
8b79a1406d
|
Use magenta to contrast with the talking tales bg
|
2019-11-27 11:34:57 -05:00 |
|
rschamp
|
e5d14ff0c2
|
Update content for 2019
|
2019-11-27 11:15:41 -05:00 |
|
rschamp
|
976cfa4acd
|
Resurrect HOC banners
|
2019-11-26 18:25:21 -05:00 |
|
rschamp
|
1a172d45e0
|
Purge old banner
|
2019-11-26 17:31:47 -05:00 |
|
Ben Wheeler
|
534658ec7a
|
Merge branch 'develop' of https://github.com/LLK/scratch-www into readme-refactor
|
2019-11-25 16:14:18 -05:00 |
|
Ben Wheeler
|
af87403793
|
major reformat of README, with changes to indenting and testing instructions
|
2019-11-24 00:00:12 -05:00 |
|
Ray Schamp
|
da515a84f0
|
Merge pull request #3566 from LLK/hotfix/hoc-redirect-queryparams
[Master] Support url parameters for 3 redirects
|
2019-11-22 15:25:43 -05:00 |
|
Ray Schamp
|
628218571b
|
Merge pull request #3567 from LLK/hotfix/hoc-redirect-queryparams
[Develop] Support url parameters for 3 redirects
|
2019-11-22 15:21:12 -05:00 |
|
Ray Schamp
|
bd879f59c6
|
Support url parameters for 3 redirects
|
2019-11-22 14:58:41 -05:00 |
|
Ray Schamp
|
b7bdafd34c
|
Merge pull request #3565 from LLK/hotfix/project-creation-replication-lag
[Develop] Work around replication lag problems on project creation
|
2019-11-22 14:54:58 -05:00 |
|
Ray Schamp
|
73cfd78b12
|
Merge pull request #3564 from LLK/hotfix/project-creation-replication-lag
[Master] Work around replication lag problems on project creation
|
2019-11-22 14:53:09 -05:00 |
|
picklesrus
|
6614a4277d
|
Merge pull request #3563 from picklesrus/replication-lag-create-hack
Hack to work around replication lag problems on project creation. Thi…
|
2019-11-22 12:17:41 -05:00 |
|
picklesrus
|
73addf562f
|
Hack to work around replication lag problems on project creation. This makes sure api can get the project before considering the project create to be complete. We ought to refactor gui and www so that we can use the project data we get back from the project create instead.
|
2019-11-22 12:15:44 -05:00 |
|
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 |
|