Commit graph

11336 commits

Author SHA1 Message Date
renovate[bot]
a583106263
Merge pull request #6811 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220519031627
2022-05-19 17:06:04 +00:00
Renovate Bot
e8b06e4879
chore(deps): update dependency scratch-l10n to v3.14.20220519031627 2022-05-19 14:16:40 +00:00
Bryce Taylor
ac363a1999
Merge pull request #6776 from BryceLTaylor/scratch2-project-load-tests
Add integration tests loading scratch2 projects
2022-05-19 09:41:12 -04:00
renovate[bot]
0f91c9c01e
Merge pull request #6810 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220519022830
2022-05-19 11:09:55 +00:00
Renovate Bot
81145f6487
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220519022830 2022-05-19 05:22:25 +00:00
renovate[bot]
5a3173729f
Merge pull request #6808 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220518214239
2022-05-19 02:17:08 +00:00
Renovate Bot
be542f7756
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220518214239 2022-05-18 23:35:46 +00:00
renovate[bot]
5a03415527
Merge pull request #6805 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220518170551
2022-05-18 20:35:59 +00:00
Renovate Bot
5f1cc88527
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220518170551 2022-05-18 17:50:34 +00:00
renovate[bot]
d90f16e8da
Merge pull request #6804 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220518031553
2022-05-18 06:10:31 +00:00
Renovate Bot
6d08f7d999
chore(deps): update dependency scratch-l10n to v3.14.20220518031553 2022-05-18 03:57:25 +00:00
tomlum
f6fb51ea75 fixes package lock 2022-05-16 15:05:39 -04:00
tomlum
3390c2fadd package lock fix again 2022-05-16 15:03:43 -04:00
tomlum
0f308db593 package lock fix 2022-05-16 14:58:25 -04:00
renovate[bot]
3d9d0440a9
Merge pull request #6801 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220515144130
2022-05-15 16:04:05 +00:00
Renovate Bot
897b50c900
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220515144130 2022-05-15 14:50:59 +00:00
renovate[bot]
ebeab235cd
Merge pull request #6800 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220515105840
2022-05-15 12:22:45 +00:00
Renovate Bot
edc5816223
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220515105840 2022-05-15 11:09:53 +00:00
renovate[bot]
64baa83608
Merge pull request #6799 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220515031551
2022-05-15 09:02:57 +00:00
Renovate Bot
f4f4d644e8
chore(deps): update dependency scratch-l10n to v3.14.20220515031551 2022-05-15 05:08:02 +00:00
renovate[bot]
d0ed7296e4
Merge pull request #6798 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220514183855
2022-05-14 22:14:04 +00:00
Renovate Bot
17fcc303ca
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220514183855 2022-05-14 19:53:28 +00:00
renovate[bot]
9ded236719
Merge pull request #6797 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220514054733
2022-05-14 13:22:14 +00:00
Renovate Bot
ce51cff801
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220514054733 2022-05-14 10:14:17 +00:00
renovate[bot]
137d2f154f
Merge pull request #6796 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220514031546
2022-05-14 10:12:19 +00:00
Renovate Bot
718e86a28e
chore(deps): update dependency scratch-l10n to v3.14.20220514031546 2022-05-14 04:59:35 +00:00
renovate[bot]
2c3067ede8
Merge pull request #6795 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220513195427
2022-05-13 23:37:19 +00:00
Renovate Bot
e446792446
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220513195427 2022-05-13 20:29:07 +00:00
tomlum
97d7b00fc5 fixes package lock 2022-05-13 15:35:40 -04:00
tomlum
85c61d5478 fixes packagelock merge conflicts 2022-05-13 15:18:28 -04:00
tomlum
c4231fd178 Merge branch 'master' of https://github.com/LLK/scratch-www into send-fastly-token-to-gui 2022-05-13 14:58:33 -04:00
tomlum
09a2832215 renames getprojectdata to loadprojectdata 2022-05-13 14:51:52 -04:00
renovate[bot]
dbb124fdb1
Merge pull request #6794 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220513031553
2022-05-13 11:16:39 +00:00
Renovate Bot
cc91845c1f
chore(deps): update dependency scratch-l10n to v3.14.20220513031553 2022-05-13 05:25:39 +00:00
renovate[bot]
b22a8bfec3
Merge pull request #6793 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220512195354
2022-05-12 23:12:09 +00:00
Renovate Bot
01391b25c8
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220512195354 2022-05-12 20:57:11 +00:00
Sarah Otts
b79d46c7e5
Merge pull request #6789 from LLK/release/2022-05-11
[Develop] release/2022-05-11
2022-05-12 10:40:55 -04:00
Sarah Otts
edcea6b26e
Merge pull request #6790 from LLK/release/2022-05-11
[Master] release/2022-05-11
2022-05-12 10:30:16 -04:00
renovate[bot]
570ab3c865
Merge pull request #6791 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220512062521
2022-05-12 09:35:04 +00:00
Renovate Bot
9c3d80dfb9
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220512062521 2022-05-12 09:31:58 +00:00
renovate[bot]
596a747d3e
Merge pull request #6792 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220512031601
2022-05-12 09:29:45 +00:00
Renovate Bot
596bf3a7c3
chore(deps): update dependency scratch-l10n to v3.14.20220512031601 2022-05-12 04:23:50 +00:00
seotts
347a376595 Merge remote-tracking branch 'origin/develop' into release/2022-05-11 2022-05-11 13:55:12 +00:00
Sarah Otts
d28f64bc37
Merge pull request #6781 from seotts/annual-report-route-update
Switch /annual-report to 2021 report!
2022-05-11 09:15:06 -04:00
renovate[bot]
01e821744a
Merge pull request #6788 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220511031550
2022-05-11 11:24:12 +00:00
Renovate Bot
e4cdcda702
chore(deps): update dependency scratch-l10n to v3.14.20220511031550 2022-05-11 06:07:01 +00:00
renovate[bot]
516d571de1
Merge pull request #6787 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220511000702
2022-05-11 03:12:36 +00:00
Renovate Bot
c9462082e9
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220511000702 2022-05-11 01:00:55 +00:00
Sarah Otts
159be32c45
Merge pull request #6785 from seotts/annual-report-headings
More Annual Report fixes!
2022-05-10 15:28:08 -04:00
seotts
412fb2988b remove unnessesary comment 2022-05-10 14:16:04 -04:00