Commit graph

3294 commits

Author SHA1 Message Date
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
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
Paul Kaplan
1228ef73b2
Update API_HOST_STAGING to point to api.scratch.ly 2018-10-10 14:17:07 -04:00
Benjamin Wheeler
8b222f0466
fix base modal prop passed to ReactModal (#2165) 2018-10-10 14:08:59 -04:00
Paul Kaplan
c535f8e731 Update report route to match newest API update 2018-10-10 14:01:14 -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
Eric Rosenbaum
69299d3ef9
Merge pull request #2137 from kathymakes/develop
Change scratch link icon
2018-10-09 18:30:39 -04:00
kathy wu
a224e82c41 Merge branch 'develop' of https://github.com/LLK/scratch-www into develop 2018-10-09 18:15:22 -04:00
kathy wu
294126b9b7 Update Scratch Link icon in toolbar screenshot
There is a screenshot on extension pages showing Scratch Link in context with each OS. These were updated so the featured icon is the newest Scratch Link icon.
2018-10-09 18:14:40 -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
c622d52396 Pass the topLevelCommentId to make sure nested comment deleting works 2018-10-09 10:16:35 -04:00
Paul Kaplan
e29caceb6b
Merge pull request #2150 from paulkaplan/new-comment
Add comments to projects and replies to comments
2018-10-09 10:02:17 -04:00
Benjamin Wheeler
341428ce50
storage.js can use PROJECT_HOST env setting (#2146) 2018-10-09 09:59:04 -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
79afc55f26
Merge pull request #2108 from LiFaytheGoblin/responsive-project-page/modals
Make modals responsive
2018-10-04 10:23:35 -04:00
Linda
8476cd3152 solution from before was not working if combined with current develop branch 2018-10-04 09:47:28 -04:00