lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
982 Commits 31 Branches 14 Tags
4605f5b81c301ebdb3f82dad0b38e3e12f7968e4
Commit Graph

982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
bl00dymarie 71d0c61596 Merge branch 'Make-comment-on-cervix-and-mucus-bold' into 'master' 
Makes actionHint text more visible with bold font

See merge request bloodyhealth/drip!168
 2019-01-29 09:19:06 +00:00
Sofiya Tepikin 1e39c71a4e temp 2019-01-28 23:52:00 +03:00
emelko ec2a0b7dd8 Makes actionHint text more visible with bold font 2019-01-28 12:45:49 +01:00
bl00dymarie ad4f5c9dca Merge branch 'Try-mood-icon' into 'master' 
Adds mood icon to the app

See merge request bloodyhealth/drip!166
 2019-01-28 08:24:34 +00:00
emelko 56577036b6 Adds mood icon to the app; 
TODO:
* add it to cycle day and chart
 2019-01-26 14:13:58 +01: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 05d67150e5 Merge branch '265-add-info-to-mucus-i-text' into 'master' 
Add passage about lack of support for "parenthesis values"

Closes #265

See merge request bloodyhealth/drip!165
 2019-01-23 13:59:05 +00:00
Julia Friesel 28ca2378ca Add passage about lack of support for "parenthesis values" 2019-01-22 17:42:13 +01:00
Julia Friesel dfa37952bd Change font to OpenSans 2019-01-22 17:31:56 +01: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
bl00dymarie 60f444f094 Update README.md 2019-01-21 09:34:15 +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 8701abb765 Merge branch '151-in-import-error-when-future-edit-for-something-other-than-a-note' into 'master' 
Show error message when future data edit

Closes #151

See merge request bloodyhealth/drip!161
 2019-01-18 10:12:49 +00:00