Commit Graph
4542 Commits
Author SHA1 Message Date
Ben Wheeler f5e2d3ddea set title correctly 2018-12-18 16:08:29 -05:00
Ben Wheeler ac730dd336 got tests passing 2018-12-18 15:50:57 -05:00
Ben Wheeler 566ec2aa1c added project states for sb file upload; refactored uploader 2018-12-18 14:58:03 -05:00
Paul Kaplan 3a774f8c4c Merge pull request #4122 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181218150038
Update scratch-vm to the latest version 🚀
2018-12-18 10:42:54 -05:00
greenkeeper[bot] 49a24966f1 chore(package): update scratch-vm to version 0.2.0-prerelease.20181218150038 2018-12-18 15:03:13 +00:00
Paul Kaplan 3937ed73d1 Merge pull request #4111 from benjiwheeler/remix-thumbnail
render vm when requesting project thumbnail, so it is set immediately
2018-12-17 15:49:36 -05:00
Ben Wheeler 9e46eff11a render vm when requesting project thumbnail, so it is set immediately 2018-12-17 15:37:37 -05:00
Paul Kaplan 26d88052fc Merge pull request #4105 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181217191056
Update scratch-vm to the latest version 🚀
2018-12-17 14:37:59 -05:00
greenkeeper[bot] 6764d0bb9e chore(package): update scratch-vm to version 0.2.0-prerelease.20181217191056 2018-12-17 19:13:25 +00:00
Paul Kaplan 26d60033d0 Merge pull request #4102 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20181217155806
Update scratch-paint to the latest version 🚀
2018-12-17 13:38:24 -05:00
greenkeeper[bot] 8570f18954 chore(package): update scratch-paint to version 0.2.0-prerelease.20181217155806 2018-12-17 16:08:01 +00:00
Ray Schamp 56a2697749 Merge pull request #4087 from rschamp/3.0-routes
Use 3.0 routes for GETs
2018-12-16 10:36:05 -05:00
Benjamin Wheeler ffa2e87824 Merge pull request #3866 from benjiwheeler/dont-prompt
only prompt user to save if project has changed and won’t autosave
2018-12-14 16:45:20 -05:00
Ben Wheeler fed9b85dd7 clarify when user will see warning on clicking file -> new 2018-12-14 16:43:38 -05:00
Paul Kaplan 8aece59a42 Merge pull request #4092 from LLK/revert-4035-admin-sees-author
Revert 4035 admin sees author
2018-12-14 16:35:43 -05:00
Ben Wheeler 21e9909f9d revised and added tests to handle confirm on doing file new 2018-12-14 16:28:21 -05:00
Paul Kaplan a4d3b6b7f2 Add a regression test to make sure bug does not come back 2018-12-14 16:19:15 -05:00
Paul Kaplan 10459eba7c Revert "admins will see author credits, not title editing field, in editor" 2018-12-14 16:04:23 -05:00
Paul Kaplan e4701e7b3c Merge pull request #4089 from paulkaplan/use-preview-info-prop
Actually use the showPreviewInfo prop to show the preview modal
2018-12-14 15:35:21 -05:00
Paul Kaplan 923dd3ac4a Actually use the showPreviewInfo prop to show the preview modal 2018-12-14 13:47:48 -05:00
Ben Wheeler bc419199e5 only prompt user to save if project has changed and won’t autosave 2018-12-14 13:02:58 -05:00
Paul Kaplan 0d9e103707 Merge pull request #4088 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20181214155149
Update scratch-paint to the latest version 🚀
2018-12-14 12:23:36 -05:00
greenkeeper[bot] 28ba66679c chore(package): update scratch-paint to version 0.2.0-prerelease.20181214155149 2018-12-14 15:53:12 +00:00
Ray Schamp 5c83d603d6 Use 3.0 routes for GETs
This should have happened a long time ago, but the Fastly config prevented it
2018-12-14 08:53:09 -05:00
Paul Kaplan a056e75000 Merge pull request #4086 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1544731479
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
2018-12-14 08:40:46 -05:00
Paul Kaplan 81cd2a8823 Merge pull request #4082 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20181213205951
Update scratch-render to the latest version 🚀
2018-12-14 08:40:14 -05:00
Paul Kaplan c8299067f5 Merge branch 'develop' into greenkeeper/scratch-render-0.1.0-prerelease.20181213205951 2018-12-14 08:40:07 -05:00
Paul Kaplan 39100f9cde Merge pull request #4083 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20181213210237
Update scratch-paint to the latest version 🚀
2018-12-14 08:39:47 -05:00
Paul Kaplan bef72b3e86 Merge pull request #4084 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181213211546
Update scratch-vm to the latest version 🚀
2018-12-14 08:39:34 -05:00
greenkeeper[bot] 7260025bf3 chore(package): update scratch-vm to version 0.2.0-prerelease.20181213211546 2018-12-13 21:18:12 +00:00
greenkeeper[bot] c624ae8543 chore(package): update scratch-paint to version 0.2.0-prerelease.20181213210237 2018-12-13 21:09:31 +00:00
DD Liu 1f85985853 Merge pull request #4076 from LLK/greenkeeper/scratch-svg-renderer-0.2.0-prerelease.20181213192400
Update scratch-svg-renderer to the latest version 🚀
2018-12-13 16:04:03 -05:00
greenkeeper[bot] 01f9ae8ac7 chore(package): update scratch-render to version 0.1.0-prerelease.20181213205951 2018-12-13 21:02:06 +00:00
Karishma Chadha f41fc58545 Merge pull request #4048 from kchadha/randomize-sprite-positions
Randomize Sprite Positions
2018-12-13 15:59:26 -05:00
Benjamin Wheeler 49dc93f921 Merge pull request #4033 from benjiwheeler/close-file-menu2
close file menu on uploading sb file; don't close file menu twice
2018-12-13 15:49:17 -05:00
greenkeeper[bot] ad30696a0a chore(package): update scratch-blocks to version 0.1.0-prerelease.1544731479
Closes #4078
2018-12-13 20:37:52 +00:00
greenkeeper[bot] 7936acd419 chore(package): update scratch-svg-renderer to version 0.2.0-prerelease.20181213192400 2018-12-13 20:08:57 +00:00
Paul Kaplan 9c09a8d948 Merge pull request #4070 from LLK/greenkeeper/scratch-l10n-3.1.20181213173343
Update scratch-l10n to the latest version 🚀
2018-12-13 15:07:23 -05:00
Paul Kaplan 6586e2bbf0 Merge pull request #4075 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181213192047
chore(package): update scratch-vm to version 0.2.0-prerelease.2018121…
2018-12-13 15:04:22 -05:00
Paul Kaplan 24060bec4a Merge branch 'develop' into greenkeeper/scratch-l10n-3.1.20181213173343 2018-12-13 15:04:04 -05:00
Karishma Chadha 7109edaa32 Merge pull request #3984 from towerofnix/treat-defaultValue-properly
Treat defaultValue from Blockly prompts properly
2018-12-13 15:03:53 -05:00
Paul Kaplan 60be9c522a Merge pull request #4068 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1544721188
Update scratch-blocks to the latest version 🚀
2018-12-13 15:03:39 -05:00
Paul Kaplan 98d1aea826 Merge pull request #4054 from paulkaplan/fix-long-string-layout
Give max-width to sprite tiles to prevent long names issue
2018-12-13 15:02:35 -05:00
Paul Kaplan 2c1e095c2b Merge pull request #4071 from paulkaplan/dynamic-card-height
Try to always keep the tutorial in view despite screen height
2018-12-13 14:59:46 -05:00
greenkeeper[bot] b24e2c7d05 chore(package): update scratch-vm to version 0.2.0-prerelease.20181213192047
Closes #4074
2018-12-13 19:23:21 +00:00
Paul Kaplan f6c98d6132 Try to always keep the tutorial in view despite screen height 2018-12-13 12:58:04 -05:00
Benjamin Wheeler 912306e671 Merge pull request #4051 from benjiwheeler/alerts-style
revised alerts and spinner styling
2018-12-13 12:42:38 -05:00
Ben Wheeler 4b8f2eace8 removed commented code 2018-12-13 12:42:09 -05:00
Benjamin Wheeler 54d81a4fa8 Merge pull request #4024 from towerofnix/conditional-menu-section
Fix empty <MenuSection>
2018-12-13 12:39:37 -05:00
greenkeeper[bot] 8b4d66943e chore(package): update scratch-l10n to version 3.1.20181213173343 2018-12-13 17:35:42 +00:00