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
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
Linda
62498a0c69
Merge pull request #2138 from LiFaytheGoblin/2132/positioning-remix-credit-text
...
Positioning remix credit text correctly
2018-10-03 14:30:15 -04:00
Ray Schamp
dded9e9c0f
Merge pull request #2123 from LLK/release/september-2018
...
[Master] Release for September 2018
2018-10-03 14:16:45 -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
437334b872
resolve merging conflicts
2018-10-03 10:54:53 -04:00
Linda
193a4ac70a
Merge branch 'develop' into responsive-project-page/see-inside-remix-buttons
2018-10-03 10:45:10 -04:00
Linda
38b8e2e97e
on mobile, remix credit is still a flex row
2018-10-03 10:32:12 -04:00
Linda
f11d338d65
text gets vertically centered
2018-10-03 10:29:45 -04:00
kathy wu
4a9e58d4f9
Merge branch 'develop' of https://github.com/LLK/scratch-www into develop
2018-10-03 10:27:13 -04:00
kathy wu
2fd3b3df6f
Change scratch link icon
...
Replace gear icon into newer icon
2018-10-03 10:26:29 -04:00
Linda
9b94849de6
Merge pull request #2109 from LiFaytheGoblin/responsive-project-page/stats-and-subactions
...
Stats and subactions are responsive and separate components
2018-10-03 10:23:02 -04:00
Linda
57e147e110
remove commented out css
2018-10-03 10:09:44 -04:00
Linda
8009978c06
fixed linting errors
2018-10-03 10:09:44 -04:00
