Commit Graph

996 Commits

Author SHA1 Message Date
emelko bca86f3996 Renames unset to delete 2019-02-13 16:37:33 +01:00
Kevin Sullivan 76b9c1943d Proofreading 2019-02-13 16:34:42 +01:00
tina 392d2a8f70 Merge branch 'change_app_icon_gatsby' into 'master'
change app icon gatsby - version 2

See merge request bloodyhealth/drip!179
2019-02-12 17:44:40 +00:00
Julia Friesel 7499b443d7 Merge branch 'use-external-sympto' into 'master'
Use external sympto module

See merge request bloodyhealth/drip!173
2019-02-08 07:44:45 +00: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
tina 2fd7232420 logo with gatsby 2019-02-07 15:59:06 +01:00
tina fcc2868539 makes font and line width thicker in logo 2019-02-07 15:37:28 +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 57309b2e39 Merge branch 'link-nfp-rules' into 'master'
Link nfp rules

See merge request bloodyhealth/drip!169
2019-02-04 20:20:58 +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 433f7aa7f4 Merge branch '297-bug-overspilling-text-in-pain-mood-note' into 'master'
Use built-in numberOfLines prop instead of truncating by hand

Closes #297

See merge request bloodyhealth/drip!174
2019-02-04 19:07:16 +00: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
Julia Friesel efca6f0d47 dirty-chai 2019-02-02 18:39:50 +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
bl00dymarie cc75c99087 Merge branch '291-review-edit-fill-in-info-text-on-symptoms' into 'master'
Resolve "Review/edit/fill in info text on symptoms"

Closes #291

See merge request bloodyhealth/drip!167
2019-02-02 12:13:12 +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
bl00dymarie ff27464fc8 Merge branch 'Give-settings-segment-some-bottom-space' into 'master'
Give the last segment bottom space

See merge request bloodyhealth/drip!172
2019-02-02 11:38:00 +00:00
Julia Friesel 0878654e82 Extract link component and parse all app text for links 2019-02-02 11:55:03 +01:00
emelko 4ce84e551a Give the last segment bottom space 2019-02-02 11:37:06 +01:00
Julia Friesel 87301da648 Return status text when no NFP status can be detected 2019-02-02 11:33:46 +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
Julia Friesel 8bd8adaa7a Add text corrections 2019-02-02 09:46:59 +01:00
bl00dymarie 46aa596c7a Update README.md 2019-02-01 13:10:33 +00:00
bl00dymarie b841ca9a1f Update README.md 2019-02-01 13:06:40 +00:00
bl00dymarie 08abef8269 Update README.md 2019-02-01 13:04:01 +00:00
bl00dymarie ec9dfa65f6 Update README.md 2019-02-01 13:03:15 +00:00
bl00dymarie a676f47027 Update README.md 2019-02-01 13:02:30 +00:00
bl00dymarie 3a482db602 Update CONTRIBUTING.md 2019-02-01 13:00:20 +00:00
bl00dymarie 8a3d6b986f Update README.md 2019-02-01 12:59:43 +00:00
tina d407255fcc changes titles of subcategory in setting to lowercase 2019-01-30 23:19:42 +01:00
emelko 3e104f9f98 Sex doesn't need the cycleRelation text 2019-01-30 17:49:45 +01:00
emelko ce3a81ad5f Hyperlink activation 2019-01-30 17:44:43 +01:00
emelko b3a2713daf Info symptom text corrections and rearrangements 2019-01-30 17:44:24 +01:00
emelko 9c56c04432 Implements SettingsSegment Boxes for info symptom texts 2019-01-30 12:28:55 +01:00
bl00dymarie 2e400c2dde Merge branch 'mood-category' into 'master'
Add mood component, add mood as tracking category to db schemas, add mood...

See merge request bloodyhealth/drip!156
2019-01-30 11:18:10 +00:00
Sofiya Tepikin 78869f99b8 Adds the missing mood title on mood edit view 2019-01-30 14:05:22 +03: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