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

Merge alpha into dev #333

Merged
merged 31 commits into from
Jun 27, 2024
Merged

Merge alpha into dev #333

merged 31 commits into from
Jun 27, 2024

Conversation

LiroyvH and others added 30 commits May 16, 2024 00:11
When users enter a trailing / in their Nightscout URL (Eg: "https://url/" rather than "https://url"), this will immediately result in a "Not found!" (404) error, because a / is already being appended. (Resulting in "https://url//").

This check removes the trailing slash to prevent 404's.
Xcode auto changes of indentation in NightscoutConfigStateModel.swift
The PR allows to fecth BG of Dexcom share as a CGM as well as to fetch BG of Dexcom share with the Dexcom G6 CGM.

The PR changes the logic of the CGM for all CGM based on Loop submodules (PluginSource).
Auto-remove trailing slash from Nightscout URL
Modify .gitmodules to point to loopandlearn organization
Merging CodeOwners Into Alpha
…utomations

testflight.md: Add the optional instructions for modifying automated build and sync
Signed-off-by: Sjoerd-Bo3 <sjoerd.bozon@gmail.com>
Signed-off-by: Sjoerd-Bo3 <sjoerd.bozon@gmail.com>
Signed-off-by: Sjoerd-Bo3 <sjoerd.bozon@gmail.com>
…ions

use Trio specific names and update instructions in testflight.md
update submodule CGMBLEKit: no change in function
@marionbarker
Copy link
Contributor

Summary

Success. LGTM.

Details

I tested this in my local clone using CLI. Clone was already at alpha, commit 3ec6176.

 1038  git switch dev
 1039  git pull --recurse
 1040  git switch -c dev_merge_alpha
 1041  git merge alpha
 1042  git submodule update

At this point, git status -v returns no changes
At this point, git diff alpha dev_merge_alpha returns no changes

Furthermore, alpha and dev_merge_alpha have the same SHA.
(gl is an alias for git log --oneline)

Trio % gl -3
3ec6176d (HEAD -> dev_merge_alpha, origin/alpha, dnzxy/alpha, alpha) Merge pull request #330 from loopandlearn/update_CGMBLEKit_submodule

As a final test, I built Trio onto an existing phone instance and it works as expected.

@Sjoerd-Bo3 Sjoerd-Bo3 marked this pull request as ready for review June 26, 2024 19:05
Copy link
Contributor

@dnzxy dnzxy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. 🚢 it to sync up dev and give beta testers an update of important fixes and latest submodules 👏

@AndreasStokholm AndreasStokholm merged commit aa26049 into dev Jun 27, 2024
1 check passed
@MikePlante1 MikePlante1 mentioned this pull request Jun 27, 2024
4 tasks
@Sjoerd-Bo3 Sjoerd-Bo3 deleted the alpha branch July 2, 2024 14:00
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.

None yet

8 participants