scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-30 06:41:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1
5304 commits 228 branches 1 tag 680 MiB
Commit graph

5304 commits

Author SHA1 Message Date
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 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 

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 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 from LLK/release/2020-01-29 
[Develop] Release/2020-01-29
 2020-01-30 14:31:17 -05:00
picklesrus
bf37a76355
Merge pull request 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 from LLK/develop 
Update release branch to include develop
 2020-01-29 16:59:44 -05:00
Ray Schamp
643d055001
Merge pull request 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 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
2020-01-29 18:56:40 +00:00
Paul Kaplan
d6149f335c
Merge pull request 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 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 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 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 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 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 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 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 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 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 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 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
2020-01-22 22:03:14 +00:00
Chris Garrity
92a729e9c8 Set language cookie domain to allow for cross-domain cookies 
Add leading `.` to the current hostname for the language cookie domain.
 2020-01-22 15:54:05 -05:00
Ray Schamp
b3569d8d4d
Merge pull request from LLK/develop 
Merge develop to release branch
 2020-01-22 15:18:02 -05:00
Benjamin Wheeler
10f2a0983a
Merge pull request from benjiwheeler/join-flow-retry-retry-session 
Retry of the change that retries fetching session
 2020-01-22 10:35:34 -05:00
Benjamin Wheeler
ff2e90e146
Merge pull request from benjiwheeler/translations-automate-push 
Introduce new tx-push-www script to automate string push to transifex
 2020-01-21 15:02:50 -05:00
Ben Wheeler
80b87bc8cd revised usage string 2020-01-21 14:07:26 -05:00
Ben Wheeler
2d3158a8f7 Introduce new tx-push-www script to automate string push to transifex 2020-01-16 16:06:55 -05:00
Ben Wheeler
6654362b2c fix for session promise issue 2020-01-14 22:03:05 -05:00
Ben Wheeler
7b46ddf243 Revert "Merge pull request from LLK/revert-3618-hotfix/join-retry-session" 
This reverts commit 7c9a098598, reversing
changes made to 2c68f2041e.
 2020-01-14 21:58:38 -05:00