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.

Sign up for GitHub

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

Jump to bottom

Feature/bal 64 heart rate i watch #180

Merged
merged 47 commits into from
Oct 3, 2023
Merged

Feature/bal 64 heart rate i watch #180

merged 47 commits into from
Oct 3, 2023

Commits on Aug 10, 2023

  1. BAL-64-GP-HeartRate

    @gperissetcelteeka
    gperissetcelteeka committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    d09076e View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. BAL-64-GP-HeartRate

    @gperissetcelteeka
    gperissetcelteeka committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    3130c64 View commit details
    Browse the repository at this point in the history

  2. BAL-64-GP-HeartRate

    @gperissetcelteeka
    gperissetcelteeka committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    71dd775 View commit details
    Browse the repository at this point in the history

  3. BAL-64-GP-HeartRate

    @gperissetcelteeka
    gperissetcelteeka committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    e7cea55 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. BAL-64-GP-HeartRate

    @gperissetcelteeka
    gperissetcelteeka committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    5de16ae View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. BAL-109-Coloring-Improvements

    @gperissetcelteeka
    gperissetcelteeka committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    4034687 View commit details
    Browse the repository at this point in the history

  2. BAL-109-Coloring-Improvements

    @gperissetcelteeka
    gperissetcelteeka committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    c8b4491 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. BAL-109-Coloring-Improvements

    @gperissetcelteeka
    gperissetcelteeka committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    cd4db47 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. BAL-109-Coloring-Improvements

    @gperissetcelteeka
    gperissetcelteeka committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    5a7c32a View commit details
    Browse the repository at this point in the history

  2. BAL-169-Coloring-Improvements

    @gperissetcelteeka
    gperissetcelteeka committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    49c7aba View commit details
    Browse the repository at this point in the history

  3. BAL-169-Coloring-Improvements

    @gperissetcelteeka
    gperissetcelteeka committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    c478b3b View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. Update Balance/Distraction/DistractionView.swift 

    Co-authored-by: Sebastian Ricaldoni <sebastian.ricaldoni@gmail.com>
    @gperissetcelteeka @sebastianricaldoni
    gperissetcelteeka and sebastianricaldoni authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    4914e63 View commit details
    Browse the repository at this point in the history

  2. Update Balance/Distraction/Drawing/BackgroundDrawView.swift 

    Co-authored-by: Sebastian Ricaldoni <sebastian.ricaldoni@gmail.com>
    @gperissetcelteeka @sebastianricaldoni
    gperissetcelteeka and sebastianricaldoni authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    e21eb3a View commit details
    Browse the repository at this point in the history

  3. Update Balance/Home/Home.swift 

    Co-authored-by: Sebastian Ricaldoni <sebastian.ricaldoni@gmail.com>
    @gperissetcelteeka @sebastianricaldoni
    gperissetcelteeka and sebastianricaldoni authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    aa424af View commit details
    Browse the repository at this point in the history

  4. Update Balance/Login/AuthViewModel.swift 

    Co-authored-by: Sebastian Ricaldoni <sebastian.ricaldoni@gmail.com>
    @gperissetcelteeka @sebastianricaldoni
    gperissetcelteeka and sebastianricaldoni authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    fdd20b6 View commit details
    Browse the repository at this point in the history

  5. Update Balance/Login/AuthViewModel.swift 

    Co-authored-by: Sebastian Ricaldoni <sebastian.ricaldoni@gmail.com>
    @gperissetcelteeka @sebastianricaldoni
    gperissetcelteeka and sebastianricaldoni authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    c488430 View commit details
    Browse the repository at this point in the history

  6. Update Balance/Login/LoginViewLocal.swift 

    Co-authored-by: Sebastian Ricaldoni <sebastian.ricaldoni@gmail.com>
    @gperissetcelteeka @sebastianricaldoni
    gperissetcelteeka and sebastianricaldoni authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    2212002 View commit details
    Browse the repository at this point in the history

  7. Update Balance/Profile/UserProfileRepositoryLocal.swift 

    Co-authored-by: Sebastian Ricaldoni <sebastian.ricaldoni@gmail.com>
    @gperissetcelteeka @sebastianricaldoni
    gperissetcelteeka and sebastianricaldoni authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    8d8b8de View commit details
    Browse the repository at this point in the history

  8. Update Balance/Distraction/Drawing/MandalaCollectionView.swift 

    Co-authored-by: Sebastian Ricaldoni <sebastian.ricaldoni@gmail.com>
    @gperissetcelteeka @sebastianricaldoni
    gperissetcelteeka and sebastianricaldoni authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    adeab3e View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. BAL-172-BodySensations-LabelUpdate

    @gperissetcelteeka
    gperissetcelteeka committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    27eee8c View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. BAL-172-BodySensations-LabelUpdate-GO-Button

    @gperissetcelteeka
    gperissetcelteeka committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    1c69eeb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into Improvements/BAL-172-Body-Sensations-LabelUp… 

    …date
    @gperissetcelteeka
    gperissetcelteeka authored Aug 29, 2023
    Configuration menu
    Copy the full SHA
    42e7e86 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Improvements/BAL-172-Body-Sensations-LabelUpdate' into … 

    …feature/BAL-64-GP-HeartRate3

