Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update0914 #5434

Closed
wants to merge 71 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
2ac9cf3
fix
Wakler-Wei Sep 20, 2023
dfba4ee
Merge branch 'Yidadaa:main' into main
Wakler-Wei Sep 26, 2023
2209e4f
fix
Wakler-Wei Sep 26, 2023
611038f
Merge branch 'Yidadaa:main' into main
Wakler-Wei Oct 16, 2023
0fe1cd7
Merge branch 'Yidadaa:main' into main
Wakler-Wei Nov 21, 2023
727175d
Merge branch 'ChatGPTNextWeb:main' into main
Wakler-Wei Dec 19, 2023
16bd3e2
Merge branch 'main' into main
Wakler-Wei Jan 4, 2024
23d719e
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jan 6, 2024
1853e25
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jan 11, 2024
ba58a74
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jan 23, 2024
55e03fd
Merge branch 'ChatGPTNextWeb:main' into main
Wakler-Wei Feb 21, 2024
33305bb
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Feb 27, 2024
4e5d640
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Feb 28, 2024
5584e45
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Feb 29, 2024
d1740ee
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 1, 2024
2d4d4dd
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 5, 2024
a064cd6
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 6, 2024
6bac1f0
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 8, 2024
de9e98b
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 12, 2024
aa1194a
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 14, 2024
2e66190
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 19, 2024
5c9607d
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 20, 2024
351eb2a
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 22, 2024
02831b4
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 25, 2024
c46e0ea
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 26, 2024
b056bfa
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 27, 2024
bfbeca6
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 28, 2024
8584ab5
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 29, 2024
b936321
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 4, 2024
4f67e30
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 9, 2024
c57a8f2
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 10, 2024
b0e7e6b
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 11, 2024
6808c0b
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 12, 2024
cbcda96
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 13, 2024
b083bde
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 15, 2024
00a5eea
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 16, 2024
a1caba2
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 17, 2024
ce781a5
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 26, 2024
5b7ffea
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 1, 2024
ec393a1
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 7, 2024
655404a
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 8, 2024
1818058
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 14, 2024
ed9964c
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 15, 2024
a51dfbd
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 16, 2024
7a7f389
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 17, 2024
d4bb5ff
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 21, 2024
de66f8a
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 23, 2024
ff0bebe
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 28, 2024
28ab126
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jun 8, 2024
f07379f
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jun 25, 2024
fa1dbb1
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jun 27, 2024
24dc86a
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 2, 2024
8459c75
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 4, 2024
69914ee
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 5, 2024
f8d403e
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 6, 2024
6853f19
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 7, 2024
13ab1cf
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 10, 2024
aed1999
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 11, 2024
09ad91c
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 12, 2024
a9faba9
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 13, 2024
97dafde
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 14, 2024
3781084
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 16, 2024
c94f2a2
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 17, 2024
ec34570
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 18, 2024
601e745
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 19, 2024
3933b8a
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 20, 2024
ff2ce9e
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 21, 2024
94c03fc
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 23, 2024
5cf2bdb
Merge branch 'main' into main
Wakler-Wei Aug 1, 2024
535914f
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 2, 2024
d07e7b0
Merge branch 'main' into main
Wakler-Wei Sep 14, 2024
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
15 changes: 10 additions & 5 deletions app/components/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,15 @@ export function SideBarHeader(props: {
return (
<Fragment>
<div className={styles["sidebar-header"]} data-tauri-drag-region>
<div className={styles["sidebar-title-container"]}>
<div className={styles["sidebar-title"]} data-tauri-drag-region>
{title}
</div>
<div className={styles["sidebar-sub-title"]}>{subTitle}</div>
<div className={styles["sidebar-title"]} data-tauri-drag-region>
Walker ChatGPT
</div>
<div className={styles["sidebar-sub-title"]}>
Welcome to Walker ChatGPT.
</div>
<div className={styles["sidebar-logo"] + " no-dark"}>
<ChatGptIcon />

</div>
<div className={styles["sidebar-logo"] + " no-dark"}>{logo}</div>
</div>
Expand Down Expand Up @@ -316,6 +320,7 @@ export function SideBar(props: { className?: string }) {
</>
}
secondaryAction={

<IconButton
icon={<AddIcon />}
text={shouldNarrow ? undefined : Locale.Home.NewChat}
Expand Down
4 changes: 2 additions & 2 deletions app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import { GoogleTagManager, GoogleAnalytics } from "@next/third-parties/google";
const serverConfig = getServerSideConfig();

export const metadata: Metadata = {
title: "NextChat",
title: "Walker ChatGPT",
description: "Your personal ChatGPT Chat Bot.",
appleWebApp: {
title: "NextChat",
title: "Walker ChatGPT",
statusBarStyle: "default",
},
};
Expand Down
7 changes: 4 additions & 3 deletions public/site.webmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "NextChat",
"short_name": "NextChat",
"name": "Walker ChatGPT",
"short_name": "Walker ChatGPT",
"icons": [
{
"src": "/android-chrome-192x192.png",
Expand All @@ -17,4 +17,5 @@
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
}

2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"fullscreen": false,
"height": 600,
"resizable": true,
"title": "NextChat",
"title": "Walker ChatGPT",
"width": 960,
"hiddenTitle": true,
"titleBarStyle": "Overlay"
Expand Down
Loading