5195 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
chrisgarrity	fdeab4de05	Merge pull request #2213 from chrisgarrity/issue/2172-integrate-intl ... Integrate www-gui localization	2018-10-23 07:02:38 -04:00
Vibhor Sehgal	733c3d1bff	Responsive about page.	2018-10-23 11:29:44 +08:00
chrisgarrity	3fcc13a8cd	Integrate www-gui localization ... * Initialize `locales` in redux using methods exported by GUI. * pass GUI method to set the `scratchlanguage` cookie NOTE: It does not reload the page, so switching back to the project page will not reflect language changes made in gui until the next page reload. Reloading the page will lose project state so we don’t want to do that.	2018-10-22 17:38:35 -04:00
Paul Kaplan	ecd686f5a8	Merge pull request #2221 from paulkaplan/fix-parent-id ... Use parent_id and commentee_id correctly when posting comments.	2018-10-22 16:37:46 -04:00
Paul Kaplan	c289ce72d1	Use parent_id and commentee_id the right way when posting comments. ... The parent_id is the top-level-parent, the commentee_id is the user to whom the comment is directed , the one that is mentioned in @ reply.	2018-10-22 14:35:42 -04:00
picklesrus	d4a050a1c0	Remove duplicate message	2018-10-22 08:57:22 -04:00
picklesrus	ad564b4ea4	Redo the credits page. ... See https://github.com/LLK/scratch-www/issues/2093 for details.	2018-10-21 14:57:12 -04:00
Benjamin Wheeler	a6409bbcce	Pass to and receive from GUI info about project creation lifecycle; handle url changes (#2197) ... * add canSaveNew prop to pass to GUI * pass to and receive from GUI info about project lifecycle * reset project data or fetch new project data depending on updates received from gui * removed canSaveNew * projectId always a string * moved handleUpdateProjectId calls that fetch or set project metadata into componentDidUpdate * changed page history object * removed comments * two small fixes to deal with edge cases * cleaning up getExtensions	2018-10-19 16:02:59 -04:00
Paul Kaplan	8acbf05b1a	Merge pull request #2211 from paulkaplan/fix-studio-modal ... Connect the consolidated studio data directly	2018-10-19 10:44:32 -04:00
chrisgarrity	b0a5f7feff	Merge pull request #2183 from sehgalvibhor/character-fix ... Japanese Character Fix	2018-10-19 09:12:53 -04:00
Paul Kaplan	f9f662a3f3	Merge pull request #2206 from paulkaplan/staff-comments ... Add * to comments from staff on preview	2018-10-19 08:55:41 -04:00
apple502j	9cb2c34a1d	Merge branch 'develop' into add-parents	2018-10-19 21:14:57 +09:00
apple502j	43238c4bca	FAQ link fix	2018-10-19 21:13:27 +09:00
Paul Kaplan	35abd285df	Connect the consolidated studio data directly ... To the modal to prevent constantly updating. Also only render the modals if they are visible	2018-10-18 16:45:24 -04:00
Paul Kaplan	f3b9826fd5	Merge pull request #2208 from paulkaplan/fix-load-more ... Use top level + replies count to control "Load More" comments button	2018-10-18 13:19:10 -04:00
Paul Kaplan	4f6f7502ae	Use scratchteam instead of is_staff	2018-10-18 13:09:43 -04:00
Paul Kaplan	61947f2390	Use scratchteam instead of is_staff	2018-10-18 13:09:08 -04:00
Paul Kaplan	efc26aef21	Merge pull request #2207 from paulkaplan/show-replying-to ... Show the username of the parent comment in replies	2018-10-18 11:43:52 -04:00
Paul Kaplan	066e5ff141	Use top level + replies count to control "Load More" comments button ... This fixes an issue where a project with one top-level comment and one reply would should the "Load more" button at the bottom, even though there were no more to load	2018-10-18 11:42:10 -04:00
Paul Kaplan	1d3c3ff431	Use EmojiText component to allow emoji display when API includes them	2018-10-18 10:18:00 -04:00
Paul Kaplan	c257379846	Add * to comments from staff on preview ... This requires the API to include the `is_staff` flag, but it will not change functionality if it is not there, everyone would be considered not staff, which is the current behavior.	2018-10-18 10:14:42 -04:00
Paul Kaplan	d982d2d723	Show the username of the person being replied to in a comment on preview	2018-10-18 10:11:51 -04:00
chrisgarrity	fdde8a80dd	Merge pull request #2192 from chrisgarrity/update-tx-config ... Add missing l10n files to tx config	2018-10-18 09:17:38 -04:00
Paul Kaplan	505dda09ae	Merge pull request #2198 from paulkaplan/fix-comment-msg ... Comment minor fixes	2018-10-17 14:09:53 -04:00
Paul Kaplan	312a9e2bff	Restrict reporting comments to logged in users	2018-10-17 13:19:46 -04:00
Paul Kaplan	7b514344fa	Allow admins access to comment delete	2018-10-17 13:16:41 -04:00
Paul Kaplan	242f01118b	Add missing status message for comments	2018-10-17 11:56:43 -04:00
Paul Kaplan	fa68377bca	Merge pull request #2194 from paulkaplan/all-comments ... Add admin capabilities to preview project comments	2018-10-17 11:33:23 -04:00
Ray Schamp	cd0fb08045	Change conditional rendering to be consistent	2018-10-17 11:21:52 -04:00
apple502j	651f4b43a0	Parents l10n	2018-10-17 21:18:16 +09:00
Paul Kaplan	2ac90315ea	Use can prefix instead of undefined callback	2018-10-16 15:09:10 -04:00
Paul Kaplan	1965a1223d	Fix sass lint	2018-10-16 15:08:01 -04:00
Paul Kaplan	7772e197c7	Make comment deleting and restoring correctly update replies	2018-10-16 15:08:01 -04:00
Paul Kaplan	592c0e5703	Add restore functionality to comments for admins	2018-10-16 15:08:00 -04:00
Paul Kaplan	b0ac4018ee	Use admin routes to include all comments when loading page	2018-10-16 15:08:00 -04:00
Paul Kaplan	b7b7b079b9	Combine comment reported and deleted flags into visibility string ... To prepare for server including visibility	2018-10-16 15:08:00 -04:00
sjgllghr	6d8235c7e8	Fix gh-2156: Use variables for media queries for consistency (#2182) ... * use variables for media queries * add medium-and-intermediate media query variable	2018-10-16 13:28:41 -04:00
Paul Kaplan	effbfbeaff	Merge pull request #2196 from paulkaplan/share-banner ... Make share banner work on preview	2018-10-16 13:21:16 -04:00
Paul Kaplan	9ce79deac6	Control visibility externally and fix css	2018-10-16 13:02:22 -04:00
Paul Kaplan	21a7f1227e	Make share banner actually share projects	2018-10-16 11:38:26 -04:00
Benjamin Wheeler	4124e26588	set explicit capabilities like “can____” for GUI and project page (#2187) ... * set explicit capabilities like “can____” for GUI and project page * set canShare to proper value instead of hardcoding it * don't tell gui canReport	2018-10-16 10:49:35 -04:00
Paul Kaplan	29a6a27f46	Merge pull request #2173 from paulkaplan/comment-i10n ... Localize all the comment related strings	2018-10-16 10:04:06 -04:00
Paul Kaplan	bb71bd706a	Merge pull request #2190 from paulkaplan/move-report-to-api ... Use the proper API route for reporting projects	2018-10-16 10:03:43 -04:00
Paul Kaplan	95d088f56a	Merge pull request #2191 from paulkaplan/fix-delete-comment ... Fix comment delete endpoint	2018-10-16 10:03:26 -04:00
chrisgarrity	5764d22f8e	Add missing l10n files to tx config	2018-10-16 08:15:26 -04:00
Benjamin Wheeler	9106a14340	made account menu have min-width, changed max-width to rem from px (#2181)	2018-10-15 16:00:47 -04:00
Paul Kaplan	cef36682fd	Fix comment delete endpoint	2018-10-15 15:24:20 -04:00
Paul Kaplan	85f13935b3	Use the proper API route for reporting projects	2018-10-15 11:17:40 -04:00
Robert Chen	24d07f6139	Fix gh-2160: Search with % (#2161) ... * Fixed turning '+' into ' ' * Fixed issue 2160 * Added space before '{'	2018-10-15 09:36:05 -04:00
apple502j	ec1d46eef6	Parents Page fix	2018-10-15 19:51:57 +09:00