Skip to content

Commit

Permalink
Merge branch 'master' into 2273-secure-flag-on-cookies
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew-Grayson authored Oct 24, 2023
2 parents d52b3d1 + 6bfba99 commit 39b282d
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 115 deletions.
74 changes: 37 additions & 37 deletions backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 37 additions & 37 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions frontend/src/pages/AuthLogin/AuthLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,12 @@ export const AuthLogin: React.FC<{ showSignUp?: boolean }> = ({
</div>
<div className="banner_box">
<div className="banner_header">**Warning**</div>
<div className="banner_login">
{' '}
This system contains U.S. Government Data. Unauthorized use of
this system is prohibited. Use of this computer system, authorized
or unauthorized, constitutes consent to monitoring of this system.
</div>
<div className="banner_login">
{' '}
This computer system, including all related equipment, networks,
Expand Down
1 change: 0 additions & 1 deletion frontend/src/test-utils/test-utils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { MemoryRouter } from 'react-router-dom';
import { AuthContext, AuthContextType } from '../context/AuthContext';
import { CFThemeProvider } from 'context';
import { authCtx } from './authCtx';
import { Props } from 'react-select';

interface CustomRenderOptions extends RenderOptions {
initialHistory?: string[];
Expand Down
Loading

0 comments on commit 39b282d

Please sign in to comment.