3366 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Eric Rosenbaum	9f640ffdd6	Merge pull request #2307 from ericrosenbaum/feature/update-microbit-hex-1.1.0 ... Update microbit hex file version	2018-11-14 13:28:54 -05:00
Benjamin Wheeler	6d09f2dada	Merge pull request #2289 from benjiwheeler/show-creator ... Pass authorId and authorUsername to gui	2018-11-14 06:43:29 -05:00
Ben Wheeler	4bb5e641bb	added comment about falseness of authorId, authorUsername	2018-11-14 06:42:57 -05:00
Eric Rosenbaum	1840c9ec19	Update microbit hex file version	2018-11-13 15:43:14 -05:00
Ben Wheeler	8e967737e5	use production or staging hosts for static assets url	2018-11-13 15:32:59 -05:00
picklesrus	4a66cc2e59	Fix code review comments. Got rid of a bunch of uncessary stuff.	2018-11-13 14:14:24 -05:00
Paul Kaplan	f8d598549d	Update instead of replacing project info to match API. ... The API endpoint will return just the updated slice of the projectInfo, so just update the projectInfo instead of replacing.	2018-11-13 12:23:05 -05:00
Paul Kaplan	3a03f10aff	Move sharing to special endpoint. ... This makes a couple of assumptions about the shape of the endpoint: - Route is /proxy/projects/:id/share. - Returns the full (updated) project info on success, just like the project update endpoint does. I reviewed these with colby since this is frontrunning the actual API, but I can update once the API is finalized.	2018-11-13 08:49:37 -05:00
chrisgarrity	48593869f9	Fix wedo-legacy translations ... The translation generatation script uses the view name from the routes file when generating the translations files. So the route `name:` and `view:` must match. Symptom: when generating translations there were warnings that there were no translations for `wedo-legacy`.	2018-11-12 14:07:44 -05:00
chrisgarrity	13b3e57381	open getting started tutorial for logged out users ... - `create` on the navbar opens the getting started tutorial if the user is not logged in - replaced any other use of `tip_bar=getStarted` with `tutorial=getStarted` (with the exception of Tips page) - did not replace other uses of `tip_bar=home` as those should probably go to the new tips/ideas page.	2018-11-12 12:58:59 -05:00
chrisgarrity	062c074407	allow query parameters on the preview route ... Preview needs to be able to handle query parameters for tutorials.	2018-11-12 10:16:22 -05:00
Ray Schamp	25f7f5b273	Merge pull request #2301 from MasterOfTheTiger/issue/gh2298-job-listing ... Removes Full Stack Job Listing	2018-11-11 18:26:16 +00:00
MasterOfTheTiger	4677feb371	State that no jobs are currently available	2018-11-11 08:58:55 -08:00
Ray Schamp	e776e67af0	Merge pull request #2300 from MasterOfTheTiger/scratchjr-links ... Use https for ScratchJR links	2018-11-11 16:30:01 +00:00