Skip to content

Feature/merge upstream#3

Merged
zhaohongxuan merged 255 commits intomasterfrom
feature/merge_upstream
Apr 21, 2025
Merged

Feature/merge upstream#3
zhaohongxuan merged 255 commits intomasterfrom
feature/merge_upstream

Conversation

@zhaohongxuan
Copy link
Owner

No description provided.

shaonianche and others added 30 commits October 25, 2023 09:52
docs:rewrite docs

Signed-off-by: shaoanianche <github@duanfei.org>
* feat_NavigationControl:
  feat: add NavigationControl
  docs:rewrite docs (yihong0618#514)

# Conflicts:
#	README-CN.md
#	README.md
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
* feat-reduce-grid-svg-size:
  feat: reduce grid svg file size
  fix: show in firefox
  doc: runner info fix

# Conflicts:
#	README-CN.md
#	README.md
* feat:suport heart_rate in export gpx file
* 更新部署 github-pages 说明

* Update Deploy to Github-pages

---------

Co-authored-by: haowei.chen <chenhaowei93@163.com>
…ihong0618#540)

* fix: gh-pages build: drop the ref while trigger from Run Data Sync
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
* Update run_data_sync.yml

* Update run_data_sync.yml

* Update run_data_sync.yml

* add screenshot to show how to get nike refresh token

* add screenshot to show how to get nike refresh token

* refactor
Sort the activities downloaded from Strava by their id's thus they are uploaded to Garmin from the oldest to the latest. Otherwise, the latest one is uploaded first, and if the process is interrupted, any activities older than it will never be uploaded because the code before this line gets the latest activity from Garmin and only download those newer than it from Strava.
Co-authored-by: caojiawen <caojiawen@zmeng123.com>
* upstream:
  feat: `RunRow` toggle selection & cursor pointer (yihong0618#551)
  perf: use auto instead of scroll (yihong0618#550)
  doc: add nrc detail written by @angolap
  Update strava_to_garmin_sync.py (yihong0618#544)
  Master (yihong0618#545)
  fix: nrc sync
  fix: gh-pages build: drop the ref while trigger from Run Data Sync (yihong0618#540)
  upd deploy to github-pages  (yihong0618#537)
  feat: reduce grid svg file size (yihong0618#535)
  feat:suport heart_rate in export gpx file (yihong0618#529)
  feat: add NavigationControl (yihong0618#534)

# Conflicts:
#	README-CN.md
#	README.md
#	src/components/RunTable/RunRow.tsx
#	src/pages/index.tsx
danielyu316 and others added 29 commits March 8, 2025 07:46
# Conflicts:
#	README.md
#	run_page/joyrun_sync.py
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
# Conflicts:
#	README-CN.md
#	README.md
#	run_page/coros_sync.py
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
* Update keep_sync.py

keep字段变化 timestamp->unixTimestamp

* fix: keep_sync.py  lint

* fix: keep_sync.py lint
* feat: Add summary page

* fix: some style

Signed-off-by: yihong0618 <zouzou0208@gmail.com>

---------

Signed-off-by: yihong0618 <zouzou0208@gmail.com>
Co-authored-by: mx <480471449@qq.com>
Co-authored-by: yihong0618 <zouzou0208@gmail.com>
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
# Conflicts:
#	.github/workflows/run_data_sync.yml
#	assets/github.svg
#	assets/github_2024.svg
#	assets/grid.svg
#	assets/year_2024.svg
#	src/components/RunTable/style.module.css
#	src/static/activities.json
#	src/utils/const.ts
…for Github Pages (yihong0618#807)

* fix: add redirect handling in 404 page and improve index.html script for Github Pages

* fix: update base URL handling in index.html, 404.html, and site-metadata.ts
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
* feat: elevation gain - strava/garmin(gpx/tcx/fit)

* feat: elevation gain - keep: elevation & gpx type

* feat: elevation gain - keep: elevation & gpx type

* feat: elevation gain - ui

* feat: joyrun gpx: elevation and heart_rate

* feat: elevation gain - joyrun

* feat: elevation gain - keep

* feat: elevation gain - gpx

* feat: elevation gain - oppo

* feat: elevation gain - tulipsport

* feat: elevation gain - field name

* feat: elevation gain - db updator

* feat: elevation gain - fix

* doc: update notice

* feat: elevation gain display switch, default not show

---------

Signed-off-by: yihong0618 <zouzou0208@gmail.com>
Co-authored-by: yihong0618 <zouzou0208@gmail.com>
…on_gain in Joyrun (yihong0618#813)

* fix: replace HeartRateList with DataSeries for heart rate and altitude data handling

* fix: add missing elevation parameter to new_track_point and update docstring for altitude data
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
* feat: support pdm

Signed-off-by: yihong0618 <zouzou0208@gmail.com>

* fix: address comments

Signed-off-by: yihong0618 <zouzou0208@gmail.com>

---------

Signed-off-by: yihong0618 <zouzou0208@gmail.com>
# Conflicts:
#	.github/workflows/run_data_sync.yml
#	.gitignore
#	README-CN.md
#	README.md
#	run_page/generator/__init__.py
#	run_page/generator/db.py
#	src/components/RunTable/RunRow.tsx
#	src/components/RunTable/style.module.css
#	src/components/YearStat/index.tsx
#	src/utils/const.ts
#	src/utils/utils.ts
@zhaohongxuan zhaohongxuan merged commit 8f504b0 into master Apr 21, 2025
0 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.