Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
02d2dff
chore(deps): bump rustix from 0.37.19 to 0.37.27 in /src-tauri
dependabot[bot] Feb 23, 2024
86dce36
chore(deps): bump openssl from 0.10.55 to 0.10.64 in /src-tauri
dependabot[bot] Feb 23, 2024
7643294
change 3 configs
SpaceTimee Feb 25, 2024
9522f7e
change title
SpaceTimee Feb 26, 2024
c0af908
change repo
SpaceTimee Feb 26, 2024
0d8a6a1
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Feb 26, 2024
69fda61
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Feb 27, 2024
6a8ac1d
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Feb 27, 2024
e1102b5
Merge branch 'main' into dependabot/cargo/src-tauri/openssl-0.10.64
SpaceTimee Feb 27, 2024
0786218
Merge pull request #2 from SpaceTimee/dependabot/cargo/src-tauri/open…
SpaceTimee Feb 27, 2024
e96d063
Merge branch 'main' into dependabot/cargo/src-tauri/rustix-0.37.27
SpaceTimee Feb 27, 2024
caa4d9f
Merge pull request #1 from SpaceTimee/dependabot/cargo/src-tauri/rust…
SpaceTimee Feb 27, 2024
10f501e
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Feb 27, 2024
875c3d3
update packages
SpaceTimee Feb 27, 2024
0378bb9
fix a bug
SpaceTimee Feb 27, 2024
d3cd0cd
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Feb 28, 2024
aaab826
update sync.yml
SpaceTimee Feb 28, 2024
7752fed
Update sync.yml
SpaceTimee Feb 28, 2024
d91d209
Update sync.yml
SpaceTimee Feb 28, 2024
098dcbe
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Feb 29, 2024
09b85a9
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Feb 29, 2024
9aacf00
change readme
SpaceTimee Mar 2, 2024
633660f
Update README.md
SpaceTimee Mar 2, 2024
3e9dc28
Update README.md
SpaceTimee Mar 2, 2024
5768104
Update README.md
SpaceTimee Mar 4, 2024
4c2632b
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 4, 2024
2f60728
chore(deps): bump mio from 0.8.8 to 0.8.11 in /src-tauri
dependabot[bot] Mar 4, 2024
953a3ad
Merge pull request #6 from SpaceTimee/dependabot/cargo/src-tauri/mio-…
SpaceTimee Mar 5, 2024
f40cd7d
chore(deps): bump zustand from 4.5.1 to 4.5.2
dependabot[bot] Mar 5, 2024
31f7a64
chore(deps-dev): bump @types/node from 20.11.20 to 20.11.24
dependabot[bot] Mar 5, 2024
e5f6ebd
chore(deps): bump next from 14.1.0 to 14.1.2
dependabot[bot] Mar 5, 2024
5bc5eff
chore(deps): bump react-router-dom from 6.22.1 to 6.22.2
dependabot[bot] Mar 5, 2024
f62c7d4
Merge pull request #7 from SpaceTimee/dependabot/npm_and_yarn/zustand…
SpaceTimee Mar 5, 2024
1fbc5c6
Merge pull request #11 from SpaceTimee/dependabot/npm_and_yarn/react-…
SpaceTimee Mar 5, 2024
5ad6615
Merge branch 'main' into dependabot/npm_and_yarn/next-14.1.2
SpaceTimee Mar 5, 2024
3c02101
Merge pull request #9 from SpaceTimee/dependabot/npm_and_yarn/types/n…
SpaceTimee Mar 5, 2024
c7df5c4
Merge pull request #10 from SpaceTimee/dependabot/npm_and_yarn/next-1…
SpaceTimee Mar 5, 2024
5ee691e
chore(deps-dev): bump @types/react from 18.2.60 to 18.2.62
dependabot[bot] Mar 5, 2024
4957a0b
Merge pull request #8 from SpaceTimee/dependabot/npm_and_yarn/types/r…
SpaceTimee Mar 5, 2024
405adf2
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 5, 2024
a4bfbcb
change title
SpaceTimee Mar 6, 2024
7079e4d
Update package.json
SpaceTimee Mar 6, 2024
cfd3434
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 7, 2024
78b1e5e
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 11, 2024
ddf71f1
chore(deps): bump yaml from 2.4.0 to 2.4.1
dependabot[bot] Mar 11, 2024
636d850
chore(deps): bump mermaid from 10.8.0 to 10.9.0
dependabot[bot] Mar 11, 2024
9b2d95e
chore(deps-dev): bump @tauri-apps/cli from 1.5.10 to 1.5.11
dependabot[bot] Mar 11, 2024
156df1d
chore(deps-dev): bump @types/react from 18.2.62 to 18.2.64
dependabot[bot] Mar 11, 2024
117ac2c
chore(deps): bump next from 14.1.2 to 14.1.3
dependabot[bot] Mar 11, 2024
2edc4e3
Merge pull request #16 from SpaceTimee/dependabot/npm_and_yarn/next-1…
SpaceTimee Mar 12, 2024
bee9a20
Merge pull request #15 from SpaceTimee/dependabot/npm_and_yarn/types/…
SpaceTimee Mar 12, 2024
2329101
Merge pull request #14 from SpaceTimee/dependabot/npm_and_yarn/tauri-…
SpaceTimee Mar 12, 2024
a513479
Merge pull request #13 from SpaceTimee/dependabot/npm_and_yarn/mermai…
SpaceTimee Mar 12, 2024
f4b3546
Merge pull request #12 from SpaceTimee/dependabot/npm_and_yarn/yaml-2…
SpaceTimee Mar 12, 2024
7ddefd2
Update yarn.lock
SpaceTimee Mar 12, 2024
7cc175d
Merge remote-tracking branch 'upstream/main'
SpaceTimee Mar 13, 2024
42b78bc
Merge remote-tracking branch 'upstream/main'
SpaceTimee Mar 14, 2024
72acf67
chore(deps-dev): bump typescript from 5.3.3 to 5.4.2
dependabot[bot] Mar 18, 2024
cd4f6c3
chore(deps): bump sass from 1.71.1 to 1.72.0
dependabot[bot] Mar 18, 2024
61d65a1
chore(deps-dev): bump @types/react from 18.2.65 to 18.2.67
dependabot[bot] Mar 18, 2024
25897f8
Merge remote-tracking branch 'upstream/main'
SpaceTimee Mar 19, 2024
3fed46f
Merge pull request #21 from SpaceTimee/dependabot/npm_and_yarn/types/…
SpaceTimee Mar 19, 2024
5015c57
Merge pull request #19 from SpaceTimee/dependabot/npm_and_yarn/sass-1…
SpaceTimee Mar 19, 2024
50158bb
Merge pull request #18 from SpaceTimee/dependabot/npm_and_yarn/typesc…
SpaceTimee Mar 19, 2024
ffd4670
chore(deps-dev): bump @types/node from 20.11.26 to 20.11.30
dependabot[bot] Mar 19, 2024
2b8143a
Merge pull request #22 from SpaceTimee/dependabot/npm_and_yarn/types/…
SpaceTimee Mar 19, 2024
b74e255
chore(deps-dev): bump @types/react-dom from 18.2.21 to 18.2.22
dependabot[bot] Mar 19, 2024
1db664c
Merge pull request #17 from SpaceTimee/dependabot/npm_and_yarn/types/…
SpaceTimee Mar 19, 2024
fb804c7
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 21, 2024
046860f
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 24, 2024
f3f5b46
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 25, 2024
194a4c4
chore(deps): bump the npm_and_yarn group group with 1 update
dependabot[bot] Mar 25, 2024
f4576b9
chore(deps-dev): bump @types/react from 18.2.67 to 18.2.70
dependabot[bot] Mar 25, 2024
5fbef4c
chore(deps): bump @next/third-parties from 14.1.3 to 14.1.4
dependabot[bot] Mar 25, 2024
f6b5f8f
chore(deps): bump next from 14.1.3 to 14.1.4
dependabot[bot] Mar 25, 2024
76f33ab
chore(deps-dev): bump webpack from 5.90.3 to 5.91.0
dependabot[bot] Mar 25, 2024
fd873d7
Merge remote-tracking branch 'upstream/main'
SpaceTimee Mar 26, 2024
1b03004
Merge pull request #28 from SpaceTimee/dependabot/npm_and_yarn/webpac…
SpaceTimee Mar 26, 2024
9d77a3f
Merge pull request #27 from SpaceTimee/dependabot/npm_and_yarn/next-1…
SpaceTimee Mar 26, 2024
ba4c036
Merge pull request #26 from SpaceTimee/dependabot/npm_and_yarn/next/t…
SpaceTimee Mar 26, 2024
98cc5f2
Merge pull request #25 from SpaceTimee/dependabot/npm_and_yarn/types/…
SpaceTimee Mar 26, 2024
fbaa97d
Merge pull request #24 from SpaceTimee/dependabot/npm_and_yarn/npm_an…
SpaceTimee Mar 26, 2024
430b7ae
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 27, 2024
f3cd482
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 27, 2024
9c7a42e
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 27, 2024
091c69b
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 28, 2024
506147b
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 28, 2024
ea2b9ac
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 28, 2024
bb331dc
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Mar 28, 2024
fc69164
chore(deps-dev): bump eslint-config-next from 14.1.0 to 14.1.4
dependabot[bot] Apr 1, 2024
f6bd22c
Update yarn.lock
SpaceTimee Apr 3, 2024
43a6f2a
chore(deps-dev): bump typescript from 5.4.2 to 5.4.3
dependabot[bot] Apr 3, 2024
debf773
Merge branch 'main' into dependabot/npm_and_yarn/eslint-config-next-1…
SpaceTimee Apr 3, 2024
787a993
Merge pull request #32 from SpaceTimee/dependabot/npm_and_yarn/typesc…
SpaceTimee Apr 3, 2024
75bc97d
Merge pull request #30 from SpaceTimee/dependabot/npm_and_yarn/eslint…
SpaceTimee Apr 3, 2024
fb6b445
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 4, 2024
8ee1ad3
chore(deps): bump h2 from 0.3.24 to 0.3.26 in /src-tauri
dependabot[bot] Apr 5, 2024
323c43b
Merge pull request #34 from SpaceTimee/dependabot/cargo/src-tauri/h2-…
SpaceTimee Apr 6, 2024
de30569
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 8, 2024
76dd475
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 8, 2024
ff5b3ea
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 8, 2024
0f609fe
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 9, 2024
f56131c
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 9, 2024
ef0b52f
Merge remote-tracking branch 'upstream/main'
SpaceTimee Apr 9, 2024
d4f4b59
Update yarn.lock
SpaceTimee Apr 9, 2024
fc474b8
chore(deps-dev): bump typescript from 5.4.3 to 5.4.4
dependabot[bot] Apr 9, 2024
6b42133
Merge pull request #35 from SpaceTimee/dependabot/npm_and_yarn/typesc…
SpaceTimee Apr 10, 2024
8a88e86
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 10, 2024
b92b8b5
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 11, 2024
dd97095
Update README.md
SpaceTimee Apr 12, 2024
ae3e633
Update README.md
SpaceTimee Apr 12, 2024
5970e31
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 12, 2024
f1648b7
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 15, 2024
ec64f04
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 15, 2024
5a96674
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 16, 2024
d5c714d
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 16, 2024
f6a51b7
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 25, 2024
cee25c0
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 25, 2024
23d14fc
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 25, 2024
4c7ed4a
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 25, 2024
a91a304
Upgrade
SpaceTimee Apr 29, 2024
ea2925e
chore(deps-dev): bump typescript from 5.4.4 to 5.4.5
dependabot[bot] Apr 29, 2024
ee7cb46
Merge pull request #41 from SpaceTimee/dependabot/npm_and_yarn/typesc…
SpaceTimee Apr 29, 2024
10a4da6
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Apr 30, 2024
f795385
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 6, 2024
600bf48
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 7, 2024
77b96ef
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 13, 2024
98b0a7c
Merge remote-tracking branch 'upstream/main'
SpaceTimee May 14, 2024
7c48287
update
SpaceTimee May 14, 2024
c55e255
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 14, 2024
1f9ea3e
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 14, 2024
ea2abab
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 15, 2024
6810489
Merge remote-tracking branch 'upstream/main'
SpaceTimee May 16, 2024
5b1f61f
Merge remote-tracking branch 'upstream/main'
SpaceTimee May 20, 2024
5641b99
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 20, 2024
890ff1b
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 22, 2024
726caa7
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user May 27, 2024
703bfb4
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jun 7, 2024
1b898b1
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jun 24, 2024
0450da5
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jun 26, 2024
5ed59cb
Merge remote-tracking branch 'upstream/main'
SpaceTimee Jul 1, 2024
6ba5ecb
Merge remote-tracking branch 'upstream/main'
SpaceTimee Jul 3, 2024
dca8955
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 4, 2024
ad48925
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 4, 2024
18d4a2b
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 5, 2024
4edc045
Merge remote-tracking branch 'upstream/main'
SpaceTimee Jul 6, 2024
ee4b993
update
SpaceTimee Jul 6, 2024
5aedad1
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jul 6, 2024
6ab7fc1
chore(deps-dev): bump @tauri-apps/cli from 1.5.11 to 1.6.0
dependabot[bot] Jul 8, 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
43 changes: 15 additions & 28 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,27 @@
name: Upstream Sync

