lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,023 Commits 31 Branches 14 Tags
e7b5987837574f8e703480cdbcc76e0cc6572199
Commit Graph

1023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Friesel e7b5987837 Merge branch 'fix-chart-time-change-bug' into 'master' 
Use LocalDate to get date range

See merge request bloodyhealth/drip!197
 2019-04-03 14:56:13 +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
Julia Friesel 7e3eae1758 Use LocalDate for getting chart date range 2019-04-02 19:34:36 +02:00
Julia Friesel 60d1b3d157 Use noon instead of midnight to get date range 2019-04-02 19:03:43 +02: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
emelko 95afd305a9 Handing over cycleday to homescreen so that BleedingEditView gets this info; co-authored @liv-theo 2019-03-12 22:50:24 +01:00
tina 3621bfb351 Merge branch '322-make-app-segment-title-styling-more-consistent' into 'master' 
Resolve "make app segment styling more consistent"

Closes #322

See merge request bloodyhealth/drip!193
 2019-03-12 19:01:35 +00:00
tina f567510b7b Resolve "make app segment styling more consistent" 2019-03-12 19:01:35 +00:00
tina feaa7dab56 Merge branch '326-start-the-week-on-monday-in-calendar' into 'master' 
changes the first day of week to monday, calendar now also uses app text styling

Closes #326

See merge request bloodyhealth/drip!194
 2019-03-10 21:09:11 +00:00
tina 3f723aa823 changes the first day of week to monday, calendar now also uses app text styling 2019-03-10 01:15:16 +01: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
emelko 70d28f7a4b Adds 2 conditions for disabling delete button 2019-03-06 16:58:55 +01: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
tina ccce046a55 Merge branch 'ios_bug_symptom_not_shown' into 'master' 
Ios bug symptom not shown

See merge request bloodyhealth/drip!187
 2019-02-25 16:58:54 +00:00
emelko 112d52fa90 Corrects wiki link 2019-02-25 16:02:00 +01:00
tina 0a8dcf87a4 fixes bugs on ios where entered symptoms were not displayed 2019-02-18 20:33:05 +01:00
Joshua May 6592d742af [ios] Added iOS startup script to package.json 2019-02-18 18:51:41 +01:00
Joshua May 3c8f6888fc [ios] Linked libART, charts works! 2019-02-18 18:45:16 +01:00
Joshua May 14001664b2 [wip] iOS build 2019-02-18 17:15:50 +01:00
emelko c44faaba0f Text corrections in info boxes 2019-02-18 12:18:16 +01:00
Kevin Sullivan 246a6b3bb7 Align date label with dates 2019-02-16 21:17:52 -08:00
bl00dymarie fc4aec809d Merge branch 'proofreading' into 'master' 
Proofreading

See merge request bloodyhealth/drip!182
v0.0.1 		2019-02-15 10:21:17 +00:00
emelko 7562dfb79e small change in thank yous 2019-02-15 11:13:42 +01:00
emelko 68ddd4674a Further feedback on proofreading 2019-02-13 16:45:27 +01:00
emelko bca86f3996 Renames unset to delete 2019-02-13 16:37:33 +01:00
Kevin Sullivan 76b9c1943d Proofreading 2019-02-13 16:34:42 +01:00
tina 392d2a8f70 Merge branch 'change_app_icon_gatsby' into 'master' 
change app icon gatsby - version 2

See merge request bloodyhealth/drip!179
 2019-02-12 17:44:40 +00:00
Julia Friesel 7499b443d7 Merge branch 'use-external-sympto' into 'master' 
Use external sympto module

See merge request bloodyhealth/drip!173
 2019-02-08 07:44:45 +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
emelko 9b1d47be0d Implements MR review: 
* adds flexWrap to text
* rearranges text passages in stats

Co-Authored-By: tina <1700791-liv-theo@users.noreply.gitlab.com>
 2019-02-07 19:45:57 +01:00
tina 2fd7232420 logo with gatsby 2019-02-07 15:59:06 +01:00
tina fcc2868539 makes font and line width thicker in logo 2019-02-07 15:37:28 +01:00
Julia Friesel e42aa9bb8e Merge branch '294-white-space-on-home-screen' into 'master' 
Resolve "white space on home screen"

Closes #294

See merge request bloodyhealth/drip!175
 2019-02-05 08:45:19 +00:00
emelko 646543c928 Make stats look a bit more consistent with framed segment 
Co-Authored-By: tina <1700791-liv-theo@users.noreply.gitlab.com>
 2019-02-05 01:20:35 +01:00
emelko ca905c6bc6 Denastify nesting to make styles.emphasis work 
Co-Authored-By: tina <1700791-liv-theo@users.noreply.gitlab.com>
 2019-02-04 23:00:37 +01:00
emelko 7f170d06ef Make sure stats output some result after one completed cycle 2019-02-04 22:15:34 +01: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
Julia Friesel 57309b2e39 Merge branch 'link-nfp-rules' into 'master' 
Link nfp rules

See merge request bloodyhealth/drip!169
 2019-02-04 20:20:58 +00:00
Julia Friesel a7bf4c814f Merge branch 'master' into link-nfp-rules 2019-02-04 21:04:38 +01:00
emelko d0dcbd543d Adds back button to settings header 2019-02-04 21:04:17 +01:00
emelko 1a49b79eec Rename info symptom header into back button 2019-02-04 20:34:57 +01:00
Julia Friesel 433f7aa7f4 Merge branch '297-bug-overspilling-text-in-pain-mood-note' into 'master' 
Use built-in numberOfLines prop instead of truncating by hand

Closes #297

See merge request bloodyhealth/drip!174
 2019-02-04 19:07:16 +00:00
Julia Friesel 14b964443e Make home screen spacing more consistent 2019-02-02 21:51:00 +01:00
Julia Friesel d2282f6667 Use built-in numberOfLines prop instead of truncating by hand 2019-02-02 21:25:29 +01:00
Julia Friesel efca6f0d47 dirty-chai 2019-02-02 18:39:50 +01:00
tina bdda36de83 Merge branch '299-subcategories-in-setting-in-lowercase' into 'master' 
changes titles of subcategory in setting to lowercase

Closes #299

See merge request bloodyhealth/drip!170
 2019-02-02 15:32: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