lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
991 Commits 31 Branches 14 Tags
7499b443d7a31fba77e727f272ab16c73d0473a5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Friesel 7499b443d7 Merge branch 'use-external-sympto' into 'master' 
Use external sympto module

See merge request bloodyhealth/drip!173
 2019-02-08 07:44:45 +00:00
Julia Friesel e42aa9bb8e Merge branch '294-white-space-on-home-screen' into 'master' 
Resolve "white space on home screen"

Closes #294

See merge request bloodyhealth/drip!175
 2019-02-05 08:45:19 +00:00
Julia Friesel 57309b2e39 Merge branch 'link-nfp-rules' into 'master' 
Link nfp rules

See merge request bloodyhealth/drip!169
 2019-02-04 20:20:58 +00:00
Julia Friesel a7bf4c814f Merge branch 'master' into link-nfp-rules 2019-02-04 21:04:38 +01:00
Julia Friesel 433f7aa7f4 Merge branch '297-bug-overspilling-text-in-pain-mood-note' into 'master' 
Use built-in numberOfLines prop instead of truncating by hand

Closes #297

See merge request bloodyhealth/drip!174
 2019-02-04 19:07:16 +00:00
Julia Friesel 14b964443e Make home screen spacing more consistent 2019-02-02 21:51:00 +01:00
Julia Friesel d2282f6667 Use built-in numberOfLines prop instead of truncating by hand 2019-02-02 21:25:29 +01:00
Julia Friesel efca6f0d47 dirty-chai 2019-02-02 18:39:50 +01:00
Julia Friesel 0878654e82 Extract link component and parse all app text for links 2019-02-02 11:55:03 +01:00
Julia Friesel 87301da648 Return status text when no NFP status can be detected 2019-02-02 11:33:46 +01:00
Julia Friesel 8318f5d313 Make link work 2019-02-02 11:23:40 +01:00
Julia Friesel 3e94df56e2 Limit press handler to just button 2019-02-02 10:54:51 +01:00
Julia Friesel 5dc519980d Merge branch 'master' into link-nfp-rules 2019-02-02 10:26:18 +01:00
Julia Friesel 8bd8adaa7a Add text corrections 2019-02-02 09:46:59 +01:00
Julia Friesel 228ae781b9 Merge branch '286-increase-stroke-width-for-home-screen-elements' into 'master' 
Resolve "increase stroke width for home screen elements"

Closes #286

See merge request bloodyhealth/drip!160
 2019-01-26 12:01:12 +00:00
Julia Friesel 05d67150e5 Merge branch '265-add-info-to-mucus-i-text' into 'master' 
Add passage about lack of support for "parenthesis values"

Closes #265

See merge request bloodyhealth/drip!165
 2019-01-23 13:59:05 +00:00
Julia Friesel 28ca2378ca Add passage about lack of support for "parenthesis values" 2019-01-22 17:42:13 +01:00
Julia Friesel dfa37952bd Change font to OpenSans 2019-01-22 17:31:56 +01:00
Julia Friesel 90766bc1dc Merge branch 'settings-menu-footer' into 'master' 
Fixes settings item menu in footer missing active state

Closes #282

See merge request bloodyhealth/drip!164
 2019-01-22 16:01:48 +00:00
Julia Friesel 8701abb765 Merge branch '151-in-import-error-when-future-edit-for-something-other-than-a-note' into 'master' 
Show error message when future data edit

Closes #151

See merge request bloodyhealth/drip!161
 2019-01-18 10:12:49 +00:00
Julia Friesel ab3ca68902 Merge branch '285-bug-coming-from-track-your-period-cycle-day-doesn-t-show-data' into 'master' 
Pass correct props to bleeding edit view from home screen

Closes #285

See merge request bloodyhealth/drip!162
 2019-01-18 09:13:28 +00:00
Julia Friesel 0e73ab1810 Merge branch '292-bug-cycle-day-shows-undefined-for-bleeding-value' into 'master' 
Fix label reference

Closes #292

