Skip to content

Commit

Permalink
Merge working
Browse files Browse the repository at this point in the history
  • Loading branch information
FoxUSA committed Mar 11, 2018
2 parents ba03f68 + a0fbd94 commit 9329bbd
Show file tree
Hide file tree
Showing 118 changed files with 10,442 additions and 3,023 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/bower_components
/node_modules
/build
/dist
openNote.bundle.*
openNote.appcache
webpack_files
5 changes: 3 additions & 2 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"esversion":6,
"node": true,
"undef": true,
"unused": true,
"mocha": true,
Expand All @@ -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"]
}
18 changes: 0 additions & 18 deletions .project

This file was deleted.

7 changes: 0 additions & 7 deletions .travis.yml

This file was deleted.

Empty file added Changelog.md
Empty file.
32 changes: 0 additions & 32 deletions Doc/Build.md

This file was deleted.

34 changes: 0 additions & 34 deletions Doc/HowToUse.md

This file was deleted.

122 changes: 0 additions & 122 deletions Doc/Install.md

This file was deleted.

Binary file removed Doc/screenShots/login.png
Binary file not shown.
Loading

0 comments on commit 9329bbd

Please sign in to comment.