lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,112 Commits 31 Branches 14 Tags
223ac148bdfb723ba9646f64eca88d76ba38e21d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bl00dymarie 223ac148bd Merge branch 'Chore/Fix-android-build' into 'main' 
Chore/fix android build

See merge request bloodyhealth/drip!686
 2024-10-15 11:36:01 +00:00
bl00dymarie 5bc6be7849 Merge branch 'Chore/Finetune-release-documentation' into 'main' 
Chore: Clean up TOC and add fdroid documentation

See merge request bloodyhealth/drip!679
 2024-04-10 16:01:52 +00:00
bl00dymarie e6c253f2cb Merge branch 'Chore/Update-run-script-for-which-iPhone-simulator' into 'main' 
Chore: Update run script for which iPhone simulator

See merge request bloodyhealth/drip!680
 2024-04-08 10:47:54 +00:00
bl00dymarie b44d4c57e1 Update file RELEASE.md 2024-04-02 11:57:53 +00:00
bl00dymarie 35224ba722 Merge branch 'Chore/Update-changelog' into 'main' 
Update Changelog for v1.2403.19

See merge request bloodyhealth/drip!674
 2024-03-25 14:33:12 +00:00
bl00dymarie 09edaec721 Merge branch 'Chore/Update-RELEASE' into 'main' 
Add extensive list of release steps

See merge request bloodyhealth/drip!677
 2024-03-25 13:31:17 +00:00
bl00dymarie 3cedcf601e Merge branch 'Release-1.2403.19' into 'main' 
Release 1.2403.19 update for Android and iOS

See merge request bloodyhealth/drip!678
 2024-03-21 11:56:17 +00:00
bl00dymarie d8cb679d77 Merge branch 'Add-ios-release-notes' into 'main' 
Chore: Add release notes for iOS

See merge request bloodyhealth/drip!676
 2024-03-19 13:24:13 +00:00
bl00dymarie c8521cf5ed Merge branch '711-chore-testing-feedback-for-v1-2403-11' into 'main' 
Resolve "Chore: Testing Feedback for v1.2403.11"

Closes #711

See merge request bloodyhealth/drip!673
 2024-03-18 17:47:49 +00:00
bl00dymarieandwunderfisch eaf01e98d5 renaming 2024-03-14 10:58:56 +00:00
bl00dymarieandwunderfisch f5894c028e renaming 2024-03-14 10:54:18 +00:00
bl00dymarie a29c0e2eec Merge branch '676-feature-customisation-not-display-mucus-cervix' into 'chore/refactor-customization' 
# Conflicts:
#   i18n/en/settings.js
 2024-03-13 15:19:17 +00:00
bl00dymarie 18466ebcee Merge branch 'feature/Add-symptom-icons-to-customization' into '676-feature-customisation-not-display-mucus-cervix' 
Feature: Add symptom icons to customization toggles

See merge request bloodyhealth/drip!666
 2024-03-11 11:42:36 +00:00
bl00dymarie b17c86ffd6 Merge branch 'Chore/Unify-spelling-of-sympto-thermal' into '676-feature-customisation-not-display-mucus-cervix' 
Chore: Unify spelling of sympto-thermal

See merge request bloodyhealth/drip!667
 2024-02-29 10:37:05 +00:00
bl00dymarie 24df5cea31 Spell "science-based" 2024-02-29 10:35:22 +00:00
bl00dymarie 9ec52b78cf Add comment for future TODO linking gitlab issue 2024-02-26 16:51:29 +00:00
bl00dymarie 27776f93cc Merge branch '675-feature-customisation-not-display-fertility-phases' into '676-feature-customisation-not-display-mucus-cervix' 
Resolve "feature: customisation (not) display fertility phases"

See merge request bloodyhealth/drip!659
 2024-02-26 15:48:27 +00:00
bl00dymarie e69ca93382 Remove idle code 2024-02-22 13:29:16 +00:00
bl00dymarie aa440742ca Merge branch 'main' into '676-feature-customisation-not-display-mucus-cervix' 
# Conflicts:
#   components/settings/customization/index.js
 2024-02-22 13:22:38 +00:00
bl00dymarie 7fff6cbdf4 Merge branch 'Chore/Bring-back-prettier' into 'main' 
Bring back prettierrc as before

See merge request bloodyhealth/drip!664
 2024-02-22 12:56:31 +00:00
