Commit graph

11139 commits

Author SHA1 Message Date
Renovate Bot
c9db74b4b1
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210817234637 2021-08-18 00:47:56 +00:00
Eric Rosenbaum
0f4fba7804 clarify comment 2021-08-17 20:47:56 -04:00
renovate[bot]
3becf664e9
Merge pull request #5939 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210817193707
2021-08-17 22:25:42 +00:00
Renovate Bot
fedb450c4c
chore(deps): update dependency scratch-l10n to v3.14.20210817193707 2021-08-17 20:30:29 +00:00
seotts
f635e14a17 remove period from message 2021-08-17 11:18:10 -04:00
renovate[bot]
86f7a79a00
Merge pull request #5938 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210817113510
2021-08-17 14:46:11 +00:00
Renovate Bot
72a26535aa
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210817113510 2021-08-17 12:22:33 +00:00
renovate[bot]
49bb485cb2
Merge pull request #5937 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210817031539
2021-08-17 10:30:34 +00:00
Renovate Bot
612ec5f3aa
chore(deps): update dependency scratch-l10n to v3.14.20210817031539 2021-08-17 04:15:21 +00:00
renovate[bot]
1a9a3315b1
Merge pull request #5936 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210816193803
2021-08-16 20:39:35 +00:00
Renovate Bot
6819f121f2
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210816193803 2021-08-16 19:45:54 +00:00
seotts
aec365c8db Add becomehost notification to the activity feed 2021-08-16 14:50:58 -04:00
renovate[bot]
7588dbcd62
Merge pull request #5934 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210816120506
2021-08-16 14:11:53 +00:00
Renovate Bot
b3ca10f658
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210816120506 2021-08-16 12:57:29 +00:00
renovate[bot]
c289b517e9
Merge pull request #5933 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210816031521
2021-08-16 07:18:46 +00:00
Renovate Bot
a1ca81c19f
chore(deps): update dependency scratch-l10n to v3.14.20210816031521 2021-08-16 04:24:15 +00:00
renovate[bot]
e650a7c673
Merge pull request #5932 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210815092754
2021-08-15 12:09:05 +00:00
Renovate Bot
f6fd5f7fa1
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210815092754 2021-08-15 10:31:15 +00:00
renovate[bot]
acc303866d
Merge pull request #5931 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210815045928
2021-08-15 08:16:30 +00:00
Renovate Bot
06b949f984
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210815045928 2021-08-15 05:11:44 +00:00
renovate[bot]
002124946e
Merge pull request #5930 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210815031459
2021-08-15 05:09:18 +00:00
Renovate Bot
aacfb69fbe
chore(deps): update dependency scratch-l10n to v3.14.20210815031459 2021-08-15 03:35:47 +00:00
Bryce Taylor
d4294829d8
Merge pull request #5743 from BryceLTaylor/test-studio-rate-limit
Add studio rate limit integration test
2021-08-13 16:25:47 -04:00
Eric Rosenbaum
d797309d23 add load more button 2021-08-13 15:46:15 -04:00
Eric Rosenbaum
c928a21135 update permissions 2021-08-13 15:46:15 -04:00
Eric Rosenbaum
b4c96f3193 fix permissions and correctly select host when admins transfer 2021-08-13 15:46:15 -04:00
Eric Rosenbaum
596816d7d1 admin can transfer host 2021-08-13 15:46:15 -04:00
Ray Schamp
b215b9523b
Merge pull request #5927 from LLK/release/2021-08-11
Re-merge release branch to develop
2021-08-12 16:36:47 -04:00
Ray Schamp
a691d8690a
Merge pull request #5926 from LLK/release/2021-08-11
Revert "Merge pull request #5925 from LLK/revert-5922-release/2021-08…
2021-08-12 16:07:55 -04:00
rschamp
2d3600479a Revert "Merge pull request #5925 from LLK/revert-5922-release/2021-08-11"
This reverts commit 905ed609f9, reversing
changes made to 99c819916b.
2021-08-12 16:00:58 -04:00
Eric Rosenbaum
905ed609f9
Merge pull request #5925 from LLK/revert-5922-release/2021-08-11
Revert "Master release/2021-08-11"
2021-08-12 11:29:04 -04:00
Eric Rosenbaum
a8aead3a10
Revert "Master release/2021-08-11" 2021-08-12 11:28:18 -04:00
Eric Rosenbaum
f43336d1af
Merge pull request #5921 from LLK/release/2021-08-11
Develop release/2021-08-11
2021-08-12 11:25:38 -04:00
Eric Rosenbaum
99c819916b
Merge pull request #5922 from LLK/release/2021-08-11
Master release/2021-08-11
2021-08-12 11:16:49 -04:00
renovate[bot]
54a9ab4cbc
Merge pull request #5924 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210812113235
2021-08-12 12:38:48 +00:00
Renovate Bot
e2ab0699fe
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210812113235 2021-08-12 12:08:46 +00:00
renovate[bot]
dc99c7fc78
Merge pull request #5923 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210812031510
2021-08-12 05:10:26 +00:00
Renovate Bot
907b84b6cc
chore(deps): update dependency scratch-l10n to v3.14.20210812031510 2021-08-12 03:53:45 +00:00
ericrosenbaum
73686aa0db Merge remote-tracking branch 'origin/develop' into release/2021-08-11 2021-08-11 14:50:16 +00:00
Eric Rosenbaum
a01aa25509
Merge pull request #5918 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210811131219
2021-08-11 10:43:50 -04:00
Renovate Bot
f4ba24c426
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210811131219 2021-08-11 14:14:28 +00:00
Eric Rosenbaum
f7e221a46c revert change to "Studio Creator" label on manager tile 2021-08-11 09:44:21 -04:00
Eric Rosenbaum
ae3135bf04 Use "host" instead of "owner" 2021-08-11 09:34:55 -04:00
renovate[bot]
6e8a5efa74
Merge pull request #5916 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20210811031521
2021-08-11 05:15:44 +00:00
Renovate Bot
d57561e40f
chore(deps): update dependency scratch-l10n to v3.14.20210811031521 2021-08-11 03:38:23 +00:00
Eric Rosenbaum
f964d6a1b8 Merge branch 'develop' of https://github.com/LLK/scratch-www into transfer-modal 2021-08-10 17:10:11 -04:00
chrisgarrity
d72f5f7c79
Merge pull request #5915 from chrisgarrity/issue/5912-no-conf-tx
Fix tx-push script for conference 2021 page
2021-08-10 15:55:48 -04:00
Chris Garrity
5edb223ec1 Fix tx-push script for conference 2021 page
Fixes #5912  : handling of the conference 2021 translation updates.

Testing:
* run `./bin/tx-push-www`:
    * output shows what would run with the --execute flag.
    * look for `tx-push-src` wtih resource name 'conference-index-2021-l10njson', for the conference 2021 view.

DO NOT RUN THE SCRIPT WITH `--execute`

Steps to land this PR:
1. rename the resource on transifex: `conference-2021-index-l10njson` to `conference-index-2021-l10njson` so that we don't lose any current translations.
2. merge the PR. Nightly update-translations job will execute the script.
3. rename or remove [conference-2021-index-l10njson](https://github.com/LLK/scratch-l10n/tree/master/www/scratch-website.conference-2021-index-l10njson) in scratch-l10n.
2021-08-10 11:16:56 -04:00
Ray Schamp
4bc4e62ca9
Merge pull request #5720 from paulkaplan/extract-css
Extract css from js into stylesheets
2021-08-10 10:49:51 -04:00
Ray Schamp
8ab3b5ddd8
Merge pull request #5911 from rschamp/issues/5902
Replace SEC landing page with redirect
2021-08-10 10:14:34 -04:00