Skip to content

Commit 98d85c1

Browse files
committed
Merge branch 'develop' into multitenancy
2 parents b90d9dc + 45d1214 commit 98d85c1

3 files changed

Lines changed: 22 additions & 3 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
BEGIN;
2+
3+
-- Update all email addresses that end with @husky.neu.edu to end with @northeastern.edu
4+
UPDATE "User"
5+
SET email = REPLACE(email, '@husky.neu.edu', '@northeastern.edu')
6+
WHERE email LIKE '%@husky.neu.edu';
7+
8+
COMMIT;

src/frontend/src/pages/CalendarPage/DesignReviewDetailPage/FinalizeDesignReviewDetailsModal.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Box, Grid, Link, ToggleButton, ToggleButtonGroup, Typography } from '@mui/material';
1+
import { Box, Grid, Link, ToggleButton, ToggleButtonGroup, Typography, Tooltip } from '@mui/material';
2+
import HelpIcon from '@mui/icons-material/Help';
23
import { useState } from 'react';
34
import { DesignReview, wbsPipe } from 'shared';
45
import { meetingStartTimePipe } from '../../../utils/pipes';
@@ -113,7 +114,10 @@ const FinalizeDesignReviewDetailsModal = ({
113114
</Box>
114115
{meetingType.includes('virtual') && (
115116
<Box style={{ display: 'flex', marginBottom: 20, alignItems: 'center' }}>
116-
<Typography style={{ fontSize: '1.2em', marginRight: 118 }}>Zoom Link:</Typography>
117+
<Typography style={{ fontSize: '1.2em', marginRight: 5 }}>Zoom Link:</Typography>
118+
<Tooltip title="Ensure your Zoom Link is Publicly Accessible and Does Not Require a Password." placement="right">
119+
<HelpIcon style={{ fontSize: 'medium', marginRight: 96 }} />
120+
</Tooltip>
117121
<ReactHookTextField name="zoomLink" control={control} sx={{ width: 0.48 }} errorMessage={errors.zoomLink} />
118122
</Box>
119123
)}

src/frontend/src/pages/SettingsPage/UserScheduleSettings/UserScheduleSettingsEdit.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
*/
55

66
import * as yup from 'yup';
7-
import { FormControl, FormLabel, Grid, TextField, Typography } from '@mui/material';
7+
import { FormControl, FormLabel, Grid, TextField, Typography, Tooltip } from '@mui/material';
8+
import HelpIcon from '@mui/icons-material/Help';
89
import { Controller, useForm } from 'react-hook-form';
910
import { yupResolver } from '@hookform/resolvers/yup';
1011
import { NERButton } from '../../../components/NERButton';
@@ -120,6 +121,12 @@ const UserScheduleSettingsEdit: React.FC<UserScheduleSettingsEditProps> = ({
120121
<FormControl fullWidth>
121122
<FormLabel sx={{ display: 'flex' }}>
122123
<Typography sx={{ whiteSpace: 'nowrap' }}>Personal Zoom Link</Typography>
124+
<Tooltip
125+
title="Ensure your Zoom Link is Publicly Accessible and Does Not Require a Password."
126+
placement="right"
127+
>
128+
<HelpIcon style={{ fontSize: 'medium', marginLeft: '5px', marginTop: '3px' }} />
129+
</Tooltip>
123130
<ExternalLink
124131
link="https://support.zoom.com/hc/en/article?id=zm_kb&sysparm_article=KB0066271"
125132
description="(Find your Personal Zoom Link)"

0 commit comments

Comments
 (0)