Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/pip/cryptography-41.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
berggren authored Sep 7, 2023
2 parents c6ae671 + e8c7de1 commit 69d59b5
Show file tree
Hide file tree
Showing 10 changed files with 102 additions and 98 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion timesketch/frontend-ng/dist/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta name=csrf-token content="{{ csrf_token() }}"><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/dist/favicon.ico><link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900" rel=stylesheet><title>Timesketch</title><link href=/dist/css/chunk-vendors.69f98187.css rel=preload as=style><link href=/dist/css/index.229cea3a.css rel=preload as=style><link href=/dist/js/chunk-vendors.6f804254.js rel=preload as=script><link href=/dist/js/index.41b106c8.js rel=preload as=script><link href=/dist/css/chunk-vendors.69f98187.css rel=stylesheet><link href=/dist/css/index.229cea3a.css rel=stylesheet></head><body><div id=app></div><script src=/dist/js/chunk-vendors.6f804254.js></script><script src=/dist/js/index.41b106c8.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta name=csrf-token content="{{ csrf_token() }}"><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/dist/favicon.ico><link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900" rel=stylesheet><title>Timesketch</title><link href=/dist/css/chunk-vendors.3822f5cc.css rel=preload as=style><link href=/dist/css/index.7372c2c4.css rel=preload as=style><link href=/dist/js/chunk-vendors.da6a3b0d.js rel=preload as=script><link href=/dist/js/index.b88da336.js rel=preload as=script><link href=/dist/css/chunk-vendors.3822f5cc.css rel=stylesheet><link href=/dist/css/index.7372c2c4.css rel=stylesheet></head><body><div id=app></div><script src=/dist/js/chunk-vendors.da6a3b0d.js></script><script src=/dist/js/index.b88da336.js></script></body></html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions timesketch/frontend-ng/dist/js/index.41b106c8.js

This file was deleted.

1 change: 0 additions & 1 deletion timesketch/frontend-ng/dist/js/index.41b106c8.js.map

This file was deleted.

2 changes: 2 additions & 0 deletions timesketch/frontend-ng/dist/js/index.b88da336.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions timesketch/frontend-ng/dist/js/index.b88da336.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion timesketch/frontend-ng/dist/login.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta name=csrf-token content="{{ csrf_token() }}"><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/dist/favicon.ico><link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900" rel=stylesheet><title>Timesketch</title><link href=/dist/css/chunk-vendors.69f98187.css rel=preload as=style><link href=/dist/css/login.5d50b378.css rel=preload as=style><link href=/dist/js/chunk-vendors.6f804254.js rel=preload as=script><link href=/dist/js/login.fc00c6ee.js rel=preload as=script><link href=/dist/css/chunk-vendors.69f98187.css rel=stylesheet><link href=/dist/css/login.5d50b378.css rel=stylesheet></head><body><div class=card><div class=logo-container><div class=logo-image-container><img class=logo-image src=/dist/timesketch-color.png></div><div class=logo-text-container><div class=logo-text-header>timesketch</div><div class=logo-text-subheader>Digital Forensics Timeline Analysis</div></div></div><form method=post><input type=text class=input name=username placeholder=Username> <input type=password class=input name=password placeholder=Password> <button type=submit class=login-button>Sign in</button> {{ form.csrf_token }}</form></div><script src=/dist/js/chunk-vendors.6f804254.js></script><script src=/dist/js/login.fc00c6ee.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta name=csrf-token content="{{ csrf_token() }}"><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/dist/favicon.ico><link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900" rel=stylesheet><title>Timesketch</title><link href=/dist/css/chunk-vendors.3822f5cc.css rel=preload as=style><link href=/dist/css/login.5d50b378.css rel=preload as=style><link href=/dist/js/chunk-vendors.da6a3b0d.js rel=preload as=script><link href=/dist/js/login.fc00c6ee.js rel=preload as=script><link href=/dist/css/chunk-vendors.3822f5cc.css rel=stylesheet><link href=/dist/css/login.5d50b378.css rel=stylesheet></head><body><div class=card><div class=logo-container><div class=logo-image-container><img class=logo-image src=/dist/timesketch-color.png></div><div class=logo-text-container><div class=logo-text-header>timesketch</div><div class=logo-text-subheader>Digital Forensics Timeline Analysis</div></div></div><form method=post><input type=text class=input name=username placeholder=Username> <input type=password class=input name=password placeholder=Password> <button type=submit class=login-button>Sign in</button> {{ form.csrf_token }}</form></div><script src=/dist/js/chunk-vendors.da6a3b0d.js></script><script src=/dist/js/login.fc00c6ee.js></script></body></html>

0 comments on commit 69d59b5

Please sign in to comment.