bl00dymarie 75dbe8bfde Merge branch 'Chore/Add-color-to-switch-element' into 'main' 
Add trackColor to Switch element directly

See merge request bloodyhealth/drip!663
 2024-02-22 12:43:57 +00: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
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 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 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
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
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
bl00dymarie 27274aa994 Merge branch 'feature/Customize-tracking-categories-sex-desire-pain–mood-note' into 'main' 
Feature: customize tracking categories sex desire pain mood note

See merge request bloodyhealth/drip!648
 2024-01-23 13:25:20 +00:00
bl00dymarie c645c48d31 Merge branch '671-feature-customisation-not-display-menstrual-bleeding-prediction' into 'main' 
Feature: Customizable period prediction

Closes #671

See merge request bloodyhealth/drip!647
 2024-01-22 14:40:31 +00:00
bl00dymarie f0750cd45f Remove formatting changes 2023-12-13 14:52:00 +00:00
bl00dymarie f3aa5b4d68 Merge branch 'main' into 'Chore/build-for-ios-1.2312.11' 
# Conflicts:
#   package.json
 2023-12-13 11:14:43 +00:00
bl00dymarie b2f277eb12 Merge branch '678-bug-excluded-temp-value-needs-lighter-color' into 'main' 
Fix: Specify dot fill color for excluded temp value

Closes #678

See merge request bloodyhealth/drip!637
 2023-12-13 11:05:59 +00:00
bl00dymarie 3bdf660c27 Merge branch '677-fix-license-screen-cut-out-on-top' into 'main' 
Fix: Give some marginTop on very first License screen

Closes #677

See merge request bloodyhealth/drip!638
 2023-12-13 11:00:48 +00:00
bl00dymarie a6fc38ca47 Merge branch '674-chore-update-media-for-fdroid' into 'main' 
Resolve "Chore: Update media for Fdroid"

Closes #674

See merge request bloodyhealth/drip!635
 2023-12-05 15:08:28 +00:00
bl00dymarieandwunderfisch 2f07b76b6c improved text how to contribute to drip 2023-12-05 12:28:17 +00:00
bl00dymarie bb29f29de5 Update file Default.md 2023-12-04 19:36:39 +00:00
bl00dymarie c5906c2144 Update file RELEASE.md 2023-12-04 15:08:31 +00:00
bl00dymarie 89015abe17 Update file RELEASE.md 2023-12-04 15:07:57 +00:00
bl00dymarie 06fc4f4b6b Update file RELEASE.md 2023-12-04 15:07:04 +00:00
bl00dymarie 64ed3aba4a Update file RELEASE.md 2023-12-04 15:03:16 +00:00
bl00dymarie d6dbea78ac Merge branch 'Chore/Release-steps' into 'main' 
Chore: Android release documentation

See merge request bloodyhealth/drip!631
 2023-11-22 15:29:06 +00:00
bl00dymarie e030c4d75e Update download badges 2023-11-21 13:16:26 +00:00
bl00dymarie 536106f757 Merge branch 'release' into 'main' 
Keep main up to date with release branch after android v1.2311.14 Google Play Publish

See merge request bloodyhealth/drip!630
 2023-11-17 23:29:48 +00:00
bl00dymarie 552e63c9ef Merge branch 'chore/ci-cd' into 'main' 
Chore: Bump npm version

See merge request bloodyhealth/drip!624
 2023-11-17 13:13:10 +00:00
bl00dymarie 0f375530c8 Merge branch 'Chore/Release-v1.2311.14-versionCode25' into 'release' 
Release: v1.2311.14

See merge request bloodyhealth/drip!629
 2023-11-16 15:49:19 +00:00
bl00dymarie 54b08c15bb Merge branch '656-chore-write-changelog-and-release-notes-1' into 'release' 
Add Changelog for Release v1.2311.10

See merge request bloodyhealth/drip!628
 2023-11-13 11:50:52 +00:00
bl00dymarie 2eca9ba097 Merge branch 'fix/Update-android-1.2310.31-versionNumber21' into 'release' 
Fix: Update android to v1.2310.31 for testing

See merge request bloodyhealth/drip!619
 2023-11-09 11:10:35 +00:00
bl00dymarie 67d58e3db4 Update 2 files 
- /.gitlab/issue_templates/bug-template.md
- /.gitlab/issue_templates/chore-template.md
 2023-11-09 09:55:01 +00:00
