Skip to content
This repository has been archived by the owner on Aug 3, 2023. It is now read-only.

Fixed the problem that get_location_hint_from_locale does not take effect. #485

Merged
merged 30 commits into from
Jun 5, 2023
Merged

Fixed the problem that get_location_hint_from_locale does not take effect. #485

merged 30 commits into from
Jun 5, 2023

Conversation

xnny
Copy link
Contributor

@xnny xnny commented Jun 4, 2023

No description provided.

lss233 and others added 30 commits March 16, 2023 07:46
@lss233
feat: add proxy support (acheong08#122)
3b01263
Update setup.py
dce29da
@PRO-2684
[Feature] Configurable live markdown rendering using rich (acheong08#138
d712b7c 
)
Update setup.py
a1a1874
clean exit
c1ea0e2
bump
a669eef
@xnny
Fix problem where the WSS request does not contain a header error
76050ab
@xnny
Merge remote-tracking branch 'origin/master'
5ebd2cd 
# Conflicts:
#	requirements.txt
#	setup.py
#	src/EdgeGPT.py
@xnny
Close WS asynchronous calls
3e18f1b
@xnny
Merge branch 'acheong08:master' into master
0e731ce
@xnny
Merge branch 'acheong08:master' into master
019add8
@xnny
Merge branch 'acheong08:master' into master
3190e33
@xnny
Consistent project code style
9953145
@xnny
Merge branch 'acheong08:master' into master
8e97f75
@xnny
Make the code more intuitive and easier to read
a930304
@xnny
Merge branch 'acheong08:master' into master
c4776d0
@xnny
Merge branch 'acheong08:master' into master
30c26c1
@xnny
Merge branch 'acheong08:master' into master
384341f
@xnny
Fix Expected Type Mismatch
f2b3427
@xnny
Merge remote-tracking branch 'origin/master'
f93fbf8 
# Conflicts:
#	src/EdgeGPT.py
@xnny
Merge remote-tracking branch 'origin/master'
385939f
@xnny
Merge remote-tracking branch 'origin/master'
0250396
@xnny
Merge remote-tracking branch 'origin/master'
0bc3dca
@xnny
Merge remote-tracking branch 'origin/master'
105123a
@xnny
Merge remote-tracking branch 'origin/master'
1fe5e60
@xnny
Merge remote-tracking branch 'origin/master'
3969528
@xnny
Merge remote-tracking branch 'origin/master'
3d634dc
@xnny
Remove code that is never executed.
5144bae
@xnny
Merge branch 'acheong08:master' into master
4373932
@xnny
Fixed the problem that get_location_hint_from_locale does not take ef…
76635e0 
…fect.
@MonsterDruide1
Copy link
Contributor

Agreed, this seems like a needed fix.
Not sure if that's something @acheong08 considers important, but you should clean up your commit history - there are a lot of useless and duplicate commits in there that probably shouldn't end up in the main repo.

Just run git reset upstream/master once, then re-commit your changes - just don't add a --hard to that command, otherwise your changes will be lost.

@acheong08 acheong08 merged commit 2a48316 into acheong08:master Jun 5, 2023
@acheong08
Copy link
Owner

Squashed so it doesn't matter

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@acheong08 acheong08 acheong08 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@xnny @MonsterDruide1 @acheong08 @Walter202309 @lss233 @PRO-2684