Commit Graph

24 Commits

Author SHA1 Message Date
emelko 38b454fb0b Merge branch 'master' into 117-implement-pain 2018-08-31 11:58:57 +02:00
tina 54a3db4096 Merge branch '98-function-to-get-predicted-bleeding-dates' into 'master'
Resolve "write function to get predicted bleeding dates (and use it in calendar)"

Closes #97 and #98

See merge request bloodyhealth/drip!60
2018-08-31 09:48:30 +00:00
emelko b5e58c176a Merge branch 'master' into 117-implement-pain 2018-08-30 21:40:37 +02:00
Bl00dyMarie c258ad9e01 Implements 2 improvements from MR comments:
- Moves title of symptom in the header
- Deletes additional comma out of cycle day overview
2018-08-30 11:47:15 +02:00
tina b411b67473 Merge branch 'master' into '98-function-to-get-predicted-bleeding-dates'
# Conflicts:
#   components/calendar.js
#   test/cycle.spec.js
2018-08-29 15:58:20 +00:00
tina 432c56c0c6 information about bleeding data is shown on home screen 2018-08-29 17:29:33 +02:00
Julia Friesel eb41ae354f Use rn-push-notifications and set up recurring notification 2018-08-28 09:19:22 +02:00
Julia Friesel de858fe8c2 Style temp reminder setting 2018-08-28 09:17:10 +02:00
Julia Friesel 6c6d8ae038 Add reminder setting 2018-08-28 09:17:10 +02:00
Julia Friesel 8a6f943e5f Separate warning out of absolute range 2018-08-26 19:34:52 +02:00
Julia Friesel c6d61320e7 Fix explainer text 2018-08-22 17:41:23 +02:00
Julia Friesel 7ef7bf7c10 Merge branch 'master' into 133-make-temp-scale-a-config-setting-and-read-it-in-chart-and-temp-screen 2018-08-22 17:33:23 +02:00
Julia Friesel 0878135aed Warn when user enters an out-of-range temperature 2018-08-22 13:51:12 +02:00
Julia Friesel 6876876d40 Merge branch 'master' into 134-implement-design-for-day-overview 2018-08-22 12:27:56 +02:00
tina 04476769f1 Merge branch 'master' into '129-extract-text-from-stats-and-layout'
# Conflicts:
#   components/labels.js
2018-08-22 10:07:47 +00:00
Julia Friesel 8ccbd399d8 Alert user about temp scale settings storage problem 2018-08-21 15:22:35 +02:00
Julia Friesel 75f5893b0c Use settings segments 2018-08-21 14:47:45 +02:00
Julia Friesel c6b490b2a4 Add slider and save value in LocalStorage 2018-08-21 14:26:54 +02:00
Julia Friesel e2b9d4b4a1 Fix symptom headers 2018-08-20 15:14:17 +02:00
Julia Friesel 4b227d82d4 Add import error postfix and extract more labels 2018-08-16 08:48:46 +02:00
Julia Friesel d3d72a396e Extract labels 2018-08-16 08:26:08 +02:00
Julia Friesel 88b0dba3b6 Clean up file structure 2018-08-16 08:26:08 +02:00
tina 392e09fb8d extracts stats strings and improves copy 2018-08-15 18:49:45 +02:00
Julia Friesel 355bcbe809 Extract labels 2018-08-06 13:37:35 +02:00