Commit Graph
4094 Commits
Author SHA1 Message Date
chrisgarrity a99ee8db0a Handle ?tutorial= query in gui
Moved the tutorial id handling into gui so it works when gui is embedded in www as well as standalone.

This seemed better than adding the same query handling to www, in order to pass an id to gui.

Note, the `?tutorial=all` handling remains in app-state-hoc. Currently it’s only needed in standalone mode for Hour of Code. It’s easy to move into the gui container if we do want it in gui by default.
2018-11-14 15:23:02 -05:00
Karishma Chadha 9469fe13bb Merge pull request #3713 from kchadha/monitor-save-load
Monitor save load
2018-11-14 15:02:02 -05:00
Karishma Chadha 4ec54e39df Update scratch-vm. 2018-11-14 14:38:58 -05:00
Karishma Chadha 1a3819c61c Remove monitor mode from state and use props instead. 2018-11-14 14:37:44 -05:00
Karishma Chadha 2ba2522af9 Default to extension color for monitors. 2018-11-14 14:37:44 -05:00
Karishma Chadha b9c12115e2 Update monitor height and width in the vm after a list monitor resize. 2018-11-14 14:37:44 -05:00
Karishma Chadha fa0b929d4f Log updates to a monitor's display mode in the VM. 2018-11-14 14:37:44 -05:00
Karishma Chadha 97faaea8df Save and load monitor position information. When the monitor is auto-positioned or dragged, a new location should be recorded in the monitor data. 2018-11-14 14:37:44 -05:00
Paul Kaplan efb3647a1c Merge pull request #3741 from paulkaplan/letter-filter
Filter for letters in the sprite/costumes libraries
2018-11-14 09:52:59 -05:00
Paul Kaplan 1550c9e884 Add letters tag for libraries and integration tests for using it 2018-11-14 09:38:48 -05:00
Paul Kaplan 0cf5b1f5ea Merge pull request #3745 from paulkaplan/fix-highlight-deleted-sprite
Prevent crash after deleting sprite that had been highlighted
2018-11-14 09:06:21 -05:00
Benjamin Wheeler ae0e265060 Merge pull request #3681 from benjiwheeler/show-creator
added author-info, user-avatar components
2018-11-14 06:41:03 -05:00
Ben Wheeler 358600d397 commented on false value of authorId, authorUsername 2018-11-14 06:40:15 -05:00
Benjamin Wheeler a6e7e85933 Merge pull request #3746 from benjiwheeler/fix-dispatch
fixed mapDispatchToProps error
2018-11-13 17:29:11 -05:00
Ben Wheeler ff621dc86d fixed mapDispatchToProps error 2018-11-13 16:54:33 -05:00
Paul Kaplan 93587c7ba1 Prevent crash after deleting sprite that had been highlighted 2018-11-13 16:27:54 -05:00
Benjamin Wheeler 6afe4f34f7 Merge pull request #3638 from benjiwheeler/trigger-save
automatically save on navigating from page; hide share and community buttons while creating
2018-11-13 15:55:44 -05:00
Ben Wheeler 5cb2b1cc60 created unit for menu bar button size 2018-11-13 15:36:24 -05:00
Paul Kaplan 924ebb58ff Merge pull request #3739 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20181113174211
Update scratch-vm to the latest version 🚀
2018-11-13 14:33:52 -05:00
Eric Rosenbaum 96d6d10dbb [Develop] hoc tracking px (#3729)
* Update to VM hotfix version

This version is a custom build of VM, which has only this change applied to the currently deployed version https://github.com/LLK/scratch-vm/pull/1719

* Add HOC tracking px
2018-11-13 14:22:33 -05:00
Evelyn Eastmond 00649b3106 Merge pull request #3715 from evhan55/extensions-library-2
Extensions Library Phase 2
2018-11-13 12:50:12 -05:00
greenkeeper[bot] c32c5bb806 chore(package): update scratch-vm to version 0.2.0-prerelease.20181113174211 2018-11-13 17:45:07 +00:00
Paul Kaplan e2c944cd4e Merge pull request #3737 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1542120810
chore(package): update scratch-blocks to version 0.1.0-prerelease.154…
2018-11-13 12:43:13 -05:00
Evelyn Eastmond 9862fa8e04 Removing test extension prop values. 2018-11-13 12:05:44 -05:00
Evelyn Eastmond 9befee7227 Removing a unit from 0 style value. 2018-11-13 11:59:40 -05:00
Evelyn Eastmond a9e5eaa413 Fixing a color and removing a z-index in styling. 2018-11-13 11:58:47 -05:00
Evelyn Eastmond c3710bb809 Fixing text alignment in non-extension libraries. 2018-11-13 11:54:25 -05:00
Evelyn Eastmond 2127111e81 Formatting. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond 628ff6ba0f Removing gratuitous formatting. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond ad4d8b8ec5 Removed TODO. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond eeaeb58e35 Filter new library item formatting on extensions only. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond b91c34a18c Keeping placement of requirement/collab consistent. Stretch items to fit. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond 7b5d11465e Stretch library items to fill container. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond 0ac5896563 Adding small inset icons for all extensions. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond d998a8c9b1 Adding sample mixed-used cases. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond 671aad0554 Adding props for bluetoothRequired, internetConnectionRequired and collaborator, etc. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond 2dded153d6 Adding requirement icons and fixing colors, opacity and padding. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond 890eab5abe Adding comments and placeholder props. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond 8a2a4a1ae0 More work on library item requires/collab section. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond 3969ee987a Fixed some margins, added requires/collab library item section, and reminders to make extension/metadata-only. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond cd5ff1ffc1 Change CSS to use rems, add reminder to make extension-only. 2018-11-13 11:44:43 -05:00
Evelyn Eastmond 5525c2cbfb Adding inset image item/component for library items. 2018-11-13 11:44:43 -05:00
greenkeeper[bot] 57bda1b87f chore(package): update scratch-blocks to version 0.1.0-prerelease.1542120810
Closes #3716
2018-11-13 16:09:14 +00:00
chrisgarrity c9b87382db Merge pull request #3694 from chrisgarrity/feature/3643-all-tutorials
Start Gui with Tutorials Library open for HoC
Also export Tutorial Card initialization for www.
2018-11-12 10:12:07 -05:00
Ben Wheeler 5681bd99f7 receive canEditTitle and authorThumbnailUrl props 2018-11-10 08:25:32 -05:00
chrisgarrity bc444149d5 export tutorial initialization for www
Export the tutorial card URL query string handling for www.
Also fix typo
2018-11-09 14:03:37 -05:00
Paul Kaplan adf7270b08 Merge pull request #3711 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20181109181214
Update scratch-paint to the latest version 🚀
2018-11-09 13:28:06 -05:00
greenkeeper[bot] e6901286e8 chore(package): update scratch-paint to version 0.2.0-prerelease.20181109181214 2018-11-09 18:22:25 +00:00
Ben Wheeler 5676cfe7d4 save on navigating from page; project watcher waits until save is done 2018-11-09 09:11:13 -05:00
Paul Kaplan 3c75bfc730 Merge pull request #3696 from paulkaplan/split-backpack-options
Split up the backpack visible and backpack host options
2018-11-09 08:19:51 -05:00