scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-04 12:51:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
5362 commits 216 branches 1 tag 485 MiB
Commit graph

5362 commits

This branch
This branch
All branches
Author SHA1 Message Date
DD Liu
8d6cfdcac9
Merge pull request #3679 from LLK/develop 
Merge develop
 2020-02-05 18:53:47 -05:00
DD Liu
dc4953cc9d
Merge pull request #3678 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200205225215 
Update scratch-gui to the latest version 🚀
 2020-02-05 18:28:18 -05:00
greenkeeper[bot]
135edf99db
chore(package): update lockfile package-lock.json 2020-02-05 23:04:03 +00:00
greenkeeper[bot]
919a971ca6
chore(package): update scratch-gui to version 0.1.0-prerelease.20200205225215 2020-02-05 23:03:59 +00:00
DD Liu
1c8a3f23c5
Merge pull request #3677 from fsih/updateGui 
Update gui dep
 2020-02-05 17:31:26 -05:00
DD Liu
21d6bf7294 update gui again 2020-02-05 17:09:02 -05:00
DD Liu
910e9d2a8e Update gui dep 2020-02-05 16:17:08 -05:00
Ben Wheeler
049c0b946a use api instead of scratchr2 to validate usernames 2020-02-05 15:48:15 -05:00
Benjamin Wheeler
6e543b0c55
Merge pull request #3672 from chrisgarrity/download-faq 
Add FAQ about updating the app
 2020-02-05 13:40:15 -05:00
Chris Garrity
d55d18a8e0 Update text 2020-02-05 09:00:44 -05:00
Chris Garrity
4fd69c526a Add FAQ about updating the app 
Addresses #3104

Added separate answers for the Downloaded vs Play store versions. Also noted that school managed installations would have to be updated by administrators.
 2020-02-04 11:02:49 -05:00
Paul Kaplan
4db4384e66
Merge pull request #3668 from LLK/paulkaplan-patch-2 
Add comments.isNotPermitted string
 2020-02-03 12:04:16 -05:00
Paul Kaplan
345da1e41e
Add comments.isNotPermitted string 
We were missing a string for the case where a user has not confirmed their email address. These string IDs are interpolated directly from the error code, so no other change is needed.
 2020-01-30 16:29:08 -05:00
picklesrus
684319bf39
Merge pull request #3665 from LLK/release/2020-01-29 
[Develop] Release/2020-01-29
 2020-01-30 14:31:17 -05:00
picklesrus
b35323c562
Merge pull request #3666 from LLK/release/2020-01-29 
[Master] Release/2020-01-29
 2020-01-30 13:43:13 -05:00
picklesrus
bf37a76355
Merge pull request #3667 from chrisgarrity/patch-cookie 
Really delete the cookie
 2020-01-30 09:54:35 -05:00
Chris Garrity
70cef7335b Really delete the cookie 
It appears that setting the domain on the cookie prevents it from actually deleting the cookie.
 2020-01-30 09:43:51 -05:00
picklesrus
f9b85c7884
Merge pull request #3664 from LLK/develop 
Update release branch to include develop
 2020-01-29 16:59:44 -05:00
Ray Schamp
643d055001
Merge pull request #3663 from chrisgarrity/language-cookie-fix2 
Ensure that the old scratchlanguage cookie is removed if it exists.
 2020-01-29 16:40:12 -05:00
Chris Garrity
c95d087289 Ensure that the old scratchlanguage cookie is removed if it exists. 
On init, remove the old cookie if it exists.
On the project page, make sure `handleSetLanguage` also sets the domain.
 2020-01-29 16:11:58 -05:00
DD Liu
ffc545407b
Merge pull request #3662 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200129184440 
Greenkeeper/scratch gui 0.1.0 prerelease.20200129184440
 2020-01-29 14:09:46 -05:00
greenkeeper[bot]
a5f9fc5271
chore(package): update lockfile package-lock.json 2020-01-29 18:56:46 +00:00
greenkeeper[bot]
78749fcda7
chore(package): update scratch-gui to version 0.1.0-prerelease.20200129184440 
Closes #3661
 2020-01-29 18:56:40 +00:00
Paul Kaplan
d6149f335c
Merge pull request #3660 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200129134710 
Update scratch-gui to the latest version 🚀
 2020-01-29 13:02:13 -05:00
