Commit Graph

637 Commits

Author SHA1 Message Date
tina ce3d70cfa4 Merge branch '211-add-icons-to-chart' into 'master'
adds icons to chart

Closes #211

See merge request bloodyhealth/drip!94
2018-09-28 18:08:16 +00:00
tina 89e2f6198c Merge branch '177-change-action-button-footer-to-only-save-button' into 'master'
reduces footer actions

Closes #177

See merge request bloodyhealth/drip!83
2018-09-28 18:07:23 +00:00
tina 0b811f6a15 fixes more line length 2018-09-28 20:04:58 +02:00
tina 1841747566 fixes line length warnings 2018-09-28 19:57:21 +02:00
Julia Friesel 91b1f52273 Change arrow and info icons 2018-09-28 19:42:23 +02:00
tina d87727b449 merges master into branch 2018-09-28 17:07:27 +02:00
tina eed70545c6 adds icons to chart 2018-09-28 16:35:20 +02:00
tina fb5a51621f Merge branch '215-period-reminder-bug' into 'master'
wrongly triggered period reminders (bug)

Closes #215

See merge request bloodyhealth/drip!92
2018-09-28 13:35:18 +00:00
Julia Friesel 68f3faaf7c Merge branch '209-change-basic-colors-and-font-to-new-design' into 'master'
Resolve "change basic colors and font to new design"

Closes #209

See merge request bloodyhealth/drip!89
2018-09-28 12:03:36 +00:00
tina 107688ac36 checks whether reminder date is already passed 2018-09-28 13:45:55 +02:00
Julia Friesel feb6c18abf Add circle to day view 2018-09-28 13:40:06 +02:00
Julia Friesel 7f680296d3 Merge branch 'add-migration' into 'master'
Run migrations if necessary

See merge request bloodyhealth/drip!90
2018-09-28 11:08:16 +00:00
tina b09cd01cd5 improve header for symptom screens 2018-09-28 13:05:47 +02:00
Julia Friesel a778d142c8 Add menu text style to action button footer 2018-09-27 19:05:19 +02:00
Julia Friesel 1df86b9abd Decrease mneu height 2018-09-27 18:38:45 +02:00
Julia Friesel a4deb36042 Make header and menu labels lowercase 2018-09-27 18:31:27 +02:00
Julia Friesel 04512e5bae Fix more styles 2018-09-27 18:19:52 +02:00
Julia Friesel 08603e4837 Add accent circle 2018-09-27 18:12:15 +02:00
Julia Friesel e2f34a5eea Change secondary color 2018-09-27 18:08:23 +02:00
Julia Friesel bce8de0406 Add font and change primary color 2018-09-27 17:46:08 +02:00
Julia Friesel 8e31215860 Run migrations if necessary 2018-09-27 17:05:36 +02:00
tina 1b11b24a4c enables back button on symptom view 2018-09-26 19:31:30 +02:00
Julia Friesel 9029be081f Merge branch 'svg-icons' into 'master'
Add new svg icons

See merge request bloodyhealth/drip!88
2018-09-26 17:16:09 +00:00
tina c06bfa2c91 solves the action footer, but messes up the header 2018-09-26 18:16:29 +02:00
Julia Friesel 34e0866f3a Adjust view boxes to center icons 2018-09-26 15:00:15 +02:00
Julia Friesel e8c38efbc5 Simplify active state 2018-09-26 14:51:10 +02:00
emelko a95f9c05cc Rendering icons on cycle day overview 2018-09-26 14:29:27 +02:00
emelko a56e6e999c Adding all the symptom icons, made with <3 by Paula 2018-09-26 14:29:06 +02:00
bl00dymarie d93e91f366 Merge branch '172-add-unprotected-to-contraceptives' into 'master'
Add 'unprotected' and 'diaphragm" to contraceptives

Closes #172

See merge request bloodyhealth/drip!81
2018-09-26 10:32:10 +00:00
tina e9af1acca7 Merge branch '139-next-period-reminder' into 'master'
Resolve "next period reminder"

Closes #139

See merge request bloodyhealth/drip!87
2018-09-26 10:31:49 +00:00
emelko fc514a793d Rename contraception option 'unprotected' in 'none' 2018-09-26 12:25:44 +02:00
tina 09a71a391e links the period reminder to bleeding days, meaning it gets updated when they change 2018-09-26 12:15:09 +02:00
tina 57989aac8a Merge branch '207-expand-y-axis' into 'master'
expands y-axis, adds some color and formating

Closes #207

See merge request bloodyhealth/drip!85
2018-09-26 09:13:58 +00:00
tina cdef99d616 little improvements after review 2018-09-26 11:02:40 +02:00
Julia Friesel aa925a0c56 Pass active state to icon 2018-09-26 10:59:45 +02:00
tina 7101619318 makes period reminder functional 2018-09-25 16:55:13 +02:00
Julia Friesel 662858bd04 Add svg in react native format and add it to symtom box 2018-09-25 16:31:54 +02:00
tina 80bec57f69 tries to enable notifications for next period 2018-09-25 15:28:04 +02:00
tina ce5a8ce5a1 set up period reminder in settings 2018-09-25 13:00:55 +02:00
tina 545c334654 formats dates 2018-09-23 19:54:55 +02:00
bl00dymarie d30afd5514 Merge branch '206-disable-pain-in-future-bug' into 'master'
Disables pain in future, bc this would make our user a prophet :)

Closes #206

See merge request bloodyhealth/drip!84
2018-09-23 17:05:41 +00:00
tina 501454919b adds colors for symptoms 2018-09-23 18:31:28 +02:00
tina 2977a552dc extends y-axis with placeholders for symptom symbols and date labels 2018-09-23 14:59:40 +02:00
tina e5052bf088 changes footer depending on new entry or edit mode 2018-09-23 12:06:23 +02:00
emelko a13b03c7f8 Disables pain in future, bc this would make our user a prophet :) 2018-09-21 19:50:02 +02:00
bl00dymarie 3bb42db6e9 Merge branch '170-adding-tests-to-cervix-temp-cases' into 'master'
Resolve "Adding tests to cervix-temp cases"

Closes #170

See merge request bloodyhealth/drip!78
2018-09-21 17:22:02 +00:00
tina 8357d61170 reduces footer actions to save, leaving no possibility to delete data once it was saved 2018-09-21 18:20:02 +02:00
tina bd8cb48f45 Merge branch '173-in-selector-elements-allow-unselect' into 'master'
allows unselect in bleeding, mucus, cervix and desire

Closes #173

See merge request bloodyhealth/drip!82
2018-09-21 14:02:19 +00:00
tina 484cbcaa21 adds two path to gitignore 2018-09-21 15:30:00 +02:00
tina 33efc654d7 enables un-select in the component itself 2018-09-21 15:23:13 +02:00