Commit Graph

1293 Commits

Author SHA1 Message Date
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
Sofiya Tepikin 407bc2e524 Adds propTypes definition 2020-03-03 21:39:14 +01:00
Sofiya Tepikin aab64a433f Gets rid of a top level prop passed down through a tree of components 2020-03-03 21:39:14 +01:00
Sofiya Tepikin 346d7e6dad Cleanups symptom view 2020-03-03 21:39:14 +01:00
Sofiya Tepikin 12b8e5c213 Removes unnecessary prop and defines the missing propTypes 2020-03-03 21:39:14 +01:00
Sofiya Tepikin 9ce7dbf6b6 Merge branch 'home-split' into 'master'
Home split

See merge request bloodyhealth/drip!266
2020-03-02 20:51:04 +00:00
Sofiya Tepikin a9333bd848 Adds propTypes definition 2020-02-29 12:59:17 +01:00
Sofiya Tepikin ec907ab23c Gets rid of the redundant state on Home 2020-02-29 12:55:58 +01:00
Sofiya Tepikin d5b1944988 Moves out home helpers from the component 2020-02-29 12:09:38 +01:00
Sofiya Tepikin 0a86f38472 Moves out HomeElement component 2020-02-29 12:09:38 +01:00
Sofiya Tepikin 49fedcc634 Moves out IconText component 2020-02-29 12:09:38 +01:00
Sofiya Tepikin af562e329c Merge branch 'fix-cycle-day-prop' into 'master'
Fix cycle day prop

See merge request bloodyhealth/drip!264
2020-02-29 11:07:57 +00:00
Julia Friesel 6badd97f2c Update .eslintrc 2020-02-29 07:22:01 +00:00
Sofiya Tepikin 1c0c2276de Resets the date in store for today date when navigating home 2020-02-26 21:11:56 +01:00
Sofiya Tepikin f789a7990f Sets initial value of date in the store 2020-02-26 21:11:56 +01:00
Sofiya Tepikin aa2165590b Removes redundant state and corrects the cycle day prop 2020-02-26 21:11:56 +01:00
Julia Friesel 17815fcefe Merge branch 'use-updated-sympto' into 'master'
Use updated sympto

Closes #409

See merge request bloodyhealth/drip!253
2020-02-25 06:28:57 +00:00
Julia Friesel b42cbc8826 Use new published sympto 2020-02-25 07:26:43 +01:00
Julia Friesel 76101eec74 Merge branch 'navigation-state' into 'master'
Navigation state

See merge request bloodyhealth/drip!247
2020-02-17 13:39:34 +00:00
Julia Friesel 9fbc3e7e2a Merge branch 'no-multi-space' into 'master'
Adds linter rule for no multi spaces

See merge request bloodyhealth/drip!263
2020-02-17 13:05:44 +00:00
Sofiya Tepikin e88f26dc16 Fixes missing navigation state on exiting the app 2020-02-16 16:26:37 +01:00
Sofiya Tepikin d054187485 Adds linter rule for no multi spaces 2020-02-16 12:37:19 +01:00
Julia Friesel 856f6216ee Add e2e test device config for Nexus 5 2020-02-11 09:36:31 +01:00
Sofiya Tepikin c7f0c1cb6f Merge branch 'ios-integration' into 'master'
Ios integration

See merge request bloodyhealth/drip!258
2020-02-09 12:09:46 +00:00
Sofiya Tepikin c7882eb619 Merge branch 'fix-linter-warning' into 'master'
Fix linter warning

See merge request bloodyhealth/drip!261
2020-02-07 13:35:28 +00:00
Julia Friesel 28356d6664 Merge branch '413-bug-cycle-start-not-detected-if-day-before-period-excluded' into 'master'
Resolve "Bug: cycle start not detected if day before period excluded"

Closes #413

See merge request bloodyhealth/drip!259
2020-02-07 13:29:34 +00:00
Sofiya Tepikin 882f183c8e Removes linter complaint about react version not being specified 2020-02-07 14:16:21 +01:00
Sofiya Tepikin 7b69719e22 Removes linter warning 2020-02-07 14:16:07 +01:00
Julia Friesel 62df30de8a De-duplicate line 2020-02-07 09:53:11 +01:00
Sofiya Tepikin 8cad357e60 Fixes navigation logic 2020-02-05 19:50:40 +01:00
Sofiya Tepikin 026a9c17c3 Add go back functionality 2020-02-04 20:45:23 +01:00
Sofiya Tepikin e66ca3f8db Adds navigation tree to define the hierarchy 2020-02-04 20:45:23 +01:00
Sofiya Tepikin e479b93638 Moves navigation to the state 2020-02-04 20:45:23 +01:00