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
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
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
