lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,031 Commits 31 Branches 14 Tags
b9ec4c7108df52e9d6a400d1136ca5500f99bbfe
Commit Graph

2031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bl00dymarie b9ec4c7108 Merge branch 'main' into 676-feature-customisation-not-display-mucus-cervix 2024-02-20 12:29:28 +01:00
bl00dymarie d66e5f36e5 Rename to secondarySymptomDisabledPrompt 2024-02-19 18:10:57 +01:00
bl00dymarie 69c546f684 Rename shouldUseCervix to useCervixAsSecondarySymptom 2024-02-19 18:05:20 +01:00
bl00dymarie dc304afe75 Rename labels to more neutral 'secondarySymptom' 2024-02-19 18:01:57 +01:00
bl00dymarie 63bc8a1daf Rename to useCervixAsSecondarySymptom 2024-02-19 17:51:25 +01:00
bl00dymarie 7fa130f9e1 Rename to useCervixAsSecondarySymptomObservable 2024-02-19 17:13:40 +01:00
bl00dymarie d338df1460 Merge branch 'Chore/ReactNative-Upgrade-0.68.3-Android' into 'main' 
Chore: React native upgrade 0.68.3 android

See merge request bloodyhealth/drip!660
 2024-02-19 16:01:09 +00:00
wunderfisch 5f55500831 small changes on secondary symptom to make it work nicly with the button logic instead of the former switch and to display the correct texts 2024-02-19 12:13:58 +01:00
bl00dymarie 4eedb171a3 Full upgrade to react native v0.68.3 for Android 2024-02-15 14:31:46 +01:00
bl00dymarie 3193fa4f33 Partial update RN to 0.68.3 for android build 2024-02-15 13:14:28 +01:00
bl00dymarie e24c69977c Merge branch 'release-ios-fix-1.2401.17' into 'main' 
Release ios fix 1.2401.17

See merge request bloodyhealth/drip!653
 2024-02-15 11:19:05 +00:00
bl00dymarie 6fb0d1fc1e Merge branch 'main' into 'release-ios-fix-1.2401.17' 
# Conflicts:
#   ios/Podfile
 2024-02-15 11:16:49 +00:00
bl00dymarie 391cac1bde Update xcode project 2024-02-15 12:13:19 +01:00
bl00dymarie fb589815c1 Update iPhone versions in script 2024-02-15 12:12:02 +01:00
bl00dymarie 45fce6485b Release: iOS-1.2401.17 2024-02-15 11:21:56 +01:00
bl00dymarie 17f74c9c1c Address xcode error messages 2024-02-15 11:21:56 +01:00
bl00dymarie 5119e6778a Update project changes according to xCode suggestion 2024-02-15 11:21:56 +01:00
Liv 601d618352 Reorder import buttons depending on OS 2024-02-15 11:21:56 +01:00
bl00dymarie d23b5fe420 Add oneTimeTransformIntoNumber for secondarySymptom Switch 2024-02-14 16:10:05 +01:00
bl00dymarie 311cee0e17 Adapt color for secondarySymptom Boxes 2024-02-14 16:10:00 +01:00
bl00dymarie 76137fc000 Replace hard coded text 2024-02-14 16:09:47 +01:00
bl00dymarie 09614319e3 Add SelectTabGroup for secondary Symptom Switch 2024-02-14 16:08:07 +01:00
wunderfisch ebbfd8aba5 merging work on secondary symptom logic and buttons 2024-02-14 10:26:13 +01:00
bl00dymarie 1662bb29f0 Change prop Type to value instead of bool for saveUseCervix 2024-02-13 17:24:29 +01:00
bl00dymarie a59dfa8336 Add SelectTabGroup for secondary Symptom Switch 2024-02-13 17:24:26 +01:00
wunderfisch d7f1eb81fb centralizing code to set the Secondary Symptom from different actions in one function 2024-02-13 15:46:04 +01:00
wunderfisch 82803bbb83 fix: disabling the secondary symptom toggle when not both categories are enabled, didn't work before after new save 2024-02-13 11:52:33 +01:00
wunderfisch 8a8b3217fa small changes on Secondary Symptom disable function 2024-02-12 16:05:49 +01:00
wunderfisch e11acbab78 Disable and switch secondary symptom depending on cervical mucus and cervix turned on or off. 2024-02-12 14:49:43 +01:00
bl00dymarie 1db2f3a945 Merge branch 'feature/Customize-tracking-categories-temperature' into 'main' 
Feature: customize tracking categories temperature

See merge request bloodyhealth/drip!650
 2024-02-08 17:20:56 +00:00
