Commit graph

6863 commits

Author SHA1 Message Date
Paul Kaplan
97abd93130
Merge pull request #2785 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190214204000
chore(package): update scratch-gui to version 0.1.0-prerelease.201902…
2019-02-15 09:27:49 -05:00
Benjamin Wheeler
a985585d80
Merge pull request #2764 from apple502j/patch-11
Don't refer to a section which does not exist
2019-02-15 07:59:51 -05:00
greenkeeper[bot]
e3f10968a2 chore(package): update scratch-gui to version 0.1.0-prerelease.20190214204000
Closes #2779
2019-02-14 22:04:41 +00:00
Paul Kaplan
20ca36e6ba
Merge pull request #2778 from LLK/release/02-13-2019
Release 02/13/2019
2019-02-14 15:30:58 -05:00
Ben Wheeler
752a90965c in FAQ, added reference to Scratch Extensions to blocks change answer 2019-02-14 14:17:57 -05:00
Paul Kaplan
15bfada0ba
Update GUI to fix single-frame-gif issue 2019-02-14 14:03:40 -05:00
Andrew Sliwinski
5e1d2beabf
Merge pull request #2782 from jakel181/patch-2
Updating Privacy Policy
2019-02-14 13:54:07 -05:00
jakel181
99a4408df3
Update privacypolicy.jsx 2019-02-14 11:23:41 -05:00
jakel181
ec87c9ee8f
Update privacypolicy.jsx 2019-02-14 11:12:50 -05:00
jakel181
e15f0c8baa
Update privacypolicy.jsx 2019-02-14 11:08:19 -05:00
Paul Kaplan
fd95283cf0
Merge pull request #2777 from LLK/develop
Merge develop into release branch 02-13-2019
2019-02-13 19:19:34 -05:00
Paul Kaplan
e1654458a2
Merge pull request #2776 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190213213304
chore(package): update scratch-gui to version 0.1.0-prerelease.201902…
2019-02-13 19:18:03 -05:00
greenkeeper[bot]
05cb8cbb52 chore(package): update scratch-gui to version 0.1.0-prerelease.20190213213304
Closes #2775
2019-02-13 23:39:08 +00:00
jakel181
370d249975
Update moderator.jsx 2019-02-13 16:40:10 -05:00
jakel181
4ae339a5e6
Update moderator.jsx 2019-02-13 16:24:20 -05:00
jakel181
3fdfe6d588
Update moderator.jsx 2019-02-13 16:10:50 -05:00
Paul Kaplan
5c6d987875
Merge pull request #2772 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190213180412
chore(package): update scratch-gui to version 0.1.0-prerelease.201902…
2019-02-13 15:34:28 -05:00
greenkeeper[bot]
de9f2c7cf7 chore(package): update scratch-gui to version 0.1.0-prerelease.20190213180412
Closes #2770
2019-02-13 18:28:25 +00:00
Benjamin Wheeler
6ed66a7321
Merge pull request #2767 from benjiwheeler/autocensored-message
show autocensored message if API indicates project was autocensored
2019-02-12 10:31:41 -05:00
Ray Schamp
8ed04f0c98
Merge pull request #2756 from LLK/greenkeeper/initial
Update dependencies to enable Greenkeeper 🌴
2019-02-12 09:56:33 -05:00
Paul Kaplan
9f2ca84283
Merge pull request #2765 from paulkaplan/form-submit-logout
Use a dummy form submission instead of logging out via xhr.
2019-02-11 15:33:36 -05:00
Paul Kaplan
4b38da1917
Merge pull request #2766 from paulkaplan/fix-fullscreen-id-0
Prevent seeing /projects/0/fullscreen URL
2019-02-11 15:33:17 -05:00
Ben Wheeler
902367ef05 show autocensored message if API indicates project was autocensored 2019-02-11 13:00:35 -05:00
Paul Kaplan
c6961aae36 Do not try to manage fullscreen mode URI for unsaved projects
This fixes the issue where you could go from /projects/editor => /projects/0/fullscreen by entering fullscreen mode on a new unsaved project.
2019-02-11 10:28:44 -05:00
Paul Kaplan
49afbd2c70 Use a dummy form submission instead of logging out via xhr.
This fixes an issue where you could get logged out but then remain on your page by dismissing the window.onbeforeunload prompt when you have unsaved changes. That would put you in a state where you looked logged in but could not save.
2019-02-11 10:08:38 -05:00
Ray Schamp
62d6515a39
Merge branch 'develop' into greenkeeper/initial 2019-02-11 09:56:18 -05:00
Ray Schamp
35753dc78d
Only update gui 2019-02-11 09:53:54 -05:00
Paul Kaplan
1a7c9c337f
Merge pull request #2760 from LLK/release/02-07-2019
Release 02/07/2019
2019-02-11 09:41:40 -05:00
apple502j
653beccf4b
Don't refer to a section which does not exist 2019-02-09 15:25:12 +09:00
apple502j
7ecaa12222
Change min height 2019-02-09 15:17:23 +09:00
Paul Kaplan
d804115eb9
Merge pull request #2759 from LLK/develop
Freeze 02 07 2019
2019-02-07 17:01:38 -05: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
Eric Rosenbaum
aea7ba88ea Update blocks image 2019-02-07 15:09:10 -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
Eric Rosenbaum
d988534144 Update images 2019-02-07 14:25:43 -05:00
greenkeeper[bot]
74bb2b9f2d chore(package): update dependencies 2019-02-07 16:46:16 +00: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
Eric Rosenbaum
777f0cca47 Initial draft of landing page 2019-02-06 11:54:30 -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