 bl00dymarie
|
53f662279d
|
Merge branch '185-add-info-for-symptoms' into 'master'
Resolve "add info for symptoms"
Closes #185
See merge request bloodyhealth/drip!97
|
2019-01-17 14:38:08 +00:00 |
|
|
bl00dymarie
|
58f8f4e25d
|
Merge branch '283-bug-header-in-cycle-day-overview-is-not-aligned' into 'master'
Fix header alignement in CycleDayOverView and SymptomView
Closes #283
See merge request bloodyhealth/drip!155
|
2019-01-16 08:31:32 +00:00 |
|
|
bl00dymarie
|
d6811a65cd
|
Merge branch 'Fix-for-build.gradle' into 'master'
Fix for problem with build gradle 2.3.* repository
See merge request bloodyhealth/drip!133
|
2018-12-10 18:16:05 +00:00 |
|
|
bl00dymarie
|
2bcb1ee08b
|
Update README.md
|
2018-12-09 15:26:52 +00:00 |
|
|
bl00dymarie
|
08e05ec984
|
adds windows problems;
adds link to emulator
|
2018-12-07 12:33:10 +00:00 |
|
|
bl00dymarie
|
d39d59c3a3
|
Update CONTRIBUTING.md
|
2018-12-04 10:50:02 +00:00 |
|
|
bl00dymarie
|
735b89ef9b
|
Update CONTRIBUTING.md
|
2018-12-04 10:46:33 +00:00 |
|
|
bl00dymarie
|
16702284fd
|
Merge branch 'edit-readme' into 'master'
Edit readme
See merge request bloodyhealth/drip!116
|
2018-12-01 13:37:06 +00:00 |
|
|
bl00dymarie
|
2e3c9e98a0
|
Update README.md
|
2018-12-01 11:20:49 +00:00 |
|
|
bl00dymarie
|
264602df6f
|
Merge branch 'Removes-copy/en' into 'master'
Removes copy/en folder
See merge request bloodyhealth/drip!114
|
2018-11-30 10:44:22 +00:00 |
|
|
bl00dymarie
|
ea75d4785f
|
Update CONTRIBUTING.md
|
2018-11-20 01:35:06 +00:00 |
|
|
bl00dymarie
|
a8de2cdf07
|
Update CONTRIBUTING.md
|
2018-11-20 01:34:02 +00:00 |
|
|
bl00dymarie
|
feb223a05c
|
Update CONTRIBUTING.md
|
2018-11-20 01:28:14 +00:00 |
|
|
bl00dymarie
|
d0b8630c7a
|
Update CONTRIBUTING.md
|
2018-11-20 01:26:13 +00:00 |
|
|
bl00dymarie
|
5010fb9d63
|
Update CONTRIBUTING.md
|
2018-11-20 01:25:57 +00:00 |
|
|
bl00dymarie
|
2daec541ef
|
Update CONTRIBUTING.md
|
2018-11-20 01:24:54 +00:00 |
|
|
bl00dymarie
|
e9b1869a09
|
Update CONTRIBUTING.md
|
2018-11-20 01:20:37 +00:00 |
|
|
bl00dymarie
|
a8677cbeb6
|
Update CONTRIBUTING.md
|
2018-11-20 01:18:49 +00:00 |
|
|
bl00dymarie
|
0c25cbbcbc
|
Update CONTRIBUTING.md
|
2018-11-20 01:12:21 +00:00 |
|
|
bl00dymarie
|
65db3adc23
|
Update CONTRIBUTING.md
|
2018-11-20 00:17:00 +00:00 |
|
|
bl00dymarie
|
db82d0c2e5
|
Add contribution guide
|
2018-11-20 00:12:56 +00: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 |
|
|
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 |
|