Commit graph

6077 commits

Author SHA1 Message Date
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
Benjamin Wheeler
f5502f86aa
Merge pull request #3630 from LLK/release/2020-01-09
[Develop] Release/2020 01 09
2020-01-09 14:24:26 -05:00
Benjamin Wheeler
cc3bacfc6c
Merge pull request #3631 from LLK/release/2020-01-09
[Master] Release/2020 01 09
2020-01-09 14:24:19 -05:00
Paul Kaplan
e5eecdaedf
Merge pull request #3633 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200109172023
Update scratch-gui to the latest version 🚀
2020-01-09 12:33:56 -05:00
Paul Kaplan
281c7ebff6
Merge branch 'release/2020-01-09' into greenkeeper/scratch-gui-0.1.0-prerelease.20200109172023 2020-01-09 12:33:29 -05:00
greenkeeper[bot]
7d0086e777
chore(package): update lockfile package-lock.json 2020-01-09 17:31:20 +00:00
greenkeeper[bot]
e02d9f99b8
chore(package): update scratch-gui to version 0.1.0-prerelease.20200109172023 2020-01-09 17:31:16 +00:00
Paul Kaplan
fb9c40f0c5
Merge pull request #3632 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200109164836
Update scratch-gui to the latest version 🚀
2020-01-09 12:02:55 -05:00
greenkeeper[bot]
0680eb2335
chore(package): update lockfile package-lock.json 2020-01-09 17:01:09 +00:00
greenkeeper[bot]
c3d476c43b
chore(package): update scratch-gui to version 0.1.0-prerelease.20200109164836 2020-01-09 17:01:04 +00:00
Benjamin Wheeler
6c981d7772
Merge pull request #3629 from LLK/develop
Pull in fsih change, and session retry revert
2020-01-09 09:27:11 -05:00
Benjamin Wheeler
7c9a098598
Merge pull request #3628 from LLK/revert-3618-hotfix/join-retry-session
Revert "[Develop] Hotfix/join retry session"
2020-01-09 08:47:52 -05:00
Benjamin Wheeler
1dbe89f2bc
Revert "[Develop] Hotfix/join retry session" 2020-01-09 08:44:27 -05:00
DD Liu
2c68f2041e
Merge pull request #3626 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200109082012
Update scratch-gui to the latest version 🚀
2020-01-09 03:51:39 -05:00
greenkeeper[bot]
2ae9260f09
chore(package): update lockfile package-lock.json 2020-01-09 08:31:17 +00:00
greenkeeper[bot]
9fec74b32c
chore(package): update scratch-gui to version 0.1.0-prerelease.20200109082012 2020-01-09 08:31:12 +00:00
Ben Wheeler
2c40d8c51e draft of mandrill outage banner 2020-01-09 00:03:58 -05:00
Benjamin Wheeler
8d70a401bd
Merge pull request #3623 from LLK/develop
merge to release branch from develop
2020-01-08 22:23:39 -05:00
Benjamin Wheeler
52cad3c323
Merge pull request #3622 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20200109030009
Update to latest scratch-gui: Greenkeeper/scratch gui 0.1.0 prerelease.20200109030009
2020-01-08 22:17:50 -05:00