bl00dymarieandtintenfisch 3f2af788f3 Apply reviewed suggestions 2023-11-07 10:20:12 +00:00
bl00dymarie 573de7545e Merge branch 'chore/edit-merge-request-template-to-close-issues' into 'main' 
Edit merge request template to close issues automatically

See merge request bloodyhealth/drip!578
 2023-11-07 10:04:44 +00:00
bl00dymarieandwunderfisch e7f76bad33 implement feedback suggestions 2023-10-20 11:20:38 +02:00
bl00dymarieandSofiya Tepikin f61f450c91 Setting for ITSAppUsesNonExemptEncryption 2022-08-15 17:52:42 +02:00
bl00dymarieandSofiya Tepikin 038ed9e11f Bump version number 1.2208.11 2022-08-15 17:52:42 +02:00
bl00dymarieandSofiya Tepikin 04bd981871 Remove email and hence typo from text 2022-08-15 17:48:46 +02:00
bl00dymarieandSofiya Tepikin 02d873b8f6 Bump version number 1.2208.8 2022-08-15 17:48:46 +02:00
bl00dymarie 1c1d64e719 Bump version to 1.2208.2 2022-08-02 23:07:36 +02:00
bl00dymarie 77e1a16778 Merge branch '574-adapt-wording-in-privacy-policy' into 'main' 
Remove ios from text bc it applies to android as well

Closes #574

See merge request bloodyhealth/drip!415
 2022-07-20 10:35:37 +00:00
bl00dymarie b6bd2332eb Merge branch '575-activate-nfp-setting' into 'main' 
Disable temperature slider for iOS only

Closes #575

See merge request bloodyhealth/drip!414
 2022-07-20 10:35:13 +00:00
bl00dymarie 85301fb89c Merge branch 'Chore/Update-readme-for-ios' into 'master' 
Update README.md

See merge request bloodyhealth/drip!409
 2022-07-12 10:47:14 +00:00
bl00dymarie 5c235b5197 Update https website link 2022-07-10 19:34:01 +02:00
bl00dymarie 31bcece857 Bump version number 1.2207.10 2022-07-10 19:33:11 +02:00
bl00dymarie aa12f8f249 Merge branch 'fix/donate-button-fork' into 'master' 
Cleanup donation button fork on iOS & update the link to the website

Closes #572 and #566

See merge request bloodyhealth/drip!412
 2022-07-10 17:27:59 +00:00
bl00dymarie c311900e27 Merge branch '546-bug-cycle-day-title-covers-navigation-on-upper-right-2' into 'master' 
Fix: Make date format more compact for cycle day

Closes #546

See merge request bloodyhealth/drip!411
 2022-07-10 16:46:04 +00:00
bl00dymarie 71d81904ad Make date format more compact for cycle day 2022-07-10 18:11:02 +02:00
bl00dymarie 3f9547a2cc Use xcode 13 2022-07-10 15:33:51 +02:00
bl00dymarie 9732dd4711 Use brew for installing cocoapods 2022-07-10 15:29:37 +02:00
bl00dymarie 81e3a610f4 Correct formatting for code snippets 2022-07-10 15:28:36 +02:00
bl00dymarie 5920e67a1a Correct nvm how to install info 2022-07-10 13:56:31 +02:00
bl00dymarie a8a72ddbf4 Update README.md 2022-07-06 20:56:51 +00:00
bl00dymarie 829b4bf242 Merge branch 'chore/Bump-version-number' into 'master' 
Chore/bump version number to 1.2206.19

See merge request bloodyhealth/drip!402
 2022-06-22 09:58:13 +00:00
bl00dymarie 09c808f99b Merge branch 'chore/realm-upgrade' into 'master' 
Chore/realm upgrade

See merge request bloodyhealth/drip!393
 2022-06-19 17:04:30 +00:00
bl00dymarie f56b94463f Merge branch 'Fix/rename-drip-for-ios' into 'master' 
Rename drip to drip.

See merge request bloodyhealth/drip!400
 2022-06-19 15:51:34 +00:00
bl00dymarie c2af69cfec Revert README changes 2022-06-19 15:04:05 +00:00
bl00dymarie 52094573e2 Merge branch 'Fix/Switch-options-in-import-text' into 'master' 
Fix: Switch button order to match explainer text

See merge request bloodyhealth/drip!397
 2022-06-19 13:34:47 +00:00
bl00dymarie 1f3cdb9438 Merge branch 'chore/start-on-xcode13' into 'chore/realm-upgrade' 
Chore/start on xcode13