permissions:
contents: write

on:
schedule:
- cron: "0 0 * * *" # every day
workflow_dispatch:
- cron: '0 * * * *' # run per hour

workflow_dispatch: # click the button on Github repo!

jobs:
sync_latest_from_upstream:
name: Sync latest commits from upstream repo
runs-on: ubuntu-latest
if: ${{ github.event.repository.fork }}
name: Sync latest commits from upstream repo

steps:
# Step 1: run a standard checkout action
- name: Checkout target repo
uses: actions/checkout@v3

# Step 2: run the sync action
- name: Sync upstream changes
id: sync
uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
with:
upstream_sync_repo: ChatGPTNextWeb/ChatGPT-Next-Web
upstream_sync_branch: main
target_sync_branch: main
target_repo_token: ${{ secrets.GITHUB_TOKEN }} # automatically generated, no need to set
- name: Target repo checkout
uses: actions/checkout@v3

# Set test_mode true to run tests instead of the true action!!
test_mode: false
- name: Sync upstream run
id: sync
uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
with:
target_sync_branch: main
target_repo_token: ${{ secrets.GITHUB_TOKEN }}
upstream_sync_repo: ChatGPTNextWeb/ChatGPT-Next-Web
upstream_sync_branch: main

- name: Sync check
if: failure()
run: |
echo "[Error] 由于上游仓库的 workflow 文件变更,导致 GitHub 自动暂停了本次自动更新,你需要手动 Sync Fork 一次,详细教程请查看:https://github.com/Yidadaa/ChatGPT-Next-Web/blob/main/README_CN.md#%E6%89%93%E5%BC%80%E8%87%AA%E5%8A%A8%E6%9B%B4%E6%96%B0"
echo "[Error] Due to a change in the workflow file of the upstream repository, GitHub has automatically suspended the scheduled automatic update. You need to manually sync your fork. Please refer to the detailed tutorial for instructions: https://github.com/Yidadaa/ChatGPT-Next-Web#enable-automatic-updates"
exit 1
test_mode: false
128 changes: 0 additions & 128 deletions CODE_OF_CONDUCT.md

This file was deleted.

Loading