Merge branch 'master' into '129-extract-text-from-stats-and-layout'
# Conflicts: # components/labels.js
No related branches found
No related tags found
Showing
- components/chart/chart.js 67 additions, 271 deletionscomponents/chart/chart.js
- components/chart/config.js 5 additions, 5 deletionscomponents/chart/config.js
- components/chart/day-column.js 136 additions, 0 deletionscomponents/chart/day-column.js
- components/chart/dot-and-line.js 71 additions, 0 deletionscomponents/chart/dot-and-line.js
- components/chart/drop.svg 12 additions, 0 deletionscomponents/chart/drop.svg
- components/chart/nfp-lines.js 80 additions, 0 deletionscomponents/chart/nfp-lines.js
- components/chart/styles.js 40 additions, 30 deletionscomponents/chart/styles.js
- components/chart/y-axis.js 53 additions, 0 deletionscomponents/chart/y-axis.js
- components/cycle-day/cycle-day-overview.js 31 additions, 4 deletionscomponents/cycle-day/cycle-day-overview.js
- components/cycle-day/labels/labels.js 13 additions, 0 deletionscomponents/cycle-day/labels/labels.js
- components/cycle-day/symptoms/index.js 4 additions, 2 deletionscomponents/cycle-day/symptoms/index.js
- components/cycle-day/symptoms/sex.js 156 additions, 0 deletionscomponents/cycle-day/symptoms/sex.js
- components/cycle-day/symptoms/temperature.js 5 additions, 1 deletioncomponents/cycle-day/symptoms/temperature.js
- components/home.js 1 addition, 26 deletionscomponents/home.js
- components/labels.js 30 additions, 7 deletionscomponents/labels.js
- components/settings.js 94 additions, 27 deletionscomponents/settings.js
- db/index.js 64 additions, 18 deletionsdb/index.js
- ios/drip.xcodeproj/project.pbxproj 116 additions, 15 deletionsios/drip.xcodeproj/project.pbxproj
- ios/drip/Info.plist 18 additions, 2 deletionsios/drip/Info.plist
- lib/import-export/export-to-csv.js 2 additions, 2 deletionslib/import-export/export-to-csv.js
Loading
Please register or sign in to comment