Commit graph

3480 commits

Author SHA1 Message Date
Paul Kaplan
933b805044 Make comment actions (report, delete, restore) only visible on hover 2018-11-21 11:46:54 -05:00
chrisgarrity
345b111371
Merge pull request #2333 from chrisgarrity/feature/2270-shortcut-redirect
Tutorial shortcut redirects
2018-11-21 11:31:00 -05:00
Paul Kaplan
2ed74a2682 Show deleted banner if both deleted and censored.
This is because the user can take an action to remove the trash status, but not the censored status.
2018-11-21 10:36:27 -05:00
Paul Kaplan
0b8c13fb40 Use the project author username in visibility request instead of viewer
/ht @chrisgarrity
2018-11-21 10:31:10 -05:00
Ray Schamp
54ce126559
Merge pull request #2342 from LLK/revert-2341-revert-2322-static-host-cdn
Revert "Revert "use cdn.scratch.ly in staging""
2018-11-21 10:28:03 -05:00
Ray Schamp
df3d18e649
Revert "Revert "use cdn.scratch.ly in staging"" 2018-11-21 10:27:13 -05:00
Ray Schamp
dd53c481d4
Merge pull request #2341 from LLK/revert-2322-static-host-cdn
Revert "use cdn.scratch.ly in staging"
2018-11-21 10:09:04 -05:00
Ray Schamp
45415944c1
Revert "use cdn.scratch.ly in staging" 2018-11-21 10:07:57 -05:00
Benjamin Wheeler
95fb947c08
Merge pull request #2325 from benjiwheeler/hash-redirect
redirect hash urls to url pathnames
2018-11-20 16:06:46 -05:00
Paul Kaplan
ac6a870a3f
Merge pull request #2334 from chrisgarrity/feature/rename-preview
Rename /preview to /projects
2018-11-20 15:34:03 -05:00
Ben Wheeler
79ae4dd511 let pathname end without a slash 2018-11-20 15:03:57 -05:00
Eric Rosenbaum
bfc36e25f9
Merge pull request #2329 from ericrosenbaum/feature/get-link-from-app-stores
App store badges for Link download
2018-11-20 13:17:18 -05:00
Paul Kaplan
c18ccba646 Fix scss linting 2018-11-20 12:16:10 -05:00
Paul Kaplan
122160726d Show details about why a project is not public
Follow up the project info request with a request to the visibility endpoint to find out if the project is trashed or censored. The project just not being published is handled by the existing code.

This PR generalizes the ShareBanner to a more generic "Banner" that is then filled with the relevant content.
2018-11-20 12:01:52 -05:00
Paul Kaplan
af301ba450
Merge pull request #2336 from paulkaplan/exit-single-comment-view
Allow user to exit "single comment mode" and see all comments.
2018-11-20 08:13:42 -05:00
Benjamin Wheeler
efd23ed853
Merge pull request #2322 from benjiwheeler/static-host-cdn
use cdn.scratch.ly in staging
2018-11-19 18:18:36 -05:00
Ben Wheeler
7ee463509c use cdn.scratch.ly in staging 2018-11-19 17:07:48 -05:00
chrisgarrity
c4403c5d8d Replace uses of /preview in URLs 2018-11-19 17:02:09 -05:00
Eric Rosenbaum
f77357daf2 Update mac and windows app store links 2018-11-19 15:59:37 -05:00
Paul Kaplan
3fe1242aa6 Allow user to exit "single comment mode" and see all comments.
This visually appears like a "load more comments" button for now, but has the impact of unsetting the #comments-<id> hash in the url and resetting the comment state, showing all the comments (in paginated view)
2018-11-19 15:47:47 -05:00
chrisgarrity
2065090bb8
Merge pull request #2262 from sjgllghr/issue/gh2212-migrate-scratch-1.4
Fix gh-2212: Migrate Scratch 1.4 download page
2018-11-19 15:27:49 -05:00
Eric Rosenbaum
8efb6045ee Lint 2018-11-19 15:22:18 -05:00
chrisgarrity
494bc3e48d Rename /preview to /projects 2018-11-19 14:59:56 -05:00
Paul Kaplan
430603454f
Merge pull request #2332 from paulkaplan/not-available-editor
Show projectNotAvailable view in editor mode also
2018-11-19 14:44:06 -05:00
chrisgarrity
dd620e1187 Tutorial shortcut redirects
Duplicate tutorial shortcuts previously handled by scratchr2.

