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

1000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Friesel 4a1f0ccbdd Merge branch '258-phase-on-home-screen-seems-to-always-be-2' into 'master' 
Fix cycle status edge case

Closes #258

See merge request bloodyhealth/drip!128
 2018-12-15 13:48:22 +00:00
Julia Friesel 17c1992511 Merge branch '257-nfp-line-not-long-enough' into 'master' 
Resolve "NFP line not long enough"

Closes #257

See merge request bloodyhealth/drip!127
 2018-12-15 13:47:51 +00:00
tina 9ef8f04747 Merge branch '131-use-max-cycle-length' into 'master' 
use max cycle length

Closes #131

See merge request bloodyhealth/drip!136
 2018-12-13 18:28:39 +00:00
Julia Friesel ac56627dcd Merge branch '263-fix-vulnerabilities-in-deps-as-indicated-by-npm' into 'master' 
Resolve "Fix vulnerabilities in deps as indicated by npm"

Closes #263

See merge request bloodyhealth/drip!137
 2018-12-12 18:53:01 +00:00
Julia Friesel f0e9a0c0a3 Merge branch 'settings-editing-password-confirmation' into 'master' 
Settings editing password confirmation

Closes #256

See merge request bloodyhealth/drip!125
 2018-12-12 18:52:14 +00:00
Julia Friesel 5fc9081847 Fix remaining vulnerabilities 2018-12-12 19:17:35 +01:00
Julia Friesel f05394acf3 Update realm 2018-12-12 19:13:34 +01:00
tina ce60588ab2 only returns cycledaynumber when it is not greater than 99 2018-12-12 16:11:23 +01:00
Julia Friesel 11088d4653 Merge branch 'toggle-develop' into 'master' 
Adds npm script for toggling the develop panel instead of shaking the device

See merge request bloodyhealth/drip!135
 2018-12-12 07:20:12 +00:00
Sofiya Tepikin 041885da71 Adds npm script for toggling the develop panel instead of shaking the device 2018-12-11 23:23:31 +01: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
Julia Friesel 9e2fc524a4 Remove unnecessary config files 2018-12-10 18:47:28 +01:00
emelko 2647512ecc Fix for problem with build gradle 2.3.* repository 2018-12-10 18:01:31 +01:00
Julia Friesel accebcac9a Merge branch 'fix-empty-data-export' into 'master' 
Fix export of empty database

Closes #260

See merge request bloodyhealth/drip!129
 2018-12-10 07:21:39 +00:00
mashazyu 420befec36 Fixes all export error messages 2018-12-09 22:30:33 +01:00
Julia Friesel a882d68439 Update README.md 2018-12-09 19:04:49 +00:00
Julia Friesel d3c605b8cf Fix peri phase edge case 2018-12-09 19:42:21 +01:00
Lisa Hillebrand d8b53da134 Added about section to settings 2018-12-09 18:38:46 +01:00
Maike Orlikowski f222893484 added toast button to disabled save button 2018-12-09 17:47:20 +01:00
Anne Menzel 1ed771a50c add date to symptom screen header 2018-12-09 17:11:28 +01:00
susott 26abfa578f try to fix merge conflicts 2018-12-09 16:40:48 +01:00
susott 76ff1745b5 try to solve merge conflicts 2018-12-09 16:28:42 +01:00
bl00dymarie 2bcb1ee08b Update README.md 2018-12-09 15:26:52 +00:00
mashazyu 5cb4d9f861 Fix export of empty database 2018-12-09 16:26:37 +01:00
susott 5444278795 improve on review issues 2018-12-09 16:03:25 +01:00
Julia Friesel 7d10fbffec Update README.md 2018-12-09 14:08:35 +00:00
Julia Friesel f0449ca19d Merge branch '112-connect-cervix-mode-to-app' into 'master' 
Resolve "Connect cervix mode to app"

Closes #112

See merge request bloodyhealth/drip!126
 2018-12-09 13:00:51 +00:00
mashazyu d3f9652b9d Creates reusable password confirmation component 2018-12-09 12:41:40 +01:00
Julia Friesel f9ca0c62d8 Improve switch label wording 2018-12-08 17:27:12 +01:00
Julia Friesel 2213872606 Fix non-existent temperature argument 2018-12-08 10:44:26 +01:00
Julia Friesel 709bae2319 Use nfp mode setting in sympto adapter 2018-12-08 09:44:16 +01:00
Julia Friesel b23bd19270 Add cervix setting 2018-12-08 09:44:16 +01:00
mashazyu 857b8fc1f1 Cleanup ChangePassword component 2018-12-07 23:56:33 +01:00
bl00dymarie 08e05ec984 adds windows problems; 
adds link to emulator
 2018-12-07 12:33:10 +00:00
Julia Friesel 03e149062d Merge branch 'use-icon-font-for-home-icons' into 'master' 
Use icon font for home icons

See merge request bloodyhealth/drip!115
 2018-12-06 08:31:20 +00:00
Sofiya Tepikin 7ddf9a7002 Reuses SettingsButton component 2018-12-05 22:42:00 +01:00
Sofiya Tepikin acc7ce13f8 Adds prop types to the project & and uses them in SettingsButton component 2018-12-05 22:42:00 +01:00
Sofiya Tepikin e16fc39298 Extracting SettingsButton component 2018-12-05 22:42:00 +01:00
tina 426a3bda30 Merge branch 'settings-password-confirmation' into 'master' 
Adds password confirmation on setting a new password on Settings screen

Closes #194

See merge request bloodyhealth/drip!124
 2018-12-05 11:03:49 +00:00
Sofiya Tepikin 2a7ffa4666 Adds password confirmation on setting a new password on Settings screen 2018-12-04 22:52:49 +01:00
Julia Friesel 7444aedef4 Merge branch 'lowercase-labels' into 'master' 
Transforms labels to lowercase

Closes #212

See merge request bloodyhealth/drip!123
 2018-12-04 14:27:57 +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
mashazyu 55acd26a39 Transforms labels to lowercase 2018-12-03 19:19:05 +01:00
Julia Friesel 9843fb0157 Update README.md 2018-12-03 17:37:55 +00:00
Julia Friesel 28a809fb5c Merge branch 'today-overview-header' into 'master' 
Changes header of today's cycle day overview page

Closes #216

See merge request bloodyhealth/drip!122
 2018-12-03 17:03:21 +00:00
Julia Friesel da1a8af648 Merge branch 'fix-fertility-icon-space' into 'master' 
Fix fertility icon space

Closes #237

See merge request bloodyhealth/drip!121
 2018-12-03 17:01:00 +00:00
mashazyu 96d2459777 Changes header of today's cycle day overview page 2018-12-02 19:23:02 +01:00
susott 7d802184f0 added old fonts back 2018-12-02 19:08:14 +01:00
mashazyu 1b5c637d4e Fixes fertility icon space 2018-12-02 13:52:17 +01:00