Vercel deploy (#16)

Merged

Coo Hsu opened 2 years ago

No description

Commits were merged into target branch

comment version and usage setting

3 years ago

23180ac0

disable update check

3 years ago

afe82067
Merge remote-tracking branch 'origin/main' into vercel-deploy
```
# Conflicts:
#	app/components/settings.tsx
```
3 years ago

d7feebb4
Merge pull request #1 - Main
```
sync
```
3 years ago

1806339e
Merge pull request #2 - Main
```
sync
```
3 years ago

37ea5644
Merge remote-tracking branch 'origin/main' into vercel-deploy
```
# Conflicts:
#	app/components/settings.tsx
```
3 years ago

2a56c70f
disable update check

3 years ago

2aa686ad

Merge remote-tracking branch 'origin/vercel-deploy' into vercel-deploy

3 years ago

4f348f91

Add .onedev-buildspec.yml

3 years ago

f8e1aeca

Merge pull request #3 - sync

3 years ago

dbd79de8

Add docker-compose.yaml

3 years ago

9a6c3bef

Edit .onedev-buildspec.yml

3 years ago

f6d96a36

Edit .onedev-buildspec.yml

3 years ago

c0b80580

Edit .onedev-buildspec.yml

3 years ago

d5ba109d

Edit .onedev-buildspec.yml

3 years ago

359de95e

Edit .onedev-buildspec.yml

3 years ago

91aff2e8
Merge pull request #4 - Main
```
sync
```
3 years ago

ea60c1c3
Edit .onedev-buildspec.yml

3 years ago

4b94e3f1

Edit .onedev-buildspec.yml

3 years ago

d3053537

Edit .onedev-buildspec.yml

3 years ago

75fd8211
Merge remote-tracking branch 'origin/main' into vercel-deploy
```
# Conflicts:
#	app/api/common.ts
#	app/components/settings.tsx
```
3 years ago

51bc1f4f
add custom baseurl

3 years ago

2f8c76de

Merge remote-tracking branch 'origin/vercel-deploy' into vercel-deploy

3 years ago

2bb83769

Edit .onedev-buildspec.yml

3 years ago

d2feda64

Edit .onedev-buildspec.yml

3 years ago

56c5e48e

Edit .onedev-buildspec.yml

3 years ago

f2c3b042

fix build error

3 years ago

b8cf732a

Merge remote-tracking branch 'origin/vercel-deploy' into vercel-deploy

3 years ago

3e3a8625
Merge remote-tracking branch 'origin/main' into vercel-deploy
```
# Conflicts:
#	app/requests.ts
```
3 years ago

6e76b7c5
custom

3 years ago

5cde9f39
Merge remote-tracking branch 'origin/main' into vercel-deploy
```
# Conflicts:
#	app/locales/es.ts
#	app/locales/fr.ts
#	app/locales/jp.ts
#	app/masks/cn.ts
```
3 years ago

5e2b3a67
custom

3 years ago

648f55d1

fix cache issue

3 years ago

e324f09e

Edit .onedev-buildspec.yml

3 years ago

a531069d

Edit .onedev-buildspec.yml

3 years ago

c86c3305

Merge remote-tracking branch 'origin/vercel-deploy' into vercel-deploy

3 years ago

61250d24

fix cache issue

3 years ago

495186dc

Edit .onedev-buildspec.yml

3 years ago

38f120fd

Edit .onedev-buildspec.yml

3 years ago

f530cefb

Edit .onedev-buildspec.yml

3 years ago

63d2e523
Merges pull request #5
```
Main
```
3 years ago

45519384
Edit .onedev-buildspec.yml

3 years ago

df7ba0a9

Edit .onedev-buildspec.yml

3 years ago

4781d833

Merge remote-tracking branch 'origin/main' into vercel-deploy

3 years ago

32e46150

fix cache issue

3 years ago

2ec51309

Merge remote-tracking branch 'origin/vercel-deploy' into vercel-deploy

3 years ago

21cbb234
Merges pull request #6
```
Main
```
3 years ago

3f5f80b9
Merge remote-tracking branch 'origin/main' into vercel-deploy
```
# Conflicts:
#	app/components/settings.tsx
#	app/store/access.ts
```
2 years ago

0494f7ab
remove useless code

2 years ago

e60d679d
Merge remote-tracking branch 'origin/main' into vercel-deploy
```
# Conflicts:
#	app/components/settings.tsx
```
2 years ago

958f9365
Merge remote-tracking branch 'origin/main' into vercel-deploy
```
# Conflicts:
#	app/components/settings.tsx
```
2 years ago

421390b1
Edit .onedev-buildspec.yml

2 years ago

f1df375b
Merges pull request #7
```
Main
```
2 years ago

3858976b
Merges pull request #8
```
Main
```
2 years ago

2a7c8555
Edit .onedev-buildspec.yml

2 years ago

fddef240

Merge remote-tracking branch 'origin/main' into vercel-deploy

2 years ago

bf09a114

Edit .onedev-buildspec.yml

2 years ago

d1888bc5

Edit .onedev-buildspec.yml

2 years ago

2958bfc3

Edit .onedev-buildspec.yml

2 years ago

e616a7ce

Edit .onedev-buildspec.yml

2 years ago

99c75d1f

Edit .onedev-buildspec.yml

2 years ago

ccffb2a7

Edit .onedev-buildspec.yml

2 years ago

6caf399e

Edit .onedev-buildspec.yml

2 years ago

76f321b0

Edit .onedev-buildspec.yml

2 years ago

44eee545

Edit .onedev-buildspec.yml

2 years ago

351bffaf

Edit .onedev-buildspec.yml

2 years ago

bf2d9143

Edit .onedev-buildspec.yml

2 years ago

4dde4920

Edit .onedev-buildspec.yml

2 years ago

a1b16a8b

Edit .onedev-buildspec.yml

2 years ago

584e3cf2

Edit .onedev-buildspec.yml

2 years ago

4e9ccaaa
Merges pull request #9
```
Main
```
2 years ago

3b9f497a
Edit .onedev-buildspec.yml

2 years ago

3247aba6
Merges pull request #10
```
Main
```
2 years ago

d883146d
Merges pull request #11
```
Main
```
2 years ago

d338bea4
Edit .onedev-buildspec.yml

2 years ago

ea93f11a
Merges pull request #12
```
Main
```
2 years ago

f433fe6b
Merge branch 'main' into vercel-deploy
```
# Conflicts:
#	app/api/common.ts
```
2 years ago

62e113f7
Merges pull request #13
```
Main
```
2 years ago

d8974560
Edit .onedev-buildspec.yml

2 years ago

6187ec53

Edit .onedev-buildspec.yml

2 years ago

757626e6

Edit .onedev-buildspec.yml

2 years ago

4106c72c
Merges pull request #14
```
Main
```
2 years ago

758187bf
Merges pull request #15
```
Main
```
2 years ago

517b13cf
Colin Xu approved 2 years ago
Colin Xu merged 2 years ago
Login to comment

Submitter	Coo Hsu
Target	main
Source	vercel-deploy

Reviewers

Colin Xu

Assignees

Coo Hsu

Merge Strategy

Create Merge Commit

Watchers (2)

Reference

pull request External/ChatGPT-Next-Web#16