lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,137 Commits 31 Branches 14 Tags
ac2bad1de0fe4309698a6508d931a114c06f2967
Commit Graph
71 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bl00dymarie ac2bad1de0 Merge branch '376-consider-rename-mucus-into-cervical-mucus' into 'master' 
Specifying mucus as cervical mucus

Closes #376

See merge request bloodyhealth/drip!222
 2019-05-25 21:38:47 +00:00
bl00dymarie e2abc4dbeb Merge branch 'marie-move-info-button-out-of-header-to-body' into 'master' 
Move info button out of header to body

See merge request bloodyhealth/drip!217
 2019-05-25 09:35:31 +00:00
bl00dymarie ed38a5b450 Merge branch '362-rearrange-home-screen-elements' into 'master' 
Resolve "Rearrange home screen elements"

Closes #362

See merge request bloodyhealth/drip!220
 2019-05-24 10:28:33 +00:00
bl00dymarie f123dbf730 Merge branch '342-bleeding-prediction-on-homescreen' into 'master' 
Resolve "Bleeding prediction on homescreen"

Closes #342

See merge request bloodyhealth/drip!202
 2019-05-10 11:15:57 +00:00
bl00dymarie 7c5d0b9ae2 Merge branch '344-lowercase-for-symptom-values' into 'master' 
Lowercase values for sex, pain and mood

Closes #344

See merge request bloodyhealth/drip!204
 2019-04-25 10:14:11 +00:00
bl00dymarie ded3a79bbc Merge branch 'temperature-screen-improvement' into 'master' 
temperature screen styling update

See merge request bloodyhealth/drip!196
 2019-04-23 17:19:49 +00:00
bl00dymarie ab0970e33f Merge branch 'Remove-excessive-permissions' into 'master' 
Removes permissions not required for debug or production

See merge request bloodyhealth/drip!201
 2019-04-23 17:09:27 +00:00
bl00dymarie 49d5d77a82 Merge branch 'new-tag' into 'master' 
0.0.3

See merge request bloodyhealth/drip!200
 2019-04-23 06:55:52 +00:00
bl00dymarie 25ff6ca01f Update CHANGELOG.md 2019-04-17 14:33:02 +00:00
bl00dymarie dd648da56f Merge branch 'delete-password-button-fix' into 'master' 
Delete password button fix

Closes #327

See merge request bloodyhealth/drip!199
 2019-04-17 07:07:19 +00:00
bl00dymarie d1e87835d1 Update CHANGELOG.md 2019-04-16 18:46:44 +00:00
bl00dymarie c715b16e44 Update CHANGELOG.md 2019-04-16 18:36:03 +00:00
bl00dymarie fa59f35719 Update CHANGELOG 2019-04-03 09:02:19 +00:00
bl00dymarie 3d245127c7 Add CHANGELOG 2019-04-03 08:52:29 +00:00
bl00dymarie 3940e3b4dd Merge branch '271-chart-view-date-should-be-on-same-line-as-actual-dates' into 'master' 
Resolve "Chart view: "date" should be on same line as actual dates"

Closes #271

See merge request bloodyhealth/drip!184
 2019-03-20 19:56:07 +00:00
bl00dymarie 75a3837417 Merge branch '285-bug-coming-from-track-your-period-cycle-day-doesn-t-show-data' into 'master' 
Handing over cycleday to homescreen so that BleedingEditView gets this info; co-authored @liv-theo

Closes #285

See merge request bloodyhealth/drip!195
 2019-03-14 21:40:06 +00:00
bl00dymarie 512250eff4 Merge branch '303-hide-unset-button-when-nothing-is-selected' into 'master' 
Adds condition for disabled delete button

Closes #303

See merge request bloodyhealth/drip!183
 2019-03-09 17:48:23 +00:00
bl00dymarie d431c2b947 Merge branch '313-user-feedback-broken-wiki-link' into 'master' 
Corrects wiki link

Closes #313

See merge request bloodyhealth/drip!189
 2019-03-02 11:00:43 +00:00
bl00dymarie c140cdd602 Merge branch 'Text-corrections-in-beta-release' into 'master' 
Text corrections in info boxes

See merge request bloodyhealth/drip!186
 2019-02-25 17:39:48 +00:00
bl00dymarie fc4aec809d Merge branch 'proofreading' into 'master' 
Proofreading

See merge request bloodyhealth/drip!182
 2019-02-15 10:21:17 +00:00
bl00dymarie 548b2826da Merge branch '302-bug-stats-crash' into 'master' 
Resolve "bug: stats crash"

Closes #302

See merge request bloodyhealth/drip!177
 2019-02-07 19:40:03 +00:00
bl00dymarie 4605f5b81c Merge branch '298-add-back-button-to-settings-children' into 'master' 
Adds back button to settings header

Closes #298

See merge request bloodyhealth/drip!171
 2019-02-04 20:23:01 +00:00
bl00dymarie cc75c99087 Merge branch '291-review-edit-fill-in-info-text-on-symptoms' into 'master' 
Resolve "Review/edit/fill in info text on symptoms"

Closes #291

See merge request bloodyhealth/drip!167
 2019-02-02 12:13:12 +00:00
bl00dymarie ff27464fc8 Merge branch 'Give-settings-segment-some-bottom-space' into 'master' 
Give the last segment bottom space

See merge request bloodyhealth/drip!172
 2019-02-02 11:38:00 +00:00
bl00dymarie 46aa596c7a Update README.md 2019-02-01 13:10:33 +00:00
bl00dymarie b841ca9a1f Update README.md 2019-02-01 13:06:40 +00:00
bl00dymarie 08abef8269 Update README.md 2019-02-01 13:04:01 +00:00
bl00dymarie ec9dfa65f6 Update README.md 2019-02-01 13:03:15 +00:00
bl00dymarie a676f47027 Update README.md 2019-02-01 13:02:30 +00:00
bl00dymarie 3a482db602 Update CONTRIBUTING.md 2019-02-01 13:00:20 +00:00
bl00dymarie 8a3d6b986f Update README.md 2019-02-01 12:59:43 +00:00
bl00dymarie 2e400c2dde Merge branch 'mood-category' into 'master' 
Add mood component, add mood as tracking category to db schemas, add mood...

See merge request bloodyhealth/drip!156
 2019-01-30 11:18:10 +00:00
bl00dymarie 71d0c61596 Merge branch 'Make-comment-on-cervix-and-mucus-bold' into 'master' 
Makes actionHint text more visible with bold font

See merge request bloodyhealth/drip!168
 2019-01-29 09:19:06 +00:00
bl00dymarie ad4f5c9dca Merge branch 'Try-mood-icon' into 'master' 
Adds mood icon to the app

See merge request bloodyhealth/drip!166
 2019-01-28 08:24:34 +00:00
bl00dymarie 60f444f094 Update README.md 2019-01-21 09:34:15 +00:00
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