Merge branch 'develop'

Closed #62, closed #98, closed #83, closed #15, closed #22, closed #86, closed #88, closed #89

.eslintrc

@@ -1,10 +1,17 @@
 {
+  "env": {
+    "browser": true
+  },
   "extends": "airbnb/base",
   "rules": {
-     "no-unused-expressions": [2, {
-          "allowShortCircuit": true, // eg. a || a()
-          "allowTernary": true // eg. a ? b() : c()
-     }],
+    "no-console": 0,
+    "no-plusplus": 0,
+    "no-mutable-exports": 0,
+    "no-underscore-dangle": 0,
+    "no-unused-expressions": [2, {
+      "allowShortCircuit": true, // eg. a || a()
+      "allowTernary": true // eg. a ? b() : c()
+    }],
     "new-cap": ["error", {
       "capIsNewExceptions": ["Log", "UUID"]
     }]
@@ -23,5 +30,12 @@
     "cordova": true,
     "StatusBar": true,
     "splashscreen": true
+  },
+  "settings": {
+    "import/resolver": {
+      "webpack": {
+        "config": "config/webpack.common.js"
+      }
+    }
   }
 }

.gitignore

@@ -1,22 +1,7 @@
-/cordova
-/sauce.json
-/src/scripts/config_dev.js
-/src/scripts/config.js
-/src/scripts/JST.js
 .DS_Store
 .idea
 .sass-cache
 .npm-debug.log
-/config_build.xml
 dist
 node_modules
-bower_components
-
-src/config_build.xml
-
-!src/vendor
-src/vendor/*
-!src/vendor/datepick/
-!src/vendor/bootstrap/
-!src/vendor/ionic/
-!src/vendor/fontello/
+.env*

CONTRIBUTING.md

@@ -39,7 +39,7 @@ transpiles check the [Babel Docs](https://babeljs.io/docs/learn-es2015).
 
 The code is packaged up by [Webpack](https://webpack.github.io) module bundler. It
 takes care of passing the ES6 code through Babel and pulling the code together
-to make an *dist/app.js* file that is loaded in the *index.html*.
+to make an *dist/main/app.js* file that is loaded in the *index.html*.
 
 
 ## Style Guide
@@ -74,9 +74,7 @@ The app is structured in such a way:
 │   │   └── **component**
 │   │       └── **sub component**
 │   │           └── templates
-│   ├── config
 │   ├── data
-│   │   └── raw
 │   └── helpers
 ├── styles
 │   ├── common
@@ -87,7 +85,7 @@ The app is structured in such a way:
 ## Components folder
 
 * App **components** - a group of page-like components (sub components) providing similar
- functionality eg. records, maping, information pages. 
+ functionality eg. records, mapping, information pages. 
  Components should work independently between each other, so that for example mapping should
  have no dependencies on record components.
 
@@ -131,25 +129,14 @@ grunt test
 
 # Cordova
 
-## Signing
+## iOS 
 
-Generate a key with first one if don't have one
-```bash
-jarsigner -keytool -genkey -v -keystore irecord.keystore -alias irecord -keyalg RSA -keysize 2048 -validity 10000
-jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore irecord.keystore android-release-unsigned.apk irecord
-```
+Use XCode to build and upload
 
-Zipalign is in sdk build tools. On Mac /Applications/Android/sdk/build-tools/
+## Android
 
+Run and upload binaries from cordova/dist
 ```bash
-zipalign -v 4 android-release-unsigned.apk irecord.apk
+grunt cordova:android
+grunt cordova:android:old
 ```
-
-### Android
-
-Add crosswalk to older platforms.
-```bash
-cordova plugin add cordova-plugin-crosswalk-webview
-```
-
-Change config.xml, sdk version and build version starting 19->14.