Commit graph

5497 commits

Author SHA1 Message Date
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
greenkeeper[bot]
174bb446dc
chore(package): update lockfile package-lock.json 2020-01-09 03:11:20 +00:00
greenkeeper[bot]
496bb60207
chore(package): update scratch-gui to version 0.1.0-prerelease.20200109030009
Closes #3617
2020-01-09 03:11:16 +00:00
Benjamin Wheeler
ae96ac7eed
Merge pull request #3618 from LLK/hotfix/join-retry-session
[Develop] Hotfix/join retry session
2020-01-07 14:36:38 -05:00
Benjamin Wheeler
2797405669
Merge pull request #3590 from benjiwheeler/session-error-string-fix
corrected error messages that wrongly mentioned session
2020-01-06 18:24:41 -05:00
Benjamin Wheeler
e0c562bfa6
Merge pull request #3484 from benjiwheeler/join-flow-count-unicode
count unicode characters as single characters
2020-01-02 15:15:29 -05:00
Benjamin Wheeler
5a24a9d825
Merge pull request #3464 from LLK/greenkeeper/google-libphonenumber-3.2.6
Update google-libphonenumber to the latest version 🚀
2020-01-02 15:07:20 -05:00
Ben Wheeler
a9675c5fb1 updated package-lock 2020-01-02 15:07:05 -05:00
greenkeeper[bot]
71422fc170 chore(package): update google-libphonenumber to version 3.2.6 2020-01-02 15:04:07 -05:00
Benjamin Wheeler
f580e735ef
Merge pull request #3480 from LLK/greenkeeper/react-modal-3.11.1
Update react-modal to the latest version 🚀
2020-01-02 14:57:16 -05:00
Ben Wheeler
a01a99adc4 updated package-lock 2020-01-02 14:56:51 -05:00
greenkeeper[bot]
744c21d35a chore(package): update react-modal to version 3.11.1 2020-01-02 14:54:18 -05:00
Benjamin Wheeler
6e933b5608
Merge pull request #3615 from LLK/greenkeeper/url-loader-2.3.0
Greenkeeper/url loader 2.3.0
2019-12-30 23:23:11 -05:00
Ben Wheeler
ffd930167f updated package-lock 2019-12-30 23:21:23 -05:00
greenkeeper[bot]
ecd05ba0d1 chore(package): update lockfile package-lock.json 2019-12-30 23:20:41 -05:00
greenkeeper[bot]
94911a6c1f chore(package): update url-loader to version 2.3.0
Closes #3433
2019-12-30 23:20:41 -05:00
Karishma Chadha
2402fa3590
Merge pull request #3614 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191227193508
Greenkeeper/scratch gui 0.1.0 prerelease.20191227193508
2019-12-30 12:51:20 -05:00
greenkeeper[bot]
5c1f169e08
chore(package): update lockfile package-lock.json 2019-12-27 19:45:53 +00:00
greenkeeper[bot]
2cd8572b99
chore(package): update scratch-gui to version 0.1.0-prerelease.20191227193508
Closes #3611
2019-12-27 19:45:49 +00:00
Benjamin Wheeler
29019115f3
Merge pull request #3604 from benjiwheeler/refactor-fetch-session
Refactor session fetching to reduce code duplication, make more testable
2019-12-19 17:23:52 -05:00
Benjamin Wheeler
08386bf427
Merge pull request #3599 from benjiwheeler/instructions-word-break
break word in project description
2019-12-18 17:31:40 -05:00
Ben Wheeler
ea1fea8b3d remove work-break: break-word, which is deprecated 2019-12-18 11:32:00 -05:00
chrisgarrity
ca7e766f76
Merge pull request #3609 from LLK/hotfix/chromeos-faq
[Develop] Hotfix/chromeos faq
2019-12-18 09:54:31 -05:00
picklesrus
7ad5b26902
Merge pull request #3608 from LLK/hotfix/render-bugfix
[Develop]Hotfix/render bugfix
2019-12-18 09:41:24 -05:00
picklesrus
0781d09aae
Merge branch 'develop' into hotfix/render-bugfix 2019-12-18 09:40:54 -05:00
chrisgarrity
4c64982f7d
Merge pull request #3601 from LLK/hotfix/chromeos-faq
[MASTER] Update troubleshooting and FAQ sections for Scratch App and hardware extensions
Reviewed in https://github.com/LLK/scratch-www/pull/3593
2019-12-18 09:08:52 -05:00
picklesrus
632a25c5c1
Merge pull request #3607 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191217220616
Greenkeeper/scratch gui 0.1.0 prerelease.20191217220616
2019-12-17 17:28:10 -05:00
greenkeeper[bot]
0130bfc34c
chore(package): update lockfile package-lock.json 2019-12-17 22:17:01 +00:00
greenkeeper[bot]
b66be7b295
chore(package): update scratch-gui to version 0.1.0-prerelease.20191217220616
Closes #3595
2019-12-17 22:16:55 +00:00