Left out routeAlias as that is no longer needed.
2018-11-19 14:18:22 -05:00
Paul Kaplan
7cfc3ed846 Show projectNotAvailable view in editor mode also 2018-11-19 14:16:56 -05:00
Benjamin Wheeler
4f4a59875a
Merge pull request #2324 from benjiwheeler/remix-button
enable remix button; format remix, see inside button css
2018-11-19 13:58:23 -05:00
Ben Wheeler
50a2072794 removed stale comment 2018-11-19 13:58:02 -05:00
Eric Rosenbaum
9ee3c9eb6c App store badges for Link download 2018-11-19 13:51:29 -05:00
Ben Wheeler
1c8a124f44 switched button border radius back to 4px 2018-11-19 13:22:27 -05:00
chrisgarrity
911005f5ad
Merge branch 'master' into hotfix/hoc-banner 2018-11-19 12:03:02 -05:00
chrisgarrity
a06d8ec11e Add more bottom padding to activities button
Also restore hocbanner messages to l10n.json.
2018-11-19 11:11:48 -05:00
Ben Wheeler
cd030e0895 rearranged css to get tests working 2018-11-18 11:19:21 -05:00
Ben Wheeler
d9fdb67543 redirect hash urls to url pathnames 2018-11-17 23:59:41 -05:00
Ben Wheeler
30ed29a39a enable remix button; format remix, see inside button css 2018-11-17 15:13:58 -05:00
chrisgarrity
f2f4a6ac7c 2018 Hour of Code Banners
* add Top and Middle HoC banners
* banners share styles
* add new assets for banners
* update presentation to check date to determine whether to show the HoC banners.
2018-11-16 14:02:56 -05:00
Ray Schamp
a454fdf583
Merge pull request #2292 from LLK/release/october-2018
[Master] Release for October 2018
2018-11-16 15:47:44 +00:00
Paul Kaplan
3b1b96a044
Merge pull request #2316 from paulkaplan/preview-reducer-test
Add a unit test covering the trickier parts of the preview reducer
2018-11-15 13:42:26 -05:00
Paul Kaplan
d497797221 Add a unit test covering the trickier parts of the preview reducer 2018-11-15 10:55:48 -05:00
Paul Kaplan
16e3fa100b
Merge pull request #2313 from paulkaplan/fix-missing-extensions
Add missing extensions and images
2018-11-14 20:31:26 -05:00
Robert Chen
9b7097a772 Resolved issue #2263 2018-11-14 17:06:33 -08:00
chrisgarrity
d2500e88c7
Merge pull request #2302 from chrisgarrity/issue/2281-gettingstarted
Issue/2281 gettingstarted
2018-11-14 17:11:46 -05:00
chrisgarrity
7e9403d049
Merge pull request #2291 from chrisgarrity/feature/2280-hoc-2018
2018 Hour of Code Banners
2018-11-14 17:10:35 -05:00
chrisgarrity
d24a76e896
Merge pull request #2303 from chrisgarrity/issue/fix-wedolegacy-translations
Fix wedo-legacy translations
2018-11-14 17:08:42 -05:00
S. Gallagher
e4be2bd87c make suggested changes 2018-11-14 13:36:21 -08:00
picklesrus
6c7a56dde8
Merge pull request #2220 from picklesrus/credits-stuff
Redo the credits page.
2018-11-14 16:32:43 -05:00
Paul Kaplan
194dc90688 Add missing extensions and images 2018-11-14 15:39:40 -05:00
Paul Kaplan
476578cfa8
Merge pull request #2304 from paulkaplan/update-share-endpoint
Move sharing to special endpoint.
2018-11-14 14:15:45 -05:00
Paul Kaplan
805bd87706
Merge pull request #2293 from paulkaplan/hide-backpack-logged-out
Hide backpack for logged out users
2018-11-14 14:13:48 -05:00
Paul Kaplan
d36b71dcb3
Merge branch 'develop' into hide-backpack-logged-out 2018-11-14 14:12:51 -05:00