bl00dymarie 34e672dd31 Merge branch 'fix/Remove-nonfunctional-repair' into 'main' 
Remove nonfunctional repair

See merge request bloodyhealth/drip!657
 2024-02-08 15:24:33 +00:00
bl00dymarie 845e42eafc Remove nonfunctional repair 2024-02-08 16:22:20 +01:00
bl00dymarie da4d90fded Merge branch '681-rename-nfp-to-sympto-thermal-method' into 'main' 
Resolve "Rename nfp to sympto-thermal method"

Closes #681

See merge request bloodyhealth/drip!649
 2024-02-08 15:10:15 +00:00
bl00dymarie a0b275d052 Merge branch 'dependabot-npm_and_yarn-react-native-community-datetimepicker-7.2.0' into 'main' 
Bump @react-native-community/datetimepicker from 6.3.1 to 7.2.0

See merge request bloodyhealth/drip!612
 2024-02-08 14:50:25 +00:00
wunderfisch 0adea893f7 Apply 1 suggestion(s) to 1 file(s) 2024-02-08 11:45:20 +00:00
Sofiya Tepikin 318fd7cfee Bump @react-native-community/datetimepicker from 6.3.1 to 7.2.0 
Bumps [@react-native-community/datetimepicker](https://github.com/react-native-community/datetimepicker) from 6.3.1 to 7.2.0.
- [Release notes](https://github.com/react-native-community/datetimepicker/releases)
- [Changelog](https://github.com/react-native-datetimepicker/datetimepicker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-native-community/datetimepicker/compare/v6.3.1...v7.2.0)
 2024-02-08 12:37:13 +01:00
bl00dymarie 5e79fdfc4b Merge branch '698-add-info-text-to-password-section-in-settings' into 'main' 
Resolve "Add info text to Password Section in Settings"

Closes #698

See merge request bloodyhealth/drip!654
 2024-02-08 09:54:32 +00:00
wunderfisch a74b5d58e8 get back npm install in gitlab-ci.yml I believe we actually need this and that line 11 installs that certain npm version while this line installs everything else we need. Without pipeline crashes. 2024-02-06 21:23:48 +01:00
Liv M 3e52275a9f Merge branch 'feature/template' into 'main' 
Fix: Update issue templates

See merge request bloodyhealth/drip!655
 2024-02-06 13:27:55 +00:00
Liv M edc452381a Fix: Update issue templates 2024-02-06 13:27:55 +00:00
bl00dymarie 9991260c38 Add pw text in settings and extra container for > 2024-02-06 12:55:29 +01:00
bl00dymarie a289edb7f1 Add symptom labels from config list 2024-01-29 18:22:08 +01:00
bl00dymarie 080ce0f3d3 Hide SecondarySymptom Switch if temperature category turned off 2024-01-29 18:21:53 +01:00
bl00dymarie 6a4d5c330b Disable/hide TemperatureSlider if temperature category turned off 2024-01-29 18:20:58 +01:00
bl00dymarie 20af120498 Update RN to 0.68.3 for iOS build 2024-01-29 17:07:42 +01:00
bl00dymarie 91eb7ed29c Merge branch 'dependabot-npm_and_yarn-react-native-async-storage-async-storage-1.18.2' into 'main' 
Bump @react-native-async-storage/async-storage from 1.17.9 to 1.18.2

See merge request bloodyhealth/drip!611
 2024-01-29 15:44:04 +00:00
Sofiya Tepikin 55b1c5973d Bump @react-native-async-storage/async-storage from 1.17.9 to 1.18.2 
Bumps [@react-native-async-storage/async-storage](https://github.com/react-native-async-storage/async-storage) from 1.17.9 to 1.18.2.
- [Release notes](https://github.com/react-native-async-storage/async-storage/releases)
- [Changelog](https://github.com/react-native-async-storage/async-storage/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-native-async-storage/async-storage/compare/v1.17.9...v1.18.2)
 2024-01-29 16:08:51 +01:00
bl00dymarie ec157078b2 Rename to "sympto-thermal method" + nfp settings to "Customization" 2024-01-26 14:23:40 +01:00
Liv M 4e8e92b0d5 Merge branch 'fix/rounding-stats' into 'main' 
Change formatting of decimals in stats

Closes #669

See merge request bloodyhealth/drip!633
 2024-01-24 17:45:07 +00:00
Liv M f337272933 Merge branch 'fix/toggle-tab' into 'main' 
Fix: Make tab groups (single select) togglable

See merge request bloodyhealth/drip!645
 2024-01-24 17:41:49 +00:00