Commit graph

4310 commits

Author SHA1 Message Date
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
Ray Schamp
04e7aa1c8f
Merge pull request #2718 from paulkaplan/hotfix/project-info-updates
[develop] Fix project info updates being reflected after "See Inside"
2019-01-25 13:46:16 -05:00
Paul Kaplan
8e57bb5493 Pass updates up from project updater to top-level redux store 2019-01-25 13:35:39 -05:00
Ray Schamp
86ec698bf0
Merge pull request #2717 from LLK/hotfix/show-update-errors-hoc
Update z-index so validation bubbles go below the nav bar
2019-01-25 13:26:12 -05:00
Ray Schamp
db99c12d89
Merge pull request #2714 from LLK/hotfix/show-update-errors-hoc
[Master] Wrap project inputs to show server validation
2019-01-25 11:49:02 -05:00
Ray Schamp
29d5a80b5e
Update z-index so validation bubbles go below the nav bar 2019-01-25 11:20:32 -05:00
Ray Schamp
594c7453e6
Merge pull request #2716 from LLK/hotfix/show-update-errors-hoc
Fix initial value for notes and credits aka description
2019-01-25 10:27:47 -05:00
Ray
d8d46b102b Fix initial value for notes and credits aka description
Resolves "mirror world" issue
2019-01-25 10:11:22 -05:00
Paul Kaplan
2c6af0c0a3
Merge pull request #2711 from paulkaplan/show-update-errors-hoc
[Develop] Wrap project update inputs to show server validation
2019-01-25 09:40:29 -05:00
Paul Kaplan
d6c48a5730 Wrap project update inputs to show server validation 2019-01-24 16:53:21 -05:00
Paul Kaplan
8980fa289f
Merge pull request #2709 from LLK/develop
Deploy late January 2019 work to production
2019-01-24 15:37:25 -05:00
picklesrus
8aeba47261
Merge pull request #2707 from LLK/picklesrus-patch-1
Bump Gui
2019-01-23 18:50:01 -05:00
picklesrus
0019532c38
Bump Gui 2019-01-23 18:25:21 -05:00
Eric Rosenbaum
71cb92c214
Merge pull request #2704 from ericrosenbaum/bugfix/update-extension-chips
Update extension chips
2019-01-23 17:30:38 -05:00
Paul Kaplan
4f44aa08cc
Merge pull request #2705 from LLK/paulkaplan-patch-4
Bump GUI
2019-01-23 16:50:11 -05:00
Paul Kaplan
45a6779a32
Bump GUI 2019-01-23 16:44:25 -05:00
Eric Rosenbaum
825b885638 Update extension chip icons 2019-01-23 15:51:35 -05:00
Eric Rosenbaum
44ec3de0f1 Change extension chip wording to “Video Sensing” 2019-01-23 15:51:00 -05:00
Benjamin Wheeler
b72118e29d
Merge pull request #2702 from benjiwheeler/autocensored-message
added default censored messages
2019-01-23 15:24:58 -05:00
Benjamin Wheeler
5f3f7f0977
Merge pull request #2703 from LLK/revert-2693-revert-2682-studio-use-permissions
Revert "Revert "Add to studio modal should only show studios user can actually change""
2019-01-23 14:17:27 -05:00