See merge request bloodyhealth/drip!163
 2019-01-18 09:12:44 +00:00
Julia Friesel 1aad11b504 Fix label reference 2019-01-17 21:20:19 +01:00
Julia Friesel 86e0d967be Pass correct props to bleeding edit view from home screen 2019-01-17 21:02:32 +01:00
Julia Friesel a9e22c941d Merge branch '289-bug-links-in-about-don-t-work-on-swift-phone' into 'master' 
Resolve "[Bug] links in about don't work on swift phone"

Closes #289

See merge request bloodyhealth/drip!159
 2019-01-17 18:22:42 +00:00
Julia Friesel d8ce68d1ed Show error message when future data edit 2019-01-17 18:11:17 +01:00
Julia Friesel 282ed7a96d Adjust font weights to new look 2019-01-17 17:28:50 +01:00
Julia Friesel c5363f588f Increase borderWith of circle icon 2019-01-17 17:18:41 +01:00
Julia Friesel d905139958 Remove light app text 2019-01-17 17:17:22 +01:00
Julia Friesel 7159124158 Incerase font weight in home icon font 2019-01-17 17:13:24 +01:00
Julia Friesel 8178303e3a Make link press handler work 2019-01-17 16:36:36 +01:00
Julia Friesel 23c6a60258 Fix var name 2019-01-17 15:58:42 +01:00
Julia Friesel 5947c4f3f5 Merge branch '230-change-standard-font' into 'master' 
Resolve "change standard font"

Closes #230

See merge request bloodyhealth/drip!120
 2019-01-17 14:41:08 +00:00
Julia Friesel df36e53743 Add letter spacing 2019-01-17 14:37:56 +00:00
Julia Friesel 5a57b2bb8c Merge branch 'add-cancel-button' into 'master' 
Add cancel button to ConfirmWithPassword component

Closes #274

See merge request bloodyhealth/drip!148
 2019-01-17 14:05:33 +00:00
Julia Friesel 5c925ea762 Add thing to build.gradle so release works 2019-01-16 19:48:23 +01:00
Julia Friesel b9636574fc Avoid naming collision error 2019-01-16 19:35:45 +01:00
Julia Friesel bb6af10fe1 Merge branch 'update-rn' into 'master' 
Update RN and its dependencies

See merge request bloodyhealth/drip!157
 2019-01-16 09:21:24 +00:00
Julia Friesel ea79d6b902 Remove deprecated aapt option 2019-01-15 22:55:30 +01:00
Julia Friesel 726e20280e Move babel stuff to dev dependencies 2019-01-15 22:55:01 +01:00
Julia Friesel 40366b51a4 Add missing deps 2019-01-15 22:19:10 +01:00
Julia Friesel e320e95f2a Update RN and its dependencies 2019-01-15 22:14:50 +01:00
Julia Friesel a604482f85 Merge branch '178-add-hints-for-required-selections' into 'master' 
Resolve "Change symptom category descriptions to make clear which are required (for mucus and cervix) for fertility detection"

Closes #178

See merge request bloodyhealth/drip!153
 2019-01-13 16:16:36 +00:00
Julia Friesel 896ae72632 Merge branch '127-extract-text-of-titles-and-subtitles-for-translation-and-or-modification' into 'master' 
Resolve "Extract text of titles and subtitles for translation and/or modification."

Closes #127

See merge request bloodyhealth/drip!152
 2019-01-13 12:25:56 +00:00
Julia Friesel 644b1e1af6 Merge branch 'fonts-on-home-screen' into 'master' 
Use same font for more, less and phase.

See merge request bloodyhealth/drip!150
 2019-01-13 12:20:09 +00:00
Julia Friesel 1469dea6ef Merge branch '279-bug-header-text-not-centered-vertically' into 'master' 
Improve positioning of header text

Closes #279

See merge request bloodyhealth/drip!151
 2019-01-13 12:12:28 +00:00
Julia Friesel 5a40f6cbb1 Merge branch 'macos-troubleshooting' into 'master' 
README: MacOS troubleshooting, 'ninja' and 'adb' errors

