Commit graph

11139 commits

Author SHA1 Message Date
Renovate Bot
1138d52501
chore(deps): update dependency scratch-l10n to v3.14.20210909031513 2021-09-09 04:00:26 +00:00
ericrosenbaum
c8f2cdf8c7 Merge remote-tracking branch 'origin/develop' into release/2021-09-08 2021-09-08 17:37:10 +00:00
Eric Rosenbaum
472a5fa6cd
Merge pull request #6007 from BryceLTaylor/studio-transfer-tests
Add studio transfer test
2021-09-08 09:41:05 -04:00
Sarah Otts
2ee1c25244
Merge pull request #6034 from seotts/password-attempts-error
Too many password attempts error
2021-09-08 09:37:54 -04:00
renovate[bot]
df3ce0fe8d
Merge pull request #6038 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210908105639
2021-09-08 12:40:27 +00:00
Renovate Bot
bb08504b37
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210908105639 2021-09-08 11:57:10 +00:00
renovate[bot]
47fc405cf7
Merge pull request #6036 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210908083836
2021-09-08 09:46:49 +00:00
Renovate Bot
465836607b
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210908083836 2021-09-08 08:43:51 +00:00
renovate[bot]
0a2fe436f7
Merge pull request #6035 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210908031534
2021-09-08 07:10:17 +00:00
Renovate Bot
84fd6b2d47
chore(deps): update dependency scratch-l10n to v3.14.20210908031534 2021-09-08 05:02:40 +00:00
seotts
b692b61812 Change default validation error 2021-09-07 14:08:25 -04:00
seotts
9e390d3404 Unit tests for transfer error states 2021-09-07 13:28:20 -04:00
seotts
5d8d2a05c8 Add transfer error for too many password attempts 2021-09-07 12:24:02 -04:00
renovate[bot]
32466b4efe
Merge pull request #6033 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210907105447
2021-09-07 13:00:46 +00:00
Renovate Bot
736790d5a5
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210907105447 2021-09-07 12:01:27 +00:00
renovate[bot]
358be5ff0b
Merge pull request #6032 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210907083925
2021-09-07 10:52:43 +00:00
Renovate Bot
f177b80514
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210907083925 2021-09-07 10:01:29 +00:00
renovate[bot]
1989ce9116
Merge pull request #6031 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210907031515
2021-09-07 04:38:41 +00:00
Renovate Bot
bf8c75a4c0
chore(deps): update dependency scratch-l10n to v3.14.20210907031515 2021-09-07 03:42:47 +00:00
renovate[bot]
0646261af1
Merge pull request #6029 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210904091513
2021-09-04 12:34:19 +00:00
Renovate Bot
18734b183c
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210904091513 2021-09-04 10:25:40 +00:00
renovate[bot]
d62715789a
Merge pull request #6028 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210904031533
2021-09-04 04:51:31 +00:00
Renovate Bot
e0aaa2eb48
chore(deps): update dependency scratch-l10n to v3.14.20210904031533 2021-09-04 03:38:00 +00:00
Sarah Otts
f21c91106e
Merge pull request #6022 from zoebentley/bengali-language-organizer
Added Nasir and reordered lang organizers alphabetically by first name
2021-09-03 14:12:38 -04:00
renovate[bot]
93ec54d611
Merge pull request #6026 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210903100631
2021-09-03 12:36:29 +00:00
Renovate Bot
14c676ccdb
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210903100631 2021-09-03 11:08:23 +00:00
renovate[bot]
203ed492a7
Merge pull request #6024 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210903031510
2021-09-03 11:05:37 +00:00
Renovate Bot
8ffe4e1380
chore(deps): update dependency scratch-l10n to v3.14.20210903031510 2021-09-03 09:48:05 +00:00
renovate[bot]
cf52db8f02
Merge pull request #6025 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210903074252
2021-09-03 09:45:02 +00:00
Renovate Bot
a5575869a0
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210903074252 2021-09-03 08:17:08 +00:00
Eric Rosenbaum
466b6dfc2e
Merge pull request #5992 from ericrosenbaum/transfer-modal6
More transfer host modal fixes
2021-09-02 14:50:17 -04:00
Eric Rosenbaum
987523c758
Merge pull request #6023 from LLK/revert-6014-revert-5988-transfer-modal5
Revert "Revert "Transfer host modal updates""
2021-09-02 14:49:40 -04:00
Eric Rosenbaum
1d6c47d2a4
Revert "Revert "Transfer host modal updates"" 2021-09-02 14:43:31 -04:00
chrisgarrity
45f57d8e1b
Merge pull request #6015 from LLK/release/2021-09-01
Develop release/2021-09-01
2021-09-02 13:54:12 -04:00
Chris Garrity
a32af67796 Merge branch 'develop' of https://github.com/LLK/scratch-www into release/2021-09-01
# Conflicts:
#	package-lock.json
#	package.json
2021-09-02 13:53:13 -04:00
Zoë Bentley
a49308c5f3 Added Nasir and reordered lang organizers alphabetically by first name 2021-09-02 11:48:28 -04:00
renovate[bot]
7d2502147d
Merge pull request #6021 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210902133104
2021-09-02 15:46:43 +00:00
chrisgarrity
458214bbbd
Merge pull request #6016 from LLK/release/2021-09-01
Master release/2021-09-01
2021-09-02 11:45:38 -04:00
Renovate Bot
71f535098d
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210902133104 2021-09-02 14:30:35 +00:00
renovate[bot]
7a66e7f107
Merge pull request #6019 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210902111914
2021-09-02 13:23:38 +00:00
Renovate Bot
bddc9480fd
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210902111914 2021-09-02 11:50:45 +00:00
renovate[bot]
2903f855ae
Merge pull request #6018 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210902031520
2021-09-02 07:53:24 +00:00
Renovate Bot
3766cbc367
chore(deps): update dependency scratch-l10n to v3.14.20210902031520 2021-09-02 05:35:32 +00:00
Chris Garrity
893754fa3b Revert scratch-gui to the build on August 18 2021-09-01 11:22:38 -04:00
chrisgarrity
f312bcf946 Merge remote-tracking branch 'origin/develop' into release/2021-09-01 2021-09-01 15:13:36 +00:00
Eric Rosenbaum
840550abe0
Merge pull request #6014 from LLK/revert-5988-transfer-modal5
Revert "Transfer host modal updates"
2021-09-01 10:14:25 -04:00
Eric Rosenbaum
ad2536e2c6
Revert "Transfer host modal updates" 2021-09-01 10:08:11 -04:00
renovate[bot]
af0cff5ff7
Merge pull request #6013 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210901110310
2021-09-01 12:54:46 +00:00
Renovate Bot
de8cb9707b
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210901110310 2021-09-01 11:35:19 +00:00
renovate[bot]
8054bf4d5f
Merge pull request #6012 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210901084639
2021-09-01 09:38:31 +00:00