greenkeeper[bot]
6ebe876f60
chore(package): update lockfile package-lock.json 2020-01-29 13:59:55 +00:00
greenkeeper[bot]
4add7b8fb5
chore(package): update scratch-gui to version 0.1.0-prerelease.20200129134710 2020-01-29 13:59:51 +00:00
Paul Kaplan
be63d4a76f
Merge pull request #3659 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200128191437 
Update scratch-gui to the latest version 🚀
 2020-01-29 08:48:20 -05:00
greenkeeper[bot]
497ea533c4
chore(package): update lockfile package-lock.json 2020-01-28 19:48:59 +00:00
greenkeeper[bot]
3c913cba99
chore(package): update scratch-gui to version 0.1.0-prerelease.20200128191437 2020-01-28 19:48:55 +00:00
chrisgarrity
074b64e6d2
Merge pull request #3658 from benjiwheeler/correct-tx-push-location 
correct file location of tx-push-www script
 2020-01-28 13:02:28 -05:00
Ben Wheeler
5328ddbaaf correct file location of tx-push-www script 2020-01-28 11:43:39 -05:00
Benjamin Wheeler
389d02aa77
Merge pull request #3657 from LLK/revert-3656-revert-3651-travis-cron 
Revert "Revert "attempt to get travis cron job to only run translations""
 2020-01-28 11:14:51 -05:00
Benjamin Wheeler
5122922e36
use name in test stage 2020-01-28 11:14:16 -05:00
Benjamin Wheeler
bbae4570e0
Revert "Revert "attempt to get travis cron job to only run translations"" 2020-01-28 11:12:18 -05:00
Benjamin Wheeler
1e48a9cb4a
Merge pull request #3656 from LLK/revert-3651-travis-cron 
Revert "attempt to get travis cron job to only run translations"
 2020-01-28 10:53:27 -05:00
Benjamin Wheeler
24fa082c19
Revert "attempt to get travis cron job to only run translations" 2020-01-28 10:52:45 -05:00
chrisgarrity
bc618eae40
Merge pull request #3647 from chrisgarrity/fix-set-lang-cookie 
Set language cookie domain to allow for cross-domain cookies
 2020-01-28 09:41:58 -05:00
Paul Kaplan
da51161d94
Merge pull request #3655 from LLK/hotfix/project-page-indexing 
[Develop] Hotfix for project page indexing
 2020-01-27 15:05:33 -05:00
Paul Kaplan
7a5f1ae5e0
Merge pull request #3654 from LLK/hotfix/project-page-indexing 
[Master] Hotfix project page indexing fix
 2020-01-27 15:05:19 -05:00
greenkeeper[bot]
8d69c2c591 chore(package): update lockfile package-lock.json 2020-01-27 12:40:00 -05:00
greenkeeper[bot]
bff7b15788 chore(package): update scratch-gui to version 0.1.0-prerelease.20200127164821 2020-01-27 12:39:48 -05:00
Benjamin Wheeler
0c0ccabb99
Merge pull request #3651 from benjiwheeler/travis-cron 
attempt to get travis cron job to only run translations
 2020-01-27 11:08:43 -05:00
Ben Wheeler
725740293a revised travis yml to move condition to stage section 2020-01-24 10:39:32 -05:00
Chris Garrity
ad2f0fa4e2 Don’t prefix localhost with . 
Need to special case localhost so that changing language works when running locally.
 2020-01-23 16:56:12 -05:00
Ben Wheeler
a4764e0581 attempt to get travis cron job to only run translations 2020-01-23 12:36:47 -05:00
Ray Schamp
716503ac4e
Merge pull request #3648 from LLK/release/2020-01-22 
[Develop] Release for 2020-01-22
 2020-01-23 11:20:09 -05:00
Ray Schamp
779713c205
Merge pull request #3649 from LLK/release/2020-01-22 
[Master] Release for 2020-01-22
 2020-01-23 11:18:26 -05:00
Ray Schamp
563fb7e6e3
Merge pull request #3650 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200122215224 
Greenkeeper/scratch gui 0.1.0 prerelease.20200122215224
 2020-01-23 08:16:05 -05:00
greenkeeper[bot]
1cac336b70
chore(package): update lockfile package-lock.json 2020-01-22 22:03:18 +00:00
greenkeeper[bot]
5a0ebce1c6
chore(package): update scratch-gui to version 0.1.0-prerelease.20200122215224 
Closes #3641
 2020-01-22 22:03:14 +00:00