See merge request bloodyhealth/drip!149
 2019-01-12 13:31:14 +00:00
Julia Friesel ea58d738a9 Update README.md 2019-01-12 11:49:48 +00:00
Julia Friesel 999c65379d Merge branch 'refactoring-settings-view' into 'master' 
Refactoring settings view

Closes #275

See merge request bloodyhealth/drip!147
 2019-01-10 08:06:32 +00:00
Julia Friesel b7b6f98bad Change values 2019-01-09 09:21:42 +01:00
Julia Friesel 1102a40db0 Merge branch '266-implement-consent-for-legal-stuff' into 'master' 
Resolve "implement consent for legal stuff"

Closes #266

See merge request bloodyhealth/drip!144
 2019-01-08 16:41:33 +00:00
Julia Friesel b80c197b9c Use GNU license on license screen 2019-01-08 09:41:56 +01:00
Julia Friesel 480e4533be Fix license screen flicker 2019-01-08 09:16:11 +01:00
Julia Friesel 2c1b856234 Add press handlers to buttons 2019-01-08 09:16:11 +01:00
Julia Friesel 000e1b63c7 Add license page 2019-01-08 09:16:11 +01:00
Julia Friesel c713ed5490 Merge branch 'more-info-in-about-section' into 'master' 
More info in about section

Closes #122

See merge request bloodyhealth/drip!145
 2019-01-08 08:03:12 +00:00
Julia Friesel dace057b3c Remove unused import 2019-01-08 09:02:05 +01:00
Julia Friesel e87f439ff2 Update about.js with settingsSegment and give it last prop 2019-01-08 09:00:10 +01:00
Julia Friesel 5af16e28ca Improve wording 2019-01-08 08:51:16 +01:00
Julia Friesel 6a79f35e90 Think for yourself text 2019-01-08 08:51:16 +01:00
Julia Friesel b5240e32b0 Add website 2019-01-08 08:48:41 +01:00
Julia Friesel 1e98943931 Add version number 2019-01-08 08:47:05 +01:00
Julia Friesel f2cbccde9b Update GPL link 2019-01-08 08:46:15 +01:00
Julia Friesel 0126a70d64 Clean up 2019-01-08 08:46:15 +01:00
Julia Friesel 4671a2e337 Add license text 2019-01-08 08:46:15 +01:00
Julia Friesel 27b4a454ec Improve linking and link more things 2019-01-08 08:45:32 +01:00
Julia Friesel 300d7178f1 Merge branch 'delete-app-data' into 'master' 
Delete app data

Closes #259

See merge request bloodyhealth/drip!146
 2019-01-07 07:05:34 +00:00
Julia Friesel fb6dc9b061 Merge branch '268-sympto-respect-max-cycle-length' into 'master' 
Resolve "sympto: respect max cycle length"

Closes #268

See merge request bloodyhealth/drip!142
 2019-01-05 09:50:43 +00:00
Julia Friesel c47e453882 Make mac cycle length test more meaningful 2019-01-04 18:59:28 +01:00
Julia Friesel d86603e8a6 Merge branch 'fix-float-imprecision' into 'master' 
Fix float imprecision

See merge request bloodyhealth/drip!138
 2019-01-04 17:40:20 +00:00
Julia Friesel 8d7fa268de Fix cycle length in getCycle 2019-01-04 14:33:13 +01:00
Julia Friesel 4a29ef6c09 Merge branch '186-who-needs-to-be-credited-in-about-section-logo-icons-what-else' into 'master' 
Add credits to about section

Closes #186

See merge request bloodyhealth/drip!143
 2019-01-02 13:22:52 +00:00
Julia Friesel a0ef9fbe8e Add margin 2019-01-02 14:21:01 +01:00
Julia Friesel db68df9cfd Add credits to about section 2019-01-02 14:21:01 +01:00
Julia Friesel ff73925620 Merge branch '153-note-about-minus-20-rule-not-taken-into-account' into 'master' 
Resolve "Note about Minus 20 rule not taken into account"

