Benjamin Wheeler
|
6a97d44978
|
Merge pull request #3576 from benjiwheeler/join-flow-retry-session
Retry fetching session until it succeeds, when registering using join flow
|
2019-12-13 15:03:43 -05:00 |
|
picklesrus
|
65abf37fa2
|
Merge pull request #3597 from LLK/hotfix/conference2020
[Master] Hotfix/conference2020
|
2019-12-12 16:09:02 -05:00 |
|
picklesrus
|
8c8bab26ad
|
Merge pull request #3600 from picklesrus/2020-conf
Remove stray space
|
2019-12-12 08:35:55 -05:00 |
|
picklesrus
|
d16d399b99
|
Remove stray space
|
2019-12-12 08:32:48 -05:00 |
|
picklesrus
|
3efa55c692
|
Merge pull request #3596 from picklesrus/2020-conf
Adds conference page for 2020 at /conference/2020
|
2019-12-11 17:18:40 -05:00 |
|
picklesrus
|
b6d296f88d
|
Fix some spacing and replace images.
|
2019-12-11 16:21:13 -05:00 |
|
picklesrus
|
d498ef428a
|
Fix up spacing and images.
|
2019-12-11 15:53:20 -05:00 |
|
picklesrus
|
3c67fe83c5
|
More wording fixes.
|
2019-12-11 08:46:54 -05:00 |
|
picklesrus
|
b218248ad9
|
Fix old wording.
|
2019-12-10 16:07:01 -05:00 |
|
picklesrus
|
166a2dc282
|
Initial landing page with info about Scratch conference 2020.
Also switches the /conference redirect to go to conference/2020 instead
of /2019.
|
2019-12-09 16:27:47 -05:00 |
|
Ben Wheeler
|
8635f3b152
|
revise join flow tests to use refreshSessionWithRetry
|
2019-12-05 23:27:13 -05:00 |
|
Paul Kaplan
|
a5c5f3194a
|
Merge pull request #3580 from LLK/release/2019-12-04
[Master] Release 2019 12 04
|
2019-12-05 10:23:30 -05:00 |
|
picklesrus
|
8ee41880a2
|
Merge pull request #3587 from picklesrus/footer-stuff
Remove an extra comma.
|
2019-12-05 10:06:16 -05:00 |
|
picklesrus
|
69384cc2ac
|
Remove an extra comma.
|
2019-12-05 09:58:15 -05:00 |
|
Paul Kaplan
|
d460db75bd
|
Merge pull request #3585 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191205143447
Update scratch-gui to the latest version 🚀
|
2019-12-05 09:49:47 -05:00 |
|
picklesrus
|
f8f6cce2e6
|
Merge pull request #3586 from picklesrus/footer-stuff
add a missing t.
|
2019-12-05 09:48:58 -05:00 |
|
picklesrus
|
c306b92d78
|
add a missing t.
|
2019-12-05 09:47:12 -05:00 |
|
greenkeeper[bot]
|
a0810f0852
|
chore(package): update lockfile package-lock.json
|
2019-12-05 14:45:56 +00:00 |
|
greenkeeper[bot]
|
1d8ba39f8f
|
chore(package): update scratch-gui to version 0.1.0-prerelease.20191205143447
|
2019-12-05 14:45:51 +00:00 |
|
picklesrus
|
5a00faf285
|
Merge pull request #3584 from picklesrus/footer-stuff
Add missing . to end of a sentence.
|
2019-12-05 08:37:07 -05:00 |
|
picklesrus
|
8f01525c32
|
Add missing .
|
2019-12-05 08:32:55 -05:00 |
|
picklesrus
|
52ae6f791e
|
Merge pull request #3583 from picklesrus/footer-stuff
Add recognition text and links to the bottom of the page.
|
2019-12-04 17:23:34 -05:00 |
|
picklesrus
|
b89fe1a985
|
Add recognition text and links to the bottom of the page.
Adds a prop to the Page component so each page can say whether or not it
wants them to appear.
|
2019-12-04 16:28:23 -05:00 |
|
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 |
|