Commit graph

3778 commits

Author SHA1 Message Date
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
apple502j
4845b5af3e l10n 2018-10-15 19:51:46 +09:00
Vibhor Sehgal
1ae8180aa4 Fix Select Menu in Messages Section (#2179)
* Fix width for Select in Message Section

* Removed extra CSS property

* Removed Margin property; Not required

* Fix for the CI test
2018-10-15 06:48:29 -04:00
apple502j
972ae72a61 Parents Page SCSS 2018-10-15 18:18:04 +09:00
apple502j
1481bba310 Parents Page! 2018-10-15 18:17:43 +09:00
apple502j
7bf2c6d7e3 l10n 2018-10-15 18:17:31 +09:00
apple502j
38c85f559d Routes config 2018-10-15 18:16:17 +09:00
Vibhor Sehgal
56f7cf06ea Thumbnail Fix 2018-10-14 14:54:11 +05:30
Vibhor Sehgal
d9018185e7 Japanese Character Fix 2018-10-14 13:28:48 +05:30
Paul Kaplan
231e9c6d89 Internationalize strings in compose-comment 2018-10-12 09:16:27 -04:00
Paul Kaplan
9e1741f883
Merge pull request #2174 from paulkaplan/fix-comment-replying
Prevent replying when comments are turned off
2018-10-12 09:11:34 -04:00
Benjamin Wheeler
d5343dfb01
fix ReactModal bodyOpenClassName error so that it is entirely omitted, rather than passing null value (#2176) 2018-10-11 16:58:30 -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
1fa5c71fab
Merge pull request #2171 from paulkaplan/comment-toggling
Add comment toggling for the preview page
2018-10-11 09:34:13 -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
c6a9085d81
Merge pull request #2170 from LLK/paulkaplan-patch-1
Update API_HOST_STAGING to point to api.scratch.ly
2018-10-10 14:35:14 -04:00