Commit Graph

1325 Commits

Author SHA1 Message Date
Sofiya Tepikin 70c13387a9 Merge branch 'update-realm' into 'master'
Update realm version

See merge request bloodyhealth/drip!299
2020-07-12 17:06:22 +00:00
Sofiya Tepikin ef9e7c535b Add clearing of metro cache 2020-07-11 21:23:43 +02:00
Sofiya Tepikin 1d449252c0 Update realm to support 64bit 2020-07-11 21:23:23 +02:00
Maria Zadnepryanets 71247e1c7d Merge branch 'updated-package-lock' into 'master'
Update package-lock.json

See merge request bloodyhealth/drip!298
2020-07-11 11:25:32 +00:00
Sofiya Tepikin 8469edc573 Update package-lock.json 2020-07-11 13:22:35 +02:00
bl00dymarie a7aae0673e Merge branch 'Changes-year-in-copyright-text' into 'master'
Uses built-in JS functionality for getting currentYear, thanks to @sdvig

See merge request bloodyhealth/drip!296
2020-06-19 09:02:58 +00:00
emelko 9d137dfd3a Uses built-in JS functionality for getting currentYear, thanks to @sdvig 2020-06-19 11:00:48 +02:00
bl00dymarie 930ed3fdc5 Merge branch 'Changes-year-in-copyright-text' into 'master'
Sets current year instead of hard coded

See merge request bloodyhealth/drip!295
2020-06-19 08:51:47 +00:00
emelko 240c61e46e Sets current year instead of hard coded 2020-06-06 01:00:31 +02:00
bl00dymarie 0e1b95d313 Update README.md 2020-06-05 22:40:57 +00:00
bl00dymarie 880dd8b843 Update README.md 2020-06-05 19:48:20 +00:00
bl00dymarie 54b30ec229 Update README.md 2020-06-05 19:45:34 +00:00
bl00dymarie dc1164ef03 Update README.md 2020-06-05 19:44:09 +00:00
bl00dymarie be4f50c962 Update README.md 2020-06-05 19:43:38 +00:00
bl00dymarie 91bf76621a Update README.md 2020-06-05 19:43:07 +00:00
Maria Zadnepryanets 37c5821411 Update CHANGELOG.md 2020-05-02 17:33:33 +00:00
Maria Zadnepryanets 4442c229f7 Update CHANGELOG.md 2020-05-02 15:57:21 +00:00
bl00dymarie c0c025cd69 Merge branch 'bug-cannot-enter-note-in-future' into 'master'
Bug fix: allows to enter note in the future

See merge request bloodyhealth/drip!288
2020-05-02 15:22:18 +00:00
Sofiya Tepikin 41e2406727 Merge branch 'fix-go-back-bug' into 'master'
Fixes the error on app exiting on via the device back button

See merge request bloodyhealth/drip!291
2020-04-26 15:25:40 +00:00
Maria Zadnepryanets e11915460c Merge branch '306-chart-displays-sex-dot-even-if-only-contraceptive-options-are-saved' into 'master'
Chart doesn't display sex dot although contraception method 'other' has been already removed

Closes #306

See merge request bloodyhealth/drip!285
2020-04-25 18:13:13 +00:00
Sofiya Tepikin 1413525e91 Fixes the error on app exiting on via the device back button 2020-04-25 19:47:05 +02:00
bl00dymarie 1291fe70bc Merge branch 'patch-1' into 'master'
Update README.md with F-Droid and Google Play Badges

See merge request bloodyhealth/drip!289
2020-04-03 15:38:05 +00:00
Poussinou 908ae9a305 Update README.md 2020-04-03 13:17:16 +00:00
mashazyu 7d46706cf2 Allows to enter note in the future 2020-03-30 18:34:26 +02:00
bl00dymarie f987628ced Update CONTRIBUTING.md 2020-03-28 19:06:07 +00:00
bl00dymarie 052b9bd2aa Update CHANGELOG.md 2020-03-28 19:04:21 +00:00
Maria Zadnepryanets c7740c7c57 Merge branch 'chart-navigation-bug' into 'master'
Chart navigation bug fix.

See merge request bloodyhealth/drip!287
2020-03-28 17:03:41 +00:00
mashazyu 5ec5d02b8d Chart navigation bug fix. 2020-03-28 17:17:21 +01:00
Maria Zadnepryanets 075813c314 Merge branch 'fix-clear-command' into 'master'
Change clear to lowercase to make it case sensitive and executable

