 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 |
|
|
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 |
|
|
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 |
|
|
bl00dymarie
|
856de554d2
|
Merge branch '83-implement-nfp-logic-for-cervix-mode' into 'master'
Resolve "implement nfp logic for cervix mode"
Closes #83
See merge request bloodyhealth/drip!38
|
2018-09-14 06:27:12 +00:00 |
|
|
bl00dymarie
|
5296a9c6ee
|
Merge branch 'Delete-console.logs' into 'master'
Deletes old console.logs
See merge request bloodyhealth/drip!70
|
2018-09-02 19:57:11 +00: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 |
|
|
bl00dymarie
|
18c5fef51b
|
Merge branch 'implement-sex-with-fancy-checkbox' into 'master'
Implement Sex \o/:
Closes #69
See merge request bloodyhealth/drip!50
|
2018-08-16 12:20:11 +00: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
bl00dymarie
|
5725739d4e
|
Merge branch '67-implement-mucus' into 'master'
Resolve "implement mucus"
Closes #67
See merge request bloodyhealth/drip!22
|
2018-07-16 10:43:31 +00:00 |
|
|
bl00dymarie
|
bb2b86d270
|
Merge branch '29-edit-bleeding-screen' into 'master'
Resolve "edit bleeding screen"
See merge request bloodyhealth/drip!6
|
2018-06-06 10:05:09 +00:00 |
|