Merge branch 'no_submodules'

Rokt33r · Rokt33r · commit 8c6a54397f91 · 2016-06-12T20:01:20.000+09:00
Conflicts:
	readme.md
diff --git a/.gitmodules b/.gitmodules
diff --git a/gruntfile.js b/gruntfile.js
@@ -100,7 +100,7 @@ module.exports = function (grunt) {
       prune: true,
       overwrite: true,
       out: path.join(__dirname, 'dist'),
-      ignore: /submodules\/ace\/(?!src-min)|submodules\/ace\/(?=src-min-noconflict)|node_modules\/devicon\/icons|dist|^\/browser|^\/secret|\.babelrc|\.gitignore|^\/\.gitmodules|^\/gruntfile|^\/readme.md|^\/webpack|^\/appdmg\.json|^\/node_modules\/grunt/
+      ignore: /node_modules\/ace-builds\/(?!src-min)|node_modules\/ace-builds\/(?=src-min-noconflict)|node_modules\/devicon\/icons|dist|^\/browser|^\/secret|\.babelrc|\.gitignore|^\/\.gitmodules|^\/gruntfile|^\/readme.md|^\/webpack|^\/appdmg\.json|^\/node_modules\/grunt/
     }
     switch (platform) {
       case 'win':
diff --git a/lib/finder.html b/lib/finder.html
@@ -27,7 +27,7 @@
 </head>
 <body>
   <div id="content"></div>
-  <script src="../submodules/ace/src-min/ace.js"></script>
+  <script src="../node_modules/ace-builds/src-min/ace.js"></script>
   <script src="../resources/katex.min.js"></script>
   <script src="../compiled/react.min.js"></script>
   <script src="../compiled/react-dom.min.js"></script>
diff --git a/lib/main.html b/lib/main.html
@@ -54,8 +54,8 @@
 
   <div id="content"></div>
 
-  <script src="../submodules/ace/src-min/ace.js"></script>
-  <script src="../submodules/ace/src-min/ext-themelist.js"></script>
+  <script src="../node_modules/ace-builds/src-min/ace.js"></script>
+  <script src="../node_modules/ace-builds/src-min/ext-themelist.js"></script>
   <script src="../resources/katex.min.js"></script>
   <script src="../compiled/react.js"></script>
   <script src="../compiled/react-dom.js"></script>
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "@rokt33r/markdown-it-math": "^4.0.1",
     "@rokt33r/node-ipc": "^5.0.4",
     "@rokt33r/sanitize-html": "^1.11.2",
+    "ace-builds": "git+https://git@github.com/ajaxorg/ace-builds.git",
     "devicon": "^2.0.0",
     "electron-gh-releases": "^2.0.2",
     "font-awesome": "^4.3.0",
@@ -88,9 +89,6 @@
   },
   "optional": false,
   "standard": {
-    "ignore": [
-      "submodules"
-    ],
     "globals": [
       "localStorage"
     ]
diff --git a/readme.md b/readme.md
@@ -2,6 +2,7 @@
 
 Simple opensource note app for developer.
 
+<<<<<<< HEAD
 - [日本語](./readme-ja.md)
 - [한국어](./readme-ko.md)
 
@@ -12,6 +13,17 @@ We just want you to enjoying writing anything. :grinning:
 - Target OS : OSX, Windows, Linux(also mobile somewhen!)
 - Cloud : Google drive, Dropbox, One drive, iCloud...
 - Remaining opensource forever!
+=======
+## !!v0.6.0 is Underconstruction!!
+
+Check the links below for further information.
+
+Progress summary
+https://github.com/BoostIO/Boostnote/issues/3
+
+v0.6.0 Branch
+https://github.com/BoostIO/Boostnote/tree/0.6.0
+>>>>>>> no_submodules
 
 ## Inspired by
 
diff --git a/submodules/ace b/submodules/ace

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ module.exports = function (grunt) {`
`100`	`100`	`prune: true,`
`101`	`101`	`overwrite: true,`
`102`	`102`	`out: path.join(__dirname, 'dist'),`
`103`		`- ignore: /submodules\/ace\/(?!src-min)\|submodules\/ace\/(?=src-min-noconflict)\|node_modules\/devicon\/icons\|dist\|^\/browser\|^\/secret\|\.babelrc\|\.gitignore\|^\/\.gitmodules\|^\/gruntfile\|^\/readme.md\|^\/webpack\|^\/appdmg\.json\|^\/node_modules\/grunt/`
	`103`	`+ ignore: /node_modules\/ace-builds\/(?!src-min)\|node_modules\/ace-builds\/(?=src-min-noconflict)\|node_modules\/devicon\/icons\|dist\|^\/browser\|^\/secret\|\.babelrc\|\.gitignore\|^\/\.gitmodules\|^\/gruntfile\|^\/readme.md\|^\/webpack\|^\/appdmg\.json\|^\/node_modules\/grunt/`
`104`	`104`	`}`
`105`	`105`	`switch (platform) {`
`106`	`106`	`case 'win':`