Closes #153

See merge request bloodyhealth/drip!141
 2019-01-02 13:18:26 +00:00
Julia Friesel c28e32a953 Simplify stats constructor a bit 2018-12-21 15:40:46 +01:00
Julia Friesel 7f93ba154d Add test for getPredictedMenses 2018-12-21 15:30:48 +01:00
Julia Friesel 1f2801a83b Make getCycleLenghts filter for max cycle length 2018-12-21 15:30:48 +01:00
Julia Friesel 9fd0105506 Respect macCycleLength in getCyclesBefore 2018-12-21 15:30:48 +01:00
Julia Friesel 9bd0eedfaf Add test for getCycleDayNumber 2018-12-21 15:30:48 +01:00
Julia Friesel 6b0d202272 Respect maxcyclelength in getCycleForStartDay 2018-12-21 15:30:48 +01:00
Julia Friesel 2c48d59f54 Rename module 2018-12-21 08:43:52 +01:00
Julia Friesel 0aa8179570 Add link 2018-12-20 15:45:13 +01:00
Julia Friesel 77363511ad Add bottom margin 2018-12-20 15:05:25 +01:00
Julia Friesel f1b152bb5a Add icon 2018-12-20 14:59:49 +01:00
Julia Friesel 8696a6d7ea Add info text 2018-12-20 14:52:00 +01:00
Julia Friesel d07ab446dc Merge branch '273-add-submenu-to-settings' into 'master' 
Resolve "add submenu to settings"

Closes #273

See merge request bloodyhealth/drip!139
 2018-12-19 16:19:34 +00:00
Julia Friesel b8914b5339 Fix imports 2018-12-19 10:31:42 +01:00
Julia Friesel 59dff5066e Add header titles 2018-12-19 10:25:18 +01:00
Julia Friesel 73e2177278 Fix back behavior 2018-12-19 10:00:47 +01:00
Julia Friesel 1c9eea3aa0 Split settings view up 2018-12-19 09:53:37 +01:00
Julia Friesel f7fc65507e Merge branch '122-add-about-info-section-to-settings' into 'master' 
Added about section to settings

See merge request bloodyhealth/drip!132
 2018-12-19 08:18:24 +00:00
Julia Friesel f13ba0e023 Merge branch '261-add-toast-messages-to-disabled-save-buttons' into 'master' 
added toast button to disabled save button

Closes #261

See merge request bloodyhealth/drip!131
 2018-12-19 07:32:40 +00:00
Julia Friesel 79ff978a82 Fix float imprecision 2018-12-17 19:35:36 +01:00
Julia Friesel b562878095 Merge branch 'fix-2-csv-files' into 'master' 
Fixes the 2 csv files being created on export, in Downloads

Closes #195

See merge request bloodyhealth/drip!134
 2018-12-17 14:08:06 +00:00
Julia Friesel 4a1f0ccbdd Merge branch '258-phase-on-home-screen-seems-to-always-be-2' into 'master' 
Fix cycle status edge case

Closes #258

See merge request bloodyhealth/drip!128
 2018-12-15 13:48:22 +00:00
Julia Friesel 17c1992511 Merge branch '257-nfp-line-not-long-enough' into 'master' 
Resolve "NFP line not long enough"

Closes #257

See merge request bloodyhealth/drip!127
 2018-12-15 13:47:51 +00:00
Julia Friesel ac56627dcd Merge branch '263-fix-vulnerabilities-in-deps-as-indicated-by-npm' into 'master' 
Resolve "Fix vulnerabilities in deps as indicated by npm"

Closes #263

See merge request bloodyhealth/drip!137
 2018-12-12 18:53:01 +00:00
Julia Friesel f0e9a0c0a3 Merge branch 'settings-editing-password-confirmation' into 'master' 
Settings editing password confirmation

Closes #256

See merge request bloodyhealth/drip!125
 2018-12-12 18:52:14 +00:00
Julia Friesel 5fc9081847 Fix remaining vulnerabilities 2018-12-12 19:17:35 +01:00