See merge request bloodyhealth/drip!286
2020-03-28 16:11:35 +00:00
emelko 098c0e69a5 Change clear to lowercase to make it case sensitive and executable 2020-03-28 17:09:01 +01:00
Cathrin Senst 02db9c1722 fix 306 by setting other-note empty as contraception method 'other' is deactivated 2020-03-28 14:21:34 +01:00
Sofiya Tepikin 297c1cf3d5 Merge branch '183-show-no-temperature-when-not-tracked' into 'master'
Resolve "don't show temperature chart part of chart when temp not tracked"

Closes #183

See merge request bloodyhealth/drip!257
2020-03-28 13:03:51 +00:00
Maria Zadnepryanets ee0b83d1ca Resolve "don't show temperature chart part of chart when temp not tracked" 2020-03-28 13:03:51 +00:00
bl00dymarie 620f5e77da Merge branch '414-bug-darker-color-in-dots-for-sex-and-desire-on-chart-is-missing' into 'master'
Bring in different shades for desire dots on chart

Closes #414

See merge request bloodyhealth/drip!265
2020-03-27 16:15:22 +00:00
emelko 268ec56c88 Bring in different shades for desire dots on chart 2020-03-26 23:30:50 +01:00
Maria Zadnepryanets 9235a57fd7 Merge branch 'cycle-module-tests-split' into 'master'
Splits the rest of the tests without modifying them

See merge request bloodyhealth/drip!274
2020-03-14 14:07:40 +00:00
Sofiya Tepikin c1959962d0 Splits the rest of the tests without modifying them 2020-03-14 14:46:35 +01:00
Maria Zadnepryanets 06edde5340 Merge branch 'get-cycles-before-test' into 'master'
Moves out the test for getCyclesBefore method of cycle module

See merge request bloodyhealth/drip!273
2020-03-14 13:17:30 +00:00
Sofiya Tepikin 5b2dc82218 Moves out the test for getCyclesBefore method of cycle module 2020-03-14 13:17:30 +00:00
Maria Zadnepryanets 9b4da9bd19 Merge branch 'get-previous-cycle-test' into 'master'
Moves out the test for getPReviousCycle method of cycle module

See merge request bloodyhealth/drip!272
2020-03-14 11:40:04 +00:00
Sofiya Tepikin 64a4c8c455 Moves out the test for getPReviousCycle method of cycle module 2020-03-14 11:40:04 +00:00
Sofiya Tepikin 95068e92c4 Merge branch 'lint-rule-react-prop-types-addition' into 'master'
Lint rule react prop types addition

See merge request bloodyhealth/drip!270
2020-03-11 20:19:45 +00:00
Maria Zadnepryanets 47379d7a1e Lint rule react prop types addition 2020-03-11 20:19:45 +00:00
Maria Zadnepryanets 3dbcb41d67 Merge branch 'fix-get-cycle-by-start-day' into 'master'
Adds test and fixes getCycleByStartDate method of cycle module

See merge request bloodyhealth/drip!269
2020-03-11 18:42:04 +00:00
Sofiya Tepikin 8444d466db Merge branch 'eslint-cleanup' into 'master'
Cleans up the eslint rules

See merge request bloodyhealth/drip!271
2020-03-07 09:41:46 +00:00
Sofiya Tepikin f9d2838008 Cleans up the eslint rules 2020-03-05 21:20:59 +01:00
Sofiya Tepikin 9e34c1b8b4 Adds test and fixes getCycleByStartDate method of cycle module 2020-03-05 19:31:52 +01:00
Maria Zadnepryanets e901cae0f5 Merge branch 'get-cycle-day-number-test' into 'master'
Moves out the tests for getCycleDayNumber and organises them

See merge request bloodyhealth/drip!268
2020-03-04 20:53:55 +00:00
Maria Zadnepryanets 21c5ac72a6 Merge branch 'symptom-views-clean-up' into 'master'
Symptom views clean up

See merge request bloodyhealth/drip!267
2020-03-04 20:52:41 +00:00
Sofiya Tepikin 0e0e00948f Moves out the tests for getCycleDayNumber and organises them 2020-03-03 22:13:53 +01:00