See merge request bloodyhealth/drip!394
 2022-05-26 13:51:33 +00:00
bl00dymarie f7fc81d865 Merge branch '542-bug-styling' into 'master' 
Resolve "Bug: Styling"

Closes #542

See merge request bloodyhealth/drip!391
 2022-04-30 16:37:49 +00:00
bl00dymarie 342f9798b2 Merge branch 'Fix-title-for-picker' into 'master' 
Fix: Specify the title for timePicker in IOS

See merge request bloodyhealth/drip!387
 2022-04-15 21:22:03 +00:00
bl00dymarie 9cfc93cd8e Merge branch '539-bug-values-for-sex-mood-pain-symptom-boxes-on-overviews-are-not-shown' into 'master' 
Revert "Update realm version 3.6.5 -> 5.0.9"

Closes #539

See merge request bloodyhealth/drip!386
 2022-04-15 19:45:13 +00:00
bl00dymarie 9b5a717c7d Merge branch '540-Temperature-value-cannot-be-entered-with-comma' into 'master' 
Resolve "Bug: Temperature value cannot be entered with comma"

Closes #540

See merge request bloodyhealth/drip!390
 2022-04-15 19:23:04 +00:00
bl00dymarie 76f81841f4 Merge branch '537-bug-temperature-reminder-on-ios' into 'master' 
Fix: Target reminder with correct id

Closes #537

See merge request bloodyhealth/drip!389
 2022-04-15 17:29:19 +00:00
bl00dymarie a37607eae6 fix indentation 2022-04-15 14:06:06 +00:00
bl00dymarie 54bc836811 fix indentation 2022-04-15 14:05:41 +00:00
bl00dymarie 2a49e43065 Merge branch 'chore/update-styling' into 'master' 
Chore/update styling

See merge request bloodyhealth/drip!374
 2022-03-26 12:15:59 +00:00
bl00dymarie a624b5c015 Merge branch '535-chore-remove-unsupported-platforms-for-gradle' into 'master' 
Chore: Remove unspported platforms for gradle

Closes #535

See merge request bloodyhealth/drip!383
 2022-03-26 10:54:00 +00:00
bl00dymarieandLisa Hillebrand 09de52b5df Dot notation 2022-03-26 11:46:32 +01:00
bl00dymarieandLisa Hillebrand 1584d2d368 Dot notation 2022-03-26 11:46:32 +01:00
bl00dymarie 009b6b38e1 Correct email 2022-03-26 10:19:15 +00:00
bl00dymarie f462b349fc Merge branch 'chore/update-realm' into 'master' 
Update realm version 3.6.5 -> 5.0.9

See merge request bloodyhealth/drip!380
 2022-03-25 21:48:36 +00:00
bl00dymarie 1e734082af Merge branch 'chore/update-readme' into 'master' 
Add info on nvm requirement and xcode 12.5 fix

See merge request bloodyhealth/drip!372
 2021-09-19 12:46:26 +00:00
bl00dymarie f282e24308 Merge branch 'feature/add-toast-on-ios' into 'master' 
Feature: add toast on ios

Closes #321

See merge request bloodyhealth/drip!370
 2021-09-19 10:07:58 +00:00
bl00dymarie d1efd1d587 Merge branch '510-replace-metadata-folder-with-redesigned' into 'master' 
Resolve "Replace metadata folder with redesigned"

Closes #510

See merge request bloodyhealth/drip!368
 2021-09-05 12:17:24 +00:00
bl00dymarie c5162beb3b Update Twitter handle 2021-07-30 12:12:33 +00:00
bl00dymarie e08c6be97c Merge branch 'weblate-drip-test-component' into 'master' 
Translations update from Weblate

See merge request bloodyhealth/drip!362
 2021-06-18 11:44:51 +00:00
bl00dymarieandHosted Weblate ea669c1fac Added translation using Weblate (German) 2021-06-18 13:33:17 +02:00
bl00dymarie 940c7806ee Merge branch '162-Prepare-localization' into 'master' 
Resolve "Prepare localization"

Closes #162

See merge request bloodyhealth/drip!361
 2021-06-18 11:11:28 +00:00
bl00dymarie aa2de9e335 Update CONTRIBUTING.md 2021-03-13 17:30:02 +00:00
bl00dymarie e78337a8b3 Update CONTRIBUTING.md 2021-03-13 17:17:48 +00:00