Merge working

FoxUSA · Mar 11, 2018 · 9329bbd · 9329bbd
2 parents ba03f68 + a0fbd94
commit 9329bbd
Show file tree

Hide file tree

Showing 118 changed files with 10,442 additions and 3,023 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 /bower_components
 /node_modules
-/build
+/dist
+openNote.bundle.*
+openNote.appcache
+webpack_files
diff --git a/.jshintrc b/.jshintrc
@@ -1,4 +1,6 @@
 {
+    "esversion":6,
+    "node": true,
     "undef": true,
     "unused": true,
     "mocha": true,
@@ -8,6 +10,5 @@
     "devel":true,
     "jquery":true,
     "jasmine": true,
-    "predef": [ "angular","alertify","", "PouchDB", "CKEDITOR","inject" ],
-    "globals":{"openNote":true}
+    "predef": [ "angular","alertify","", "PouchDB","inject","CodeMirror"]
 }
diff --git a/.project b/.project
diff --git a/.travis.yml b/.travis.yml
diff --git a/Changelog.md b/Changelog.md
diff --git a/Doc/Build.md b/Doc/Build.md
diff --git a/Doc/HowToUse.md b/Doc/HowToUse.md
diff --git a/Doc/Install.md b/Doc/Install.md
diff --git a/Doc/screenShots/login.png b/Doc/screenShots/login.png