* Improvements/BAL-172-Body-Sensations-LabelUpdate:
  BAL-172-BodySensations-LabelUpdate-GO-Button
  Improvements/bal 169 enhance coloring (#171)
  BAL-172-BodySensations-LabelUpdate
  Update Balance/Distraction/Drawing/MandalaCollectionView.swift
  Update Balance/Profile/UserProfileRepositoryLocal.swift
  Update Balance/Login/LoginViewLocal.swift
  Update Balance/Login/AuthViewModel.swift
  Update Balance/Login/AuthViewModel.swift
  Update Balance/Home/Home.swift
  Update Balance/Distraction/Drawing/BackgroundDrawView.swift
  Update Balance/Distraction/DistractionView.swift
  BAL-169-Coloring-Improvements
  BAL-169-Coloring-Improvements
  BAL-109-Coloring-Improvements
  BAL-109-Coloring-Improvements
  BAL-109-Coloring-Improvements
  BAL-109-Coloring-Improvements

# Conflicts:
#	Balance/Home/Home.swift
#	Balance/Supporting Files/Info.plist
#	Balance/Utils/Constant.swift
    @gperissetcelteeka
    gperissetcelteeka committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    4865a8e View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. BAL-64-GP-HeartRate

    @gperissetcelteeka
    gperissetcelteeka committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    fec3089 View commit details
    Browse the repository at this point in the history

  2. BAL-174-GP-CorrectText

    @gperissetcelteeka
    gperissetcelteeka committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    b7d4a8d View commit details
    Browse the repository at this point in the history

  3. BAL-174-GP-CorrectText

    @gperissetcelteeka
    gperissetcelteeka committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    383d467 View commit details
    Browse the repository at this point in the history

  4. BAL-174-GP-CorrectText

    @gperissetcelteeka
    gperissetcelteeka committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    1a6903d View commit details
    Browse the repository at this point in the history

  5. BAL-174-GP-CorrectText

    @gperissetcelteeka
    gperissetcelteeka committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    e1ea492 View commit details
    Browse the repository at this point in the history

  6. BAL-174-GP-CorrectText

    @gperissetcelteeka
    gperissetcelteeka committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    18c1ca5 View commit details
    Browse the repository at this point in the history

  7. BAL-174-GP-CorrectText

    @gperissetcelteeka
    gperissetcelteeka committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    5db36e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. BAL-175-GP-BodySensations-Coins-Rewards

    @gperissetcelteeka
    gperissetcelteeka committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    2f39135 View commit details
    Browse the repository at this point in the history

  2. BAL-175-GP-BodySensations-Coins-Rewards

    @gperissetcelteeka
    gperissetcelteeka committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    4586216 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. Merge branch 'Improvements/BAL-175-BodySensation-Rewards' into featur… 

    …e/BAL-64-GP-HeartRate3

* Improvements/BAL-175-BodySensation-Rewards:
  BAL-175-GP-BodySensations-Coins-Rewards
  BAL-175-GP-BodySensations-Coins-Rewards
  BAL-174-GP-CorrectText
  BAL-174-GP-CorrectText
  BAL-174-GP-CorrectText
  BAL-174-GP-CorrectText
  BAL-174-GP-CorrectText
  BAL-174-GP-CorrectText
  Improvements/bal 172 body sensations label update (#173)

# Conflicts:
#	Balance/ActivityLogging/ActivityStorageManager.swift
#	Balance/Login/LoginViewLocal.swift
#	Balance/NavBar/HeaderHome.swift
#	Balance/Profile/AvatarPreviewView.swift
    @gperissetcelteeka
    gperissetcelteeka committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    cb8e72d View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Add watchOS App

    @PSchmiedmayer
    PSchmiedmayer committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    5f8024f View commit details
    Browse the repository at this point in the history

  2. Update build-and-test.yml

    @PSchmiedmayer
    PSchmiedmayer authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    6f94818 View commit details
    Browse the repository at this point in the history

  3. Update beta-deployment.yml

    @PSchmiedmayer
    PSchmiedmayer authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    ab53ec6 View commit details
    Browse the repository at this point in the history

  4. Update build-and-test.yml

    @PSchmiedmayer
    PSchmiedmayer authored Sep 28, 2023
    Configuration menu
    Copy the full SHA
    7c1ddd5 View commit details
    Browse the repository at this point in the history

  5. Update

    @PSchmiedmayer
    PSchmiedmayer committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    8a1205a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feature/BAL-64-GP-HeartRate3' into feature/BAL-64-Heart… 

    …Rate-iWatch

* feature/BAL-64-GP-HeartRate3: (30 commits)
  BAL-175-GP-BodySensations-Coins-Rewards
  BAL-175-GP-BodySensations-Coins-Rewards
  BAL-174-GP-CorrectText
  BAL-174-GP-CorrectText
  BAL-174-GP-CorrectText
  BAL-174-GP-CorrectText
  BAL-174-GP-CorrectText
  BAL-174-GP-CorrectText
  BAL-64-GP-HeartRate
  BAL-172-BodySensations-LabelUpdate-GO-Button
  BAL-172-BodySensations-LabelUpdate
  Update Balance/Distraction/Drawing/MandalaCollectionView.swift
  Update Balance/Profile/UserProfileRepositoryLocal.swift
  Update Balance/Login/LoginViewLocal.swift
  Update Balance/Login/AuthViewModel.swift
  Update Balance/Login/AuthViewModel.swift
  Update Balance/Home/Home.swift
  Update Balance/Distraction/Drawing/BackgroundDrawView.swift
  Update Balance/Distraction/DistractionView.swift
  BAL-169-Coloring-Improvements
  ...

# Conflicts:
#	Balance.xcodeproj/project.pbxproj
#	Balance.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Balance/Login/LoginViewLocal.swift
#	Balance/NavBar/HeaderHome.swift
#	BalanceWatchApp/Assets.xcassets/AppIcon.appiconset/Contents.json
    @gperissetcelteeka
    gperissetcelteeka committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    5b940ac View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. Merge branch 'main' into feature/BAL-64-HeartRate-iWatch 

    * main:
  Add watchOS App (#179)

# Conflicts:
#	Balance.xcodeproj/project.pbxproj
#	BalanceWatchApp/Assets.xcassets/AppIcon.appiconset/Contents.json
#	BalanceWatchApp/ContentView.swift
    @gperissetcelteeka
    gperissetcelteeka committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    f91821b View commit details
    Browse the repository at this point in the history

  2. BAL-64-GP-HeartRate_iWatch

    @gperissetcelteeka
    gperissetcelteeka committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    41ebc32 View commit details
    Browse the repository at this point in the history

  3. BAL-64-GP-HeartRate_iWatch

    @gperissetcelteeka
    gperissetcelteeka committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    bebe48e View commit details
    Browse the repository at this point in the history

  4. BAL-64-GP-HeartRate_iWatch

    @gperissetcelteeka
    gperissetcelteeka committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    df3d053 View commit details
    Browse the repository at this point in the history

  5. BAL-64-GP-HeartRate_iWatch

    @gperissetcelteeka
    gperissetcelteeka committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    9879c9f View commit details
    Browse the repository at this point in the history

  6. BAL-64-GP-HeartRate_iWatch

    @gperissetcelteeka
    gperissetcelteeka committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    3941bea View commit details
    Browse the repository at this point in the history

  7. BAL-64-GP-HeartRate_iWatch

    @gperissetcelteeka
    gperissetcelteeka committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    4ab7807 View commit details
    Browse the repository at this point in the history

  8. BAL-64-GP-HeartRate_iWatch

    @gperissetcelteeka
    gperissetcelteeka committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    f7cb788 View commit details
    Browse the repository at this point in the history