Commit Graph

536 Commits

Author SHA1 Message Date
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
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
emelko c44faaba0f Text corrections in info boxes 2019-02-18 12:18:16 +01:00
emelko bca86f3996 Renames unset to delete 2019-02-13 16:37:33 +01: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
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 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 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
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
emelko 563a5a1821 Give this framed segment bottom margin, since it's only one segment 2019-02-02 13:02:12 +01:00
emelko 324820ebab Rearrange Segment Element: * Rename SettingsSegment into FramedSegment * Move it out of Settings into Components 2019-02-02 12:58:05 +01:00
Julia Friesel 0878654e82 Extract link component and parse all app text for links 2019-02-02 11:55:03 +01:00
Julia Friesel 8318f5d313 Make link work 2019-02-02 11:23:40 +01:00
Julia Friesel 3e94df56e2 Limit press handler to just button 2019-02-02 10:54:51 +01:00
Julia Friesel 5dc519980d Merge branch 'master' into link-nfp-rules 2019-02-02 10:26:18 +01:00
tina d407255fcc changes titles of subcategory in setting to lowercase 2019-01-30 23:19:42 +01:00
emelko ce3a81ad5f Hyperlink activation 2019-01-30 17:44:43 +01:00
emelko 9c56c04432 Implements SettingsSegment Boxes for info symptom texts 2019-01-30 12:28:55 +01:00
Sofiya Tepikin fee13da2dc Changing the mood icon 2019-01-30 13:15:12 +03:00
mashazyu 570d0dc608 Add mood category to chart 2019-01-30 01:44:51 +03:00
mashazyu 56f5c92f87 Add mood component, add mood as tracking category to db schemas, add mood category description, add mood to the cycle-day-overview 2019-01-30 01:44:50 +03:00
Sofiya Tepikin 1e39c71a4e temp 2019-01-28 23:52:00 +03:00
Julia Friesel 228ae781b9 Merge branch '286-increase-stroke-width-for-home-screen-elements' into 'master'
Resolve "increase stroke width for home screen elements"

Closes #286

See merge request bloodyhealth/drip!160
2019-01-26 12:01:12 +00:00
Julia Friesel 90766bc1dc Merge branch 'settings-menu-footer' into 'master'
Fixes settings item menu in footer missing active state

Closes #282

See merge request bloodyhealth/drip!164
2019-01-22 16:01:48 +00:00
Sofiya Tepikin 4408334d7c Makes some order in home component 2019-01-21 00:48:30 +01:00
Sofiya Tepikin 31268186f1 Refactors app.js for readability 2019-01-19 23:06:07 +01:00
Julia Friesel ab3ca68902 Merge branch '285-bug-coming-from-track-your-period-cycle-day-doesn-t-show-data' into 'master'
Pass correct props to bleeding edit view from home screen

Closes #285

See merge request bloodyhealth/drip!162
2019-01-18 09:13:28 +00:00
Sofiya Tepikin ff8765b9f8 Makes also the subpages of Settings to activate the menu item in footer 2019-01-17 23:15:30 +01:00
Sofiya Tepikin faf7dbac95 Fixes settings item menu in footer missing active state 2019-01-17 22:11:44 +01:00
Julia Friesel 1aad11b504 Fix label reference 2019-01-17 21:20:19 +01:00
Julia Friesel 86e0d967be Pass correct props to bleeding edit view from home screen 2019-01-17 21:02:32 +01:00
Julia Friesel d905139958 Remove light app text 2019-01-17 17:17:22 +01:00
Julia Friesel 8178303e3a Make link press handler work 2019-01-17 16:36:36 +01:00
bl00dymarie 53f662279d Merge branch '185-add-info-for-symptoms' into 'master'
Resolve "add info for symptoms"

Closes #185

See merge request bloodyhealth/drip!97
2019-01-17 14:38:08 +00:00
emelko 84be9900de Handles the back navigation from info symptom to CycleDay 2019-01-17 11:04:14 +01:00
emelko 8d3d04af47 Adds symptom info screens to each symptom 2019-01-17 10:23:35 +01:00
Sofiya Tepikin 714d9fd681 Styles the buttons in password confirmation 2019-01-16 22:55:33 +01:00
mashazyu 3babba0d92 Add cancel button to ConfirmWithPassword component 2019-01-16 22:07:47 +01:00
Julia Friesel a604482f85 Merge branch '178-add-hints-for-required-selections' into 'master'
Resolve "Change symptom category descriptions to make clear which are required (for mucus and cervix) for fertility detection"

Closes #178

See merge request bloodyhealth/drip!153
2019-01-13 16:16:36 +00:00