Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

Drip
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

2883aaa8

Commit 2883aaa8 authored 6 years ago by Julia Friesel

Downloads
- Plain Diff

Merge branch '114-add-import-button' into 'master'

Resolve "Add Import button"

Closes #114

See merge request bloodyhealth/drip!48

parents 18c5fef5 4b227d82

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

android/app/build.gradle 2 additions, 0 deletions

android/app/build.gradle
android/app/src/main/java/com/drip/MainApplication.java 4 additions, 0 deletions

android/app/src/main/java/com/drip/MainApplication.java
android/settings.gradle 4 additions, 0 deletions

android/settings.gradle
components/labels.js 30 additions, 7 deletions

components/labels.js
components/settings.js 94 additions, 27 deletions

components/settings.js
db/index.js 32 additions, 16 deletions

db/index.js
ios/drip.xcodeproj/project.pbxproj 38 additions, 0 deletions

ios/drip.xcodeproj/project.pbxproj
lib/import-export/export-to-csv.js 2 additions, 2 deletions

lib/import-export/export-to-csv.js
lib/import-export/get-csv-column-names.js 19 additions, 0 deletions

lib/import-export/get-csv-column-names.js
lib/import-export/import-from-csv.js 82 additions, 0 deletions

lib/import-export/import-from-csv.js
package-lock.json 1561 additions, 1500 deletions

package-lock.json
package.json 4 additions, 0 deletions

package.json

with 1872 additions and 1552 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment