Commit graph

211 commits

Author SHA1 Message Date
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
Ray Schamp
cd0fb08045 Change conditional rendering to be consistent 2018-10-17 11:21:52 -04: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
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
85f13935b3 Use the proper API route for reporting projects 2018-10-15 11:17:40 -04:00
Paul Kaplan
231e9c6d89 Internationalize strings in compose-comment 2018-10-12 09:16:27 -04:00
Paul Kaplan
600ba29933 Prevent replying when comments are turned off 2018-10-11 11:54:58 -04:00
Paul Kaplan
1f8342b987
Merge pull request #2164 from paulkaplan/comment-report-delete
Comment report action and modal flow for deleting
2018-10-11 11:08:07 -04:00
Paul Kaplan
57408e46af Fix scss name order 2018-10-10 15:29:30 -04:00
Paul Kaplan
086012f802 Add comment toggling 2018-10-10 15:14:53 -04:00
Paul Kaplan
6b4e0595d0 Use gray for deleted, red for reported 2018-10-10 11:25:16 -04:00
Paul Kaplan
c19adee84a Fix internationalization 2018-10-10 11:15:09 -04:00
Paul Kaplan
237c6ecb55 Add parens for clarity 2018-10-10 09:17:18 -04:00
Paul Kaplan
997d0b5694 Fix css for report and delete comment styles 2018-10-10 09:13:21 -04:00
Paul Kaplan
ce84dddc34 Fix proptype warning for project id 2018-10-09 11:38:34 -04:00
Paul Kaplan
bdde34ba26 Implement report action with modal flow 2018-10-09 11:38:24 -04:00
chrisgarrity
32aa3e66d4
Merge pull request #2153 from LiFaytheGoblin/2133/move-media-queries-to-frameless
Move media queries used in responsive project page to frameless
2018-10-09 10:56:11 -04:00
chrisgarrity
47f71c2758 Fix confict resolution error
I missed one of the changes when resolving conflicts.
2018-10-09 10:24:02 -04:00
Paul Kaplan
58ab51a629 Add messages for other rejected comment reasons 2018-10-09 09:36:42 -04:00
Paul Kaplan
9b122470f5 Fix formatting from review comments 2018-10-09 09:36:42 -04:00
Paul Kaplan
24fe4fef65 Use topLevelCommentId to simplify adding and deleting comments
This fixes the nested comment deletion problem: https://github.com/LLK/scratch-www/issues/2151
2018-10-09 09:36:41 -04:00
Paul Kaplan
744c90501e Add comments to projects and replies to comments 2018-10-09 09:36:41 -04:00
chrisgarrity
7af2c8a80a
Merge branch 'develop' into 2133/move-media-queries-to-frameless 2018-10-09 09:12:58 -04:00
Ray Schamp
ab08aa4281
Merge pull request #2152 from LiFaytheGoblin/2133/subactions-share-date-as-prop
[new project page] share date is passed as a prop to subactions component
2018-10-08 21:35:38 +01:00
Ray Schamp
3f5f224a76
Merge pull request #2107 from LiFaytheGoblin/responsive-project-page/container-width
Make container smaller for mobile to allow for space left and right
2018-10-08 18:13:40 +01:00
Linda
14741e1cb8 if the report or add to studio modals are open, don't switch to fulls… (#2145)
* if the report or add to studio modals are open, don't switch to fullscreen on orientationchange landscape

* fix linting errors
2018-10-05 18:00:52 -04:00
Linda
d358c45482 media queries used in responsive project page have been moved to frameless.css 2018-10-05 10:25:56 -04:00
Linda
8db5216f17 share date is passed as a prop to subactions 2018-10-05 09:15:09 -04:00
Linda
bf3977821a fixed linting errors 2018-10-04 10:51:26 -04:00
Linda
ad1531aff3 fixes to spacing around page content and a few other fixes 2018-10-04 10:41:10 -04:00
Linda
502ead072f Merge branch 'develop' into responsive-project-page/container-width 2018-10-04 10:25:48 -04:00
Linda
8476cd3152 solution from before was not working if combined with current develop branch 2018-10-04 09:47:28 -04:00
Paul Kaplan
24e1c92b74
Merge pull request #2141 from paulkaplan/comment-delete
Add comment deleting for project owners on preview
2018-10-03 16:26:50 -04:00
Linda
27d7a3bf59
Merge pull request #2135 from LiFaytheGoblin/responsive-project-page/header
Make header of new project page look good on mobile
2018-10-03 15:41:03 -04:00
Linda
1aa30fb10b
Merge pull request #2136 from LiFaytheGoblin/responsive-project-page/see-inside-remix-buttons
New project page: See inside and remix buttons disappear on mobile
2018-10-03 15:40:47 -04:00
Paul Kaplan
a3f1ccc132 Fix sass-lint 2018-10-03 14:00:56 -04:00
Paul Kaplan
24b456873b Add comment deleting for project owners 2018-10-03 13:31:54 -04:00
Linda
fc57218066 fix linting errors 2018-10-03 11:12:56 -04:00
Linda
a3df002b49 resolve mergin issues 2018-10-03 11:03:18 -04:00
Linda
193a4ac70a
Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons 2018-10-03 10:45:10 -04:00