Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
507024d
Secondary post authors in collab editor can access version history
jimrandomh Nov 17, 2022
9c1f572
add required karma threshold for connecting to crosspost
b0b3rt Nov 18, 2022
ac8b8a4
check on both sides and don't show option at all if user doesn't have…
b0b3rt Nov 18, 2022
169be7a
remove unnecessary error display change
b0b3rt Nov 18, 2022
36c4687
lint
b0b3rt Nov 18, 2022
5069ed6
[EA Forum only] remove advisors page
s-cheng Nov 21, 2022
b9c9146
Add better explanation when a post is inaccesible
Will-Howard Nov 21, 2022
b0d0b23
add back the ability to hide moderator comments
b0b3rt Nov 21, 2022
57d3818
display error message
jpaddison3 Nov 21, 2022
ff62d59
make exception for admins
jpaddison3 Nov 21, 2022
a98a0c2
Update packages/lesswrong/server/fmCrosspost/errors.ts
b0b3rt Nov 21, 2022
2286a32
Merge pull request #6130 from ForumMagnum/secondaryAuthorsHaveVersion…
jpaddison3 Nov 21, 2022
78da252
Merge pull request #6143 from ForumMagnum/wh-page-access-message-2022-11
Will-Howard Nov 22, 2022
a09d7c9
Merge pull request #6141 from ForumMagnum/remove-advisors-page
s-cheng Nov 22, 2022
2a14a39
Merge pull request #6131 from ForumMagnum/connect-crossposter-karma-t…
b0b3rt Nov 22, 2022
8638996
Merge pull request #6146 from ForumMagnum/hidden-moderator-hat
b0b3rt Nov 22, 2022
abb8685
add emoji reaction voting system
s-cheng Nov 22, 2022
5e5d9ae
hide tooltips for emoji voting system, and fix a mobile UI bug
s-cheng Nov 22, 2022
d3ad9ee
restore tooltips, instead make emoji reactions separate from standard…
s-cheng Nov 22, 2022
6d46c5d
Merge pull request #6151 from ForumMagnum/emoji-reaction-voting
s-cheng Nov 22, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/lesswrong/components/comments/CommentFrame.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const CommentFrame = ({comment, treeOptions, onClick, id, nestingLevel, hasChild
[classes.condensed]: condensed,
[classes.shortformTop]: postPage && shortform && (nestingLevel===1),
[classes.hoverPreview]: hoverPreview,
[classes.moderatorHat]: comment.moderatorHat,
[classes.moderatorHat]: comment.hideModeratorHat ? false : comment.moderatorHat,
[classes.promoted]: comment.promoted
}
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,15 @@ export const CommentsItem = ({ treeOptions, comment, nestingLevel=1, isChild, co
* 1) it has the moderatorHat
* 2) the user is either an admin, or the moderatorHat isn't deliberately hidden
*/
// const showModeratorCommentAnnotation = comment.moderatorHat && (
// userIsAdmin(currentUser)
// ? true
// : !comment.hideModeratorHat
// );
const showModeratorCommentAnnotation = comment.moderatorHat && (
userIsAdmin(currentUser)
? true
: !comment.hideModeratorHat
);

// const moderatorCommentAnnotation = comment.hideModeratorHat
// ? 'Moderator Comment (Invisible)'
// : 'Moderator Comment';
const moderatorCommentAnnotation = comment.hideModeratorHat
? 'Moderator Comment (Invisible)'
: 'Moderator Comment';

return (
<AnalyticsContext pageElementContext="commentItem" commentId={comment._id}>
Expand Down Expand Up @@ -385,8 +385,8 @@ export const CommentsItem = ({ treeOptions, comment, nestingLevel=1, isChild, co
scrollIntoView={scrollIntoView}
scrollOnClick={postPage && !isParentComment}
/>
{comment.moderatorHat && <span className={classes.moderatorHat}>
Moderator Comment
{showModeratorCommentAnnotation && <span className={classes.moderatorHat}>
{moderatorCommentAnnotation}
</span>}
<SmallSideVote
document={comment}
Expand Down
5 changes: 3 additions & 2 deletions packages/lesswrong/components/common/ErrorAccessDenied.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ import { Components, registerComponent } from '../../lib/vulcan-lib';
import { useCurrentUser } from './withUser';
import { useServerRequestStatus } from '../../lib/routeUtil'

const ErrorAccessDenied = () => {
const ErrorAccessDenied = ({explanation}: {explanation?: string}) => {
const { SingleColumnSection, Typography } = Components;
const serverRequestStatus = useServerRequestStatus()
const currentUser = useCurrentUser();
if (serverRequestStatus) serverRequestStatus.status = 403

if (currentUser) {
const message = `Sorry, you don't have access to this page.${(explanation ? ` ${explanation}` : "")}`
return <SingleColumnSection>
<div>Sorry, you don't have access to this page.</div>
<div>{message}</div>
</SingleColumnSection>
} else {
return <SingleColumnSection>
Expand Down
160 changes: 0 additions & 160 deletions packages/lesswrong/components/ea-forum/advice/AdvisorCard.tsx

This file was deleted.

Loading