Commit Graph

256 Commits

Author SHA1 Message Date
Julia Friesel 63154be24a Shorten line lengths in sympto 2018-08-06 13:10:59 +02:00
Julia Friesel 2f9b08fd8b Shorten line lengths in cycle 2018-08-06 13:10:59 +02:00
Julia Friesel e1fa656b8f Shorten line length in temperature 2018-08-06 13:10:59 +02:00
Julia Friesel da29c2751b Shorten line lengths in home 2018-08-06 13:10:59 +02:00
Julia Friesel c525812a0e Reduce line lengths 2018-08-06 13:10:59 +02:00
Julia Friesel 310683c5f8 Programmatically add props to cycle day views 2018-08-06 13:10:59 +02:00
Julia Friesel e51a99b8af Clean up line lengths in calendar 2018-08-06 13:10:59 +02:00
Julia Friesel 01d40a6d21 Merge branch 'upgrade-reaxct-native' into 'master'
Upgrade to RN 56 and gradle 3

See merge request bloodyhealth/drip!45
2018-08-06 11:01:21 +00:00
Julia Friesel 315bdf3a02 Fix babel/register for mocha 2018-08-03 17:12:08 +02:00
Julia Friesel 79379276a7 Upgrade to RN 56 and gradle 3 2018-08-03 16:21:50 +02:00
bl00dymarie 043aac623f Merge branch '100-implement-desire' into 'master'
Resolve "Implement desire"

Closes #100

See merge request bloodyhealth/drip!44
2018-08-03 11:54:41 +00:00
emelko 8e56fc0b23 Adds new set of labels for chosing intensity of a tracking category 2018-08-03 13:28:10 +02:00
emelko e42d25a087 Revert "Renames cervixPosition labels into more universal positionOrIntensity"
This reverts commit f7efadb08a.
2018-08-03 13:22:34 +02:00
emelko 30839b5589 Adds desire as a tracking category to our app;
no exclude, no fancy nothing else, only pure desire tracking.
2018-08-02 17:19:21 +02:00
emelko f7efadb08a Renames cervixPosition labels into more universal positionOrIntensity 2018-08-02 17:18:19 +02:00
emelko fb3b01a57d Rescues a forgotten console log 2018-08-02 17:17:17 +02:00
Julia Friesel 125fe03678 Fix test file name spelling 2018-08-02 15:52:32 +02:00
Julia Friesel 3ab918abd9 Merge branch '99-take-out-invalid-mucus-change' into 'master'
Resolve "Take out invalid mucus change"

Closes #99

See merge request bloodyhealth/drip!37
2018-08-02 09:26:42 +00:00
Julia Friesel 8bbf122d12 Ignore 0 -> 1 mucus shift 2018-08-02 11:12:01 +02:00
Julia Friesel 6ac642b91c Merge branch '95-bug-ignore-mucus-values-in-irrelevant-phase' into 'master'
Resolve "bug: ignore mucus values in irrelevant phase"

Closes #95

See merge request bloodyhealth/drip!42
2018-08-02 08:36:04 +00:00
Julia Friesel 574e7ed854 Ignore highest quality after end of eval 2018-08-01 16:45:41 +02:00
tina bc28d28331 Merge branch '96-write-function-for-period-length-evaluation' into 'master'
Resolve "write function for period length evaluation"

Closes #96

See merge request bloodyhealth/drip!40
2018-08-01 14:01:05 +00:00
tina 00a7de0faf little improvements and test for array of one element 2018-08-01 15:49:44 +02:00
tina 9664984e72 rounds period stats, adds tests 2018-08-01 15:19:59 +02:00
tina cceecc071d computes the stats about the period lengths, started tests 2018-07-31 15:06:16 +02:00
bl00dymarie ac8d383729 Merge branch 'Fix-label-on-cycle-day-overview' into 'master'
Bugfix

See merge request bloodyhealth/drip!39
2018-07-31 07:00:56 +00:00
emelko 5f840aa669 For the sake of not exceeding max line length 2018-07-30 18:29:35 +02:00
emelko 20d1af4cdd Fix mucus.value instead of mucus.computedNfp; additional check for mucus.value 2018-07-30 16:39:10 +02:00
bl00dymarie 3a4ce79ea2 Merge branch '53-update-readme' into 'master'
Resolve "update readme"

Closes #53

See merge request bloodyhealth/drip!36
2018-07-25 12:25:51 +00:00
emelko 6855a905fe Small update of README 2018-07-25 11:59:58 +02:00
bl00dymarie 7033f72333 Merge branch 'Missing-android-files' into 'master'
Adding missing android res files

See merge request bloodyhealth/drip!35
2018-07-25 09:26:15 +00:00
emelko edc701873e Adding missing android res files 2018-07-25 11:23:08 +02:00
Julia Friesel 2950abf047 Merge branch '70-implement-note-2' into 'master'
Resolve "implement note"

Closes #70

See merge request bloodyhealth/drip!33
2018-07-25 09:14:58 +00:00
Julia Friesel d44b6c348e Add note symptom view 2018-07-25 11:11:57 +02:00
Julia Friesel 2d3c74db02 Merge branch '73-implement-nfp-logic-for-mucus-mode' into 'master'
Resolve "implement NFP logic for mucus mode"

Closes #73

See merge request bloodyhealth/drip!20
2018-07-25 08:56:34 +00:00
Julia Friesel e3b8e5d717 Fix label, replace old property 2018-07-24 17:52:44 +02:00
Julia Friesel a2400983cf Move status labels to cycle day labels 2018-07-24 14:30:20 +02:00
Julia Friesel 5ce6bc8cfc Handle cycle with mucus on first cycle day 2018-07-24 14:21:10 +02:00
bl00dymarie 444991fbec Merge branch '92-investigate-error-message-on-master' into 'master'
Resolve "Investigate error message on master"

Closes #92

See merge request bloodyhealth/drip!32
2018-07-24 06:42:44 +00:00
Julia Friesel 5468c8051d Merge branch 'master' into 73-implement-nfp-logic-for-mucus-mode 2018-07-23 19:00:49 +02:00
Julia Friesel cac2e4b6e9 Merge branch '90-show-mucus-on-chart' into 'master'
Resolve "show mucus on chart"

Closes #90

See merge request bloodyhealth/drip!30
2018-07-23 16:44:54 +00:00
emelko bae2192a60 Consistency of no space in {} 2018-07-23 18:16:22 +02:00
emelko bcc901c061 Fixing bleeding and temperature button label on cycle day overview 2018-07-23 18:15:57 +02:00
bl00dymarie fb56fe4c2e Merge branch 'adding-cervix-symptom' into 'master'
Adding cervix symptom

See merge request bloodyhealth/drip!31
2018-07-23 12:01:23 +00:00
Julia Friesel 201a0d0ae1 Re-add delete all button 2018-07-23 12:59:40 +02:00
Julia Friesel f52401d05d Add button to add dummy data 2018-07-23 12:22:27 +02:00
emelko 0f6f28e8e4 Implementing Julia's suggestion to remove repetition 2018-07-20 19:11:24 +02:00
Julia Friesel 32c08c8df7 Fix cycle day overview categories inline 2018-07-20 18:58:30 +02:00
emelko b8e99194d9 Reorganise labels for cylce day overview 2018-07-20 18:25:20 +02:00
emelko 4a2b99f9d5 Adds cervix to symptoms:
has 3 properties: opening, firmness and position (which is optional);
2018-07-20 18:24:04 +02:00