lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
292 Commits 31 Branches 14 Tags
2883aaa87992377e8a30fe6c84d60b64f336ebac
Commit Graph

292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Friesel 2883aaa879 Merge branch '114-add-import-button' into 'master' 
Resolve "Add Import button"

Closes #114

See merge request bloodyhealth/drip!48
 2018-08-16 12:28:02 +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
Julia Friesel 4b227d82d4 Add import error postfix and extract more labels 2018-08-16 08:48:46 +02:00
Julia Friesel b07a2c8a53 Move db operations back to db module 2018-08-16 08:26:08 +02:00
Julia Friesel 53328f608b Extract openImportDialog 2018-08-16 08:26:08 +02:00
Julia Friesel d3d72a396e Extract labels 2018-08-16 08:26:08 +02:00
Julia Friesel 77bda6bf53 Make import errors prettier and actually handle them 2018-08-16 08:26:08 +02:00
Julia Friesel 44cc448209 Show import success message 2018-08-16 08:26:08 +02:00
Julia Friesel 7d0a56d2e2 Don't show error when cancelling doc picker 2018-08-16 08:26:08 +02:00
Julia Friesel 88b0dba3b6 Clean up file structure 2018-08-16 08:26:08 +02:00
Julia Friesel 949fe91e9e Improve boolean parsing and ignore empty fields 2018-08-16 08:26:08 +02:00
Julia Friesel a948cf716b Handle merge import 2018-08-16 08:26:08 +02:00
Julia Friesel 456f4fe7d8 Parse values according to schema type and write to db 2018-08-16 08:26:08 +02:00
Julia Friesel bce9359850 Parse JSON from imported CSV 2018-08-16 08:23:48 +02:00
Julia Friesel ed474fd5cb Import file contents and move csv function to db module 2018-08-16 08:23:48 +02:00
Bl00dyMarie b3ace768a8 Text input is autofocussed only when someone just checked the "Other" checkbox :) 2018-08-15 09:41:05 +02:00
tina b998ef546f Merge branch '109-display-stats-about-period-length' into 'master' 
Resolve "add stats button on home screen and show stats about period length"

Closes #109

See merge request bloodyhealth/drip!41
 2018-08-14 12:36:57 +00:00
Bl00dyMarie a64bfbcd50 Implement Sex \o/: 
* Offers tracking sex activities and contraceptives as much as you want
* "Other" contraceptive allows to specify with text input
 2018-08-13 16:47:19 +02:00
tina f2b8723fb9 resolves some of the suggested improvements, renames the term period with cycle 2018-08-09 18:31:14 +02:00
Julia Friesel cca2cf171c Merge branch '79-calendar-vertically-scrollable-or-at-least-swipeable' into 'master' 
Resolve "calendar: vertically scrollable or at least swipeable"

Closes #79

See merge request bloodyhealth/drip!49
 2018-08-09 12:44:03 +00:00
Julia Friesel dcff1a0362 Make calendar vertically scrollable 2018-08-09 14:08:46 +02:00
tina c99aa7509d improves functions and stats are displayed in a nicer format 2018-08-09 14:02:17 +02:00
tina 6135c92268 possible to get all cycle lengths, which get evaluated in stats 2018-08-08 16:10:09 +02:00
tina 897e99e6af adds stats button on home screen, and creates stats screen, length still needs to be calculated 2018-08-08 16:10:09 +02:00
Julia Friesel f5b3716191 Merge branch '118-bug-export-is-missing-file-extension' into 'master' 
Resolve "bug: export is missing file extension"

Closes #118

See merge request bloodyhealth/drip!47
 2018-08-07 08:57:42 +00:00
Julia Friesel 1dd6649f27 Make file extension work and remove some unneeded stuff 2018-08-06 17:04:37 +02:00
Julia Friesel 7ea6a683ff Merge branch '113-add-button-to-export-to-settings-page' into 'master' 
Resolve "Add button to export to settings page"

Closes #113

See merge request bloodyhealth/drip!46
 2018-08-06 12:49:44 +00:00
Julia Friesel 355bcbe809 Extract labels 2018-08-06 13:37:35 +02:00
Julia Friesel 4b971a1f23 Merge branch '91-clean-up-line-length-warnings' into 'master' 
Resolve "clean up line length warnings"

Closes #91

See merge request bloodyhealth/drip!43
 2018-08-06 11:27:35 +00:00
Julia Friesel 364daee488 Fix import 2018-08-06 13:15:48 +02:00
Julia Friesel a2c428e991 Shorten line lengths in cycle 2018-08-06 13:10:59 +02:00
Julia Friesel 63154be24a Shorten line lengths in sympto 2018-08-06 13:10:59 +02:00
Julia Friesel 2f9b08fd8b Shorten line lengths in cycle 2018-08-06 13:10:59 +02:00
Julia Friesel e1fa656b8f Shorten line length in temperature 2018-08-06 13:10:59 +02:00
Julia Friesel da29c2751b Shorten line lengths in home 2018-08-06 13:10:59 +02:00
Julia Friesel c525812a0e Reduce line lengths 2018-08-06 13:10:59 +02:00
Julia Friesel 310683c5f8 Programmatically add props to cycle day views 2018-08-06 13:10:59 +02:00
Julia Friesel e51a99b8af Clean up line lengths in calendar 2018-08-06 13:10:59 +02:00
Julia Friesel 01d40a6d21 Merge branch 'upgrade-reaxct-native' into 'master' 
Upgrade to RN 56 and gradle 3

See merge request bloodyhealth/drip!45
 2018-08-06 11:01:21 +00:00
Julia Friesel ebb628c6b9 Move export logic to separate module 2018-08-06 09:51:12 +02:00
Julia Friesel 9e8005960e Handle special characters in strings 2018-08-06 09:27:28 +02:00
Julia Friesel f8007fac14 Use db schema to make column names 2018-08-04 09:57:20 +02:00
Julia Friesel 831e99351d Add toCSV function 2018-08-04 07:54:12 +02:00
Julia Friesel 03fe92750d Set up export button to export a simple file 2018-08-03 19:32:56 +02:00
Julia Friesel 315bdf3a02 Fix babel/register for mocha 2018-08-03 17:12:08 +02:00
Julia Friesel 79379276a7 Upgrade to RN 56 and gradle 3 2018-08-03 16:21:50 +02: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
emelko 8e56fc0b23 Adds new set of labels for chosing intensity of a tracking category 2018-08-03 13:28:10 +02:00
emelko e42d25a087 Revert "Renames cervixPosition labels into more universal positionOrIntensity" 
This reverts commit f7efadb08a.
 2018-08-03 13:22:34 +02:00
emelko 30839b5589 Adds desire as a tracking category to our app; 
no exclude, no fancy nothing else, only pure desire tracking.
 2018-08-02 17:19:21 +02:00