lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
446 Commits 31 Branches 14 Tags
5acb6639bae4d4dca638561ba6f013fed0a68d46
Commit Graph

446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
emelko 5acb6639ba Deletes old console.logs 2018-08-31 21:28:31 +02:00
bl00dymarie c07dc51e5e Merge branch '117-implement-pain' into 'master' 
Resolve "Implement pain"

Closes #117

See merge request bloodyhealth/drip!57
 2018-08-31 19:11:55 +00:00
emelko ea83d6eb6b Merge branch 'master' into 117-implement-pain 2018-08-31 20:59:23 +02:00
emelko a664b6dfa8 Fixing pain and sex label for entering "other" and "note", displayed as: 
- Other 
or if note is true
- Other (This is a note.)
 2018-08-31 20:55:51 +02:00
emelko 1c95ff3488 Adding autofocus to note when there is nothing entered yet 2018-08-31 19:49:15 +02:00
tina edf9b04b45 Merge branch '158-change-default-app-color' into 'master' 
Resolve "research default app color, can we change it away from turqiouse ?"

Closes #158

See merge request bloodyhealth/drip!69
 2018-08-31 17:07:07 +00:00
tina 0a51bfc40b makes the default colors easily exchangable 2018-08-31 17:43:13 +02:00
tina f19a51d4ba Merge branch '155-add-temperature-note' into 'master' 
Resolve "add temperature note"

Closes #155

See merge request bloodyhealth/drip!66
 2018-08-31 15:15:38 +00:00
tina ed5d7e544b changes text input parameters for temperature note 2018-08-31 17:05:55 +02:00
tina 6b547abee2 Merge branch '143-don-t-allow-future-entries-except-note' into 'master' 
Resolve "don't allow future entries except note"

Closes #137 and #143

See merge request bloodyhealth/drip!65
 2018-08-31 14:37:26 +00:00
tina b119f1da93 removes package-lock from pr 2018-08-31 16:25:16 +02:00
Julia Friesel 1ba41c934f Use style arrays 2018-08-31 14:51:41 +02:00
tina 3bd5770c33 adds note to temperature 2018-08-31 14:01:48 +02:00
tina a3c02d30a0 disables entries for future datas except note, puts note at the end of the symptom list 2018-08-31 13:00:39 +02:00
emelko 895057e2f6 Takes back updated package-lock.json 2018-08-31 12:02:58 +02:00
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 ab4149373f If sex.other and/or pain.other gets a note, label will only display the note itself 2018-08-30 23:45:40 +02:00
emelko 9f62ab34f3 Deletes bundle file 2018-08-30 21:43:05 +02:00
emelko b5e58c176a Merge branch 'master' into 117-implement-pain 2018-08-30 21:40:37 +02:00
emelko 5cdf73cea6 Gets rid of line break in note "Enter" instead of "En-ter" 2018-08-30 21:39:53 +02:00
emelko 7c1cd18b1c SexLabel on cycle day overview now shows all the selected values 2018-08-30 21:39:21 +02:00
emelko 4dd1ae3f29 Adds migraine as pain item to the db 2018-08-30 21:38:37 +02:00
Julia Friesel 455d4ad8e8 Merge branch '36-suggestion-for-logo-for-drip' into 'master' 
Resolve "suggestion for logo for "drip""

Closes #36

See merge request bloodyhealth/drip!64
 2018-08-30 13:52:25 +00: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
Julia Friesel a8d1edcadc Add logos for launcher and notification 2018-08-30 10:33:49 +02:00
Julia Friesel f0f2ccc685 Merge branch '140-daily-temp-reminder' into 'master' 
Resolve "daily temp reminder"

Closes #140

See merge request bloodyhealth/drip!63
 2018-08-30 07:05:37 +00:00
tina 8a9e23055d Update cycle.spec.js 2018-08-29 16:50:28 +00: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 c5178ea441 If time has already passed, start notification tomorrow 2018-08-28 09:19:22 +02:00
Julia Friesel eb41ae354f Use rn-push-notifications and set up recurring notification 2018-08-28 09:19:22 +02:00
Julia Friesel e64b46c41b Revert "Install dep" 
This reverts commit 138ce17ade64dcfec10fecab9b1b41e298c35fb2.
 2018-08-28 09:17:10 +02:00
Julia Friesel b90fda113d First attempt at notifying at given time 2018-08-28 09:17:10 +02:00
Julia Friesel 3a91b5ffa4 Shorten line lengths 2018-08-28 09:17:10 +02:00
Julia Friesel 660f19a790 Add more to temp reminder component 2018-08-28 09:17:10 +02:00
Julia Friesel a6d082dffc Handle cancel 2018-08-28 09:17:10 +02:00
Julia Friesel f564eab7d0 Save temp reminder settings 2018-08-28 09:17:10 +02:00
Julia Friesel de858fe8c2 Style temp reminder setting 2018-08-28 09:17:10 +02:00
Julia Friesel a5b7e1064e Pad time value with 0s 2018-08-28 09:17:10 +02:00
Julia Friesel 6c6d8ae038 Add reminder setting 2018-08-28 09:17:10 +02:00
Julia Friesel b0019d85e0 Install dep 2018-08-28 09:17:10 +02:00
Julia Friesel 398c726d94 Replace binds with lambdas 2018-08-28 08:40:09 +02:00
Bl00dyMarie d711b411c7 Adds value of note to pain label on cycle day overview 2018-08-27 18:06:21 +02:00
Bl00dyMarie ad9997f73b Putting all the labels of selected pain keys in the cycle day overview 2018-08-27 18:06:21 +02:00
Bl00dyMarie e68b8f5460 Adding "other" as pain option and link text input to it 2018-08-27 18:05:53 +02:00
Bl00dyMarie 30752a05c2 Adding pain with 7 boolean values to track 2018-08-27 18:05:53 +02:00
Julia Friesel b09137772c Merge branch '133-make-temp-scale-a-config-setting-and-read-it-in-chart-and-temp-screen' into 'master' 
Resolve "make temp scale a config setting and read it in chart and temp screen"

Closes #133

See merge request bloodyhealth/drip!59
 2018-08-27 15:49:04 +00:00
Julia Friesel 877568c2e7 Update README.md 2018-08-27 05:47:24 +00:00
Julia Friesel 530c1096ed Fix bottom scale margin 2018-08-26 19:56:26 +02:00