3829 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
apple502j	7ecaa12222	Change min height	2019-02-09 15:17:23 +09:00
Paul Kaplan	0d17d9cee1	Merge pull request #2758 from LLK/paulkaplan-patch-5 ... Update GUI to remove touching color fixes	2019-02-07 16:57:37 -05:00
Paul Kaplan	942771f825	Update GUI to remove touching color fixes	2019-02-07 16:57:12 -05:00
Paul Kaplan	8c1da56c6d	Merge branch 'master' into develop	2019-02-07 14:58:34 -05:00
Paul Kaplan	dd293fa408	Merge pull request #2757 from LLK/paulkaplan-patch-4 ... Bump GUI to bring in VM and file export fixes	2019-02-07 14:57:48 -05:00
Paul Kaplan	134bf4ed1f	Bump GUI to bring in VM and file export fixes	2019-02-07 14:57:33 -05:00
Paul Kaplan	074464b603	Merge pull request #2754 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190207141026 ... chore(package): update scratch-gui to version 0.1.0-prerelease.201902…	2019-02-07 09:30:47 -05:00
greenkeeper[bot]	7a85771440	chore(package): update scratch-gui to version 0.1.0-prerelease.20190207141026 ... Closes #2752	2019-02-07 14:12:20 +00:00
Paul Kaplan	fc933e092a	Merge pull request #2750 from LLK/greenkeeper/initial ... Update dependencies to enable Greenkeeper 🌴	2019-02-06 16:26:21 -05:00
Paul Kaplan	6d7adc9081	Revert all updates except gui	2019-02-06 14:39:37 -05:00
greenkeeper[bot]	292461b591	chore(package): update dependencies	2019-02-06 16:22:18 +00:00
chrisgarrity	6ec47803c2	Merge pull request #2745 from LLK/hotfix/fix-toolbox-language ... [Master] Bump GUI to fix loading editor in different language	2019-02-05 17:48:58 +01:00
Benjamin Wheeler	16ca2d7319	Merge pull request #2739 from chrisgarrity/issue/2309-wide-translations ... Wrap ‘need help?’ link when translation is too long	2019-02-05 09:43:15 -05:00
chrisgarrity	56d2a90bf2	Wrap ‘need help’ link when translation is too long ... Refactored the submit row of the login component to use Flex Row instead of `float: right` for the `need help` link. The bulk of the changes are white space, so remember to ignore whitespace for review.	2019-02-05 13:00:41 +01:00
Benjamin Wheeler	6cb78a260b	Merge pull request #2741 from benjiwheeler/comments-toggle ... use slider toggle for turning comments on and off	2019-02-04 15:59:30 -05:00
Paul Kaplan	15bd684fb3	Fix version	2019-02-04 13:02:49 -05:00
Paul Kaplan	c670511ad1	Bump GUI to fix loading editor in different language	2019-02-04 12:48:43 -05:00
Ben Wheeler	7aa1ba6c42	use slider toggle for turning comments on and off	2019-02-01 17:03:43 -05:00
Ray Schamp	8aa787ec2b	Merge pull request #2736 from LLK/develop ... [Master] Deploy 1/31/2019	2019-01-31 13:45:52 -05:00
Benjamin Wheeler	94f11a908f	Merge pull request #2738 from benjiwheeler/moderator-format ... include informationpage.jsx after render.jsx, so CSS overrides in cor…	2019-01-31 11:46:10 -05:00
Ben Wheeler	6ffaa1afa8	include informationpage.jsx after render.jsx, so CSS overrides in correct order	2019-01-31 11:23:07 -05:00
chrisgarrity	688f9ea900	Merge pull request #2737 from chrisgarrity/update-about-video ... Change video id to one without autoplay	2019-01-31 17:02:39 +01:00
chrisgarrity	a7d0cb857b	Change video id to one without autoplay	2019-01-31 16:59:41 +01:00
chrisgarrity	c9a47c96df	Bump gui again for blocks translation update	2019-01-31 14:09:26 +01:00
Paul Kaplan	d522c86bdf	Merge pull request #2735 from LLK/paulkaplan-patch-4 ... Bump GUI	2019-01-30 15:31:34 -05:00
Paul Kaplan	8163eb84af	Bump GUI	2019-01-30 15:19:53 -05:00
Benjamin Wheeler	bb96d5ebb3	Merge pull request #2732 from benjiwheeler/keep-commenting-enabled-mobile ... reenable commenting on mobile, which was disabled in #2512	2019-01-30 13:43:15 -05:00
chrisgarrity	42bc19c2e3	Merge pull request #2622 from apple502j/about-video ... About video	2019-01-30 18:19:32 +01:00
Benjamin Wheeler	5b9229c6c0	Merge pull request #2731 from chrisgarrity/issue/modal-zindex ... Make www modal z-index consitent with gui	2019-01-30 12:17:01 -05:00
Ben Wheeler	bf8dd81ce9	comment form buttons should stay in row in mobile	2019-01-30 11:52:53 -05:00
Ben Wheeler	1a39d82fbf	reenable commenting on mobile, which was disabled in #2512	2019-01-30 09:56:04 -05:00
chrisgarrity	42d5254f1e	more resizing for new video	2019-01-30 12:58:15 +01:00
apple502j	10da7662e6	Remove height and width	2019-01-30 19:54:17 +09:00
chrisgarrity	3c661660c8	Make www modal z-index consitent with gui ... The gui uses z-indices up to 500 for things that should be covered by a modal and sets the modal to 510. www should match gui.	2019-01-30 11:50:07 +01:00
chrisgarrity	29b08dfd16	Merge pull request #2728 from chrisgarrity/issue/2271-tutorials-shortcut ... Add route for `/tutorials` shortcut	2019-01-30 10:10:57 +01:00
Benjamin Wheeler	f5134483a3	Merge pull request #2676 from apple502j/patch-8 ... Make internal URL clickable	2019-01-29 23:28:25 -05:00
chrisgarrity	b293f34444	Merge pull request #2535 from Kenny2github/no-faq-htmlmsg ... Migrate FAQ page to FormattedMessage. Note that I pushed the `faq/l10n.json` to transifex and manually updated scratchr2_translations as this is a 'breaking' change for translations.	2019-01-29 17:52:40 +01:00
chrisgarrity	fc5d2ed8c7	Add route for /tutorials shortcut	2019-01-29 17:21:06 +01:00
Benjamin Wheeler	bfa4e3331c	Merge pull request #2512 from benjiwheeler/mobile-read-only ... changed tablet width to 768; several responsive tweaks	2019-01-29 10:47:24 -05:00
Ben Wheeler	a8d4184b3f	renamed frameless.js tablet var to mobileIntermediate, use tabletPortrait for breaks	2019-01-29 10:35:19 -05:00
chrisgarrity	31e572e534	Merge pull request #2720 from chrisgarrity/sync-translations ... Add missing resource to .tx/config	2019-01-29 15:23:58 +01:00
chrisgarrity	b105c517d6	Add missing resource to .tx/config ... The `download/scratch2` l10n file was missing from the config file, along with the new ideas page. Also, the `name` field in the routes json needs to match the resource name. So changed the `download-scratch2` route name to match the l10n name.	2019-01-29 11:33:45 +01:00
Benjamin Wheeler	a549fcd459	Merge pull request #2724 from Kenny2github/patch-1 ... Add Community Moderator listing	2019-01-28 23:43:43 -05:00
Ben Wheeler	2ef8edf5b1	added back commented out no jobs message, for later	2019-01-28 23:37:11 -05:00
Ben Wheeler	4b660b0176	constrain studio and remix thumbnails to a single column	2019-01-28 23:12:43 -05:00
Ben Wheeler	640d565207	made extension chip showing/hiding consistent	2019-01-28 23:12:36 -05:00
Ben Wheeler	be975cba26	using tabletPortrait instead of changing value of tablet var, per chrisg's suggestion	2019-01-28 22:36:39 -05:00
Ben Wheeler	7b19878d7f	changed tablet width to 768; several responsive tweaks	2019-01-28 22:27:01 -05:00
Ken	f2bea32df8	Add Community Moderator listing	2019-01-29 08:59:31 +08:00
Ray Schamp	1f3ff4ae3f	Merge pull request #2719 from paulkaplan/hotfix/project-info-updates ... [master] Pass updates up from project updater to top-level redux store	2019-01-25 14:01:43 -05:00