Commit graph

6345 commits

Author SHA1 Message Date
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
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 #3646 from LLK/develop
Merge develop to release branch
2020-01-22 15:18:02 -05:00
Benjamin Wheeler
10f2a0983a
Merge pull request #3640 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 #3643 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 #3628 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
DD Liu
d81ffdf0f0
Merge pull request #3639 from LLK/hotfix/be-fuzzles
[MASTER] Bring in render hotfix to fix updateSilhouette doing nothing on SVGSkin before getTexture is called
2020-01-14 15:17:23 -05:00
DD Liu
7bfaa27eb0
Merge pull request #3638 from LLK/hotfix/be-fuzzles
[DEVELOP] Hotfix/be fuzzles
2020-01-14 14:55:06 -05:00
DD Liu
bcebad7103
Merge branch 'develop' into hotfix/be-fuzzles 2020-01-14 14:46:09 -05:00
DD Liu
f5a34add68 Bring in render hotfix to fix updateSilhouette doing nothing on SVGSkin before getTexture is called 2020-01-14 14:38:57 -05:00
DD Liu
047d582cfa
Merge pull request #3636 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200113203847
Update scratch-gui to the latest version 🚀
2020-01-13 16:08:34 -05:00
greenkeeper[bot]
1ae28349d2
chore(package): update lockfile package-lock.json 2020-01-13 20:57:27 +00:00
greenkeeper[bot]
a78f03d26c
chore(package): update scratch-gui to version 0.1.0-prerelease.20200113203847 2020-01-13 20:57:15 +00:00
Benjamin Wheeler
25b01b6df9
Merge pull request #3624 from LLK/hotfix/mandrill-outage-page-banner
[Develop] Hotfix/mandrill outage page banner
2020-01-09 17:33:29 -05:00
Benjamin Wheeler
6ccb6a4370
Merge pull request #3634 from LLK/hotfix/mandrill-outage-page-banner
[Master] Hotfix/mandrill outage page banner
2020-01-09 17:33:20 -05:00
Ben Wheeler
223bed257b changed wording to be more specific abount time 2020-01-09 17:28:19 -05:00
Ben Wheeler
88e59a5b49 Move warning banner from splash to Page 2020-01-11 00:16:34 -05:00