lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,909 Commits 31 Branches 14 Tags
0f375530c8c369bdb6a26415a53da2dab1bf8a49
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
bl00dymarie 448e0a8476 Merge branch 'Release-1.2102.28' into 'master' 
Release: 1.2102.28

See merge request bloodyhealth/drip!357
 2021-02-28 16:51:08 +00:00
bl00dymarie d67c912e1d Merge branch '478-bug-fertility-text-on-home-page-not-correct' into 'master' 
Resolve "Bug: fertility text on home page not correct"

Closes #478

See merge request bloodyhealth/drip!355
 2021-02-28 16:05:01 +00:00
bl00dymarie 19942d3afc Merge branch 'chore/fix-styling' into 'master' 
Chore/fix styling

See merge request bloodyhealth/drip!353
 2021-02-17 22:39:40 +00:00
bl00dymarie 8065dad6a0 Merge branch 'p_doub-master-patch-69749' into 'master' 
Very small fixes in the README

See merge request bloodyhealth/drip!352
 2021-02-14 22:24:25 +00:00
bl00dymarieandSofiya Tepikin 6f36428fd2 Changes temp range and default values 2021-01-23 10:35:59 +00:00
bl00dymarie 199aa198d1 Merge branch 'Add-lisa' into 'rebased-redesign' 
Add Lisa as condriputor <3

See merge request bloodyhealth/drip!333
 2021-01-08 18:44:37 +00:00
bl00dymarie 83b80e5623 Merge branch '484-update-text-in-app' into 'rebased-redesign' 
Adds updated text about credits.

See merge request bloodyhealth/drip!332
 2021-01-08 16:47:20 +00:00
bl00dymarie 45bc9f6c51 Merge branch '468-removes-extra-grid-line-on-temperature-chart' into 'rebased-redesign' 
Fixes extra horizontal grid line on chart

See merge request bloodyhealth/drip!325
 2020-12-30 17:04:33 +00:00
bl00dymarie 6a7323269a Merge branch '466-bug-temp-hint-for-too-high-or-low-value-shows-at-the-start' into 'rebased-redesign' 
No warning msg if there is no temp data

See merge request bloodyhealth/drip!322
 2020-12-29 11:12:29 +00:00
bl00dymarie ab1acf21ba Merge branch '438-stats-page-tuning' into 'rebased-redesign' 
Resolve "Stats"

See merge request bloodyhealth/drip!316
 2020-12-20 19:11:03 +00:00
bl00dymarie 08e01346f3 Merge branch '434-home-page-tuning' into 'rebased-redesign' 
Resolve "Redesign fix: Homepage fix"

See merge request bloodyhealth/drip!315
 2020-12-20 10:38:11 +00:00
bl00dymarie 9c9d06f192 Merge branch 'fix-ordinal-suffix' into 'rebased-redesign' 
Fix ordinal suffix for numbers greater than 10

See merge request bloodyhealth/drip!306
 2020-12-13 13:26:35 +00:00
bl00dymarie d47ae0de0e Merge branch '440-cycle-overview-page-limit-note-size-to-display' into 'rebased-redesign' 
Limit line length on text of symptom box

See merge request bloodyhealth/drip!314
 2020-12-13 12:20:37 +00:00
bl00dymarie 44b916354d Merge branch '439-settings-menu-update' into 'rebased-redesign' 
Updates settings menu styling

See merge request bloodyhealth/drip!317
 2020-12-13 12:13:05 +00:00
bl00dymarie 89ff4b2cdc Merge branch '449-change-crossed-out-text-for-excluded-values-on-cycle-day-overview' into 'rebased-redesign' 
Remove line-through textDecoration for excluded values

See merge request bloodyhealth/drip!312
 2020-12-05 11:48:34 +00:00
bl00dymarie 8f34cbc260 Merge branch '458-pont-8-not-shown-in-chart' into 'rebased-redesign' 
Resolve "38.8 is not shown on a chart"

See merge request bloodyhealth/drip!313
 2020-12-05 11:48:20 +00:00
bl00dymarie 0451b078ad Update README.md 2020-08-22 12:00:52 +00:00
bl00dymarie afb53a6f82 Update RELEASE.md 2020-08-01 12:14:03 +00:00
bl00dymarie 9d05b27d32 Update RELEASE.md 2020-08-01 11:56:38 +00:00
bl00dymarie 2f7aba0137 Update README.md 2020-08-01 11:51:58 +00:00
bl00dymarie 722981d224 Update README.md 2020-08-01 11:50:26 +00:00
bl00dymarie ab45d2f1ca Add new RELEASE file 2020-08-01 11:48:31 +00:00
bl00dymarieandSofiya Tepikin 3ac28e527d Release: 0.2007.12-beta 2020-08-01 11:39:17 +00:00
bl00dymarie fd818404d4 Merge branch 'Adds-drips' into 'master' 
Adds Mariya & Sofiya as contributors <3

See merge request bloodyhealth/drip!300
 2020-07-12 17:17:20 +00:00
bl00dymarie a7aae0673e Merge branch 'Changes-year-in-copyright-text' into 'master' 
Uses built-in JS functionality for getting currentYear, thanks to @sdvig

See merge request bloodyhealth/drip!296
 2020-06-19 09:02:58 +00:00
bl00dymarie 930ed3fdc5 Merge branch 'Changes-year-in-copyright-text' into 'master' 
Sets current year instead of hard coded

See merge request bloodyhealth/drip!295
 2020-06-19 08:51:47 +00:00
bl00dymarie 0e1b95d313 Update README.md 2020-06-05 22:40:57 +00:00
bl00dymarie 880dd8b843 Update README.md 2020-06-05 19:48:20 +00:00
bl00dymarie 54b30ec229 Update README.md 2020-06-05 19:45:34 +00:00
bl00dymarie dc1164ef03 Update README.md 2020-06-05 19:44:09 +00:00
bl00dymarie be4f50c962 Update README.md 2020-06-05 19:43:38 +00:00
bl00dymarie 91bf76621a Update README.md 2020-06-05 19:43:07 +00:00
bl00dymarie c0c025cd69 Merge branch 'bug-cannot-enter-note-in-future' into 'master' 
Bug fix: allows to enter note in the future

See merge request bloodyhealth/drip!288
 2020-05-02 15:22:18 +00:00
bl00dymarie 1291fe70bc Merge branch 'patch-1' into 'master' 
Update README.md with F-Droid and Google Play Badges

See merge request bloodyhealth/drip!289
 2020-04-03 15:38:05 +00:00
bl00dymarie f987628ced Update CONTRIBUTING.md 2020-03-28 19:06:07 +00:00
bl00dymarie 052b9bd2aa Update CHANGELOG.md 2020-03-28 19:04:21 +00:00
bl00dymarie 620f5e77da Merge branch '414-bug-darker-color-in-dots-for-sex-and-desire-on-chart-is-missing' into 'master' 
Bring in different shades for desire dots on chart

Closes #414

See merge request bloodyhealth/drip!265
 2020-03-27 16:15:22 +00:00
bl00dymarie 2d1ab273a0 Merge branch '403-add-how-to-e2e-test-to-readme' into 'master' 
Adds e2e test setup to README

Closes #403

See merge request bloodyhealth/drip!239
 2019-08-17 14:29:00 +00:00
bl00dymarie 5e32f4d7dc Merge branch 'Bugfix-password-crash' into 'master' 
Makes sure style is an array for it to spread

See merge request bloodyhealth/drip!230
 2019-05-29 10:58:07 +00:00
bl00dymarie 592f2b3e16 Merge branch '386-bug-fertility-text-is-missing-on-homescreen' into 'master' 
Make sure fertility text is displayed on home screen

Closes #386

See merge request bloodyhealth/drip!228
 2019-05-28 08:17:12 +00:00
bl00dymarie 406b71250e Merge branch '384-bug-header-title-in-settings-moves-up' into 'master' 
Gets rid of hidden icon in back button header

Closes #384

See merge request bloodyhealth/drip!227
 2019-05-28 06:39:59 +00:00
bl00dymarie 6228cd8953 Merge branch 'Space-between-info-icon-and-text' into 'master' 
Make uniform info icon and leave some space

See merge request bloodyhealth/drip!223
 2019-05-28 06:38:14 +00:00
bl00dymarie 2623fedec9 Merge branch '382-bug-cervical-mucus-title-broken-on-symptom-view' into 'master' 
Changes fontSize of titles in SymptomBoxes;

Closes #382

See merge request bloodyhealth/drip!226
 2019-05-28 06:37:44 +00:00
bl00dymarie bfdad895ce Merge branch '375-change-description-of-mucus-and-cervix-on-cycle-day-overview' into 'master' 
Adds more descriptive mucus and cervix labels for cycle day overview

Closes #375

See merge request bloodyhealth/drip!221
 2019-05-28 06:36:35 +00:00
bl00dymarie ac2bad1de0 Merge branch '376-consider-rename-mucus-into-cervical-mucus' into 'master' 
Specifying mucus as cervical mucus

Closes #376

See merge request bloodyhealth/drip!222
 2019-05-25 21:38:47 +00:00
bl00dymarie e2abc4dbeb Merge branch 'marie-move-info-button-out-of-header-to-body' into 'master' 
Move info button out of header to body

See merge request bloodyhealth/drip!217
 2019-05-25 09:35:31 +00:00
bl00dymarie ed38a5b450 Merge branch '362-rearrange-home-screen-elements' into 'master' 
Resolve "Rearrange home screen elements"

Closes #362

See merge request bloodyhealth/drip!220
 2019-05-24 10:28:33 +00:00
bl00dymarie f123dbf730 Merge branch '342-bleeding-prediction-on-homescreen' into 'master' 
Resolve "Bleeding prediction on homescreen"

Closes #342

See merge request bloodyhealth/drip!202
 2019-05-10 11:15:57 +00:00
bl00dymarie 7c5d0b9ae2 Merge branch '344-lowercase-for-symptom-values' into 'master' 
Lowercase values for sex, pain and mood

Closes #344

See merge request bloodyhealth/drip!204
 2019-04-25 10:14:11 +00:00