public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'no_submodules'

Browse Source 
Conflicts:
	readme.md
This commit is contained in:
Dick Choi
2016-06-12 20:01:20 +09:00
parent ce915df2b2 e931d3efbc
commit 8c6a54397f
7 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@@ -1,4 +0,0 @@
[submodule "submodules/ace"]
path = submodules/ace
url = https://github.com/ajaxorg/ace-builds.git
branch = master

2
gruntfile.js
View File

@@ -100,7 +100,7 @@ module.exports = function (grunt) {
prune: true, prune: true,
overwrite: true, overwrite: true,
out: path.join(__dirname, 'dist'), 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) { switch (platform) {
case 'win': case 'win':

2
lib/finder.html
View File

@@ -27,7 +27,7 @@
</head> </head>
<body> <body>
<div id="content"></div> <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="../resources/katex.min.js"></script>
<script src="../compiled/react.min.js"></script> <script src="../compiled/react.min.js"></script>
<script src="../compiled/react-dom.min.js"></script> <script src="../compiled/react-dom.min.js"></script>

4
lib/main.html
View File

@@ -54,8 +54,8 @@
<div id="content"></div> <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="../submodules/ace/src-min/ext-themelist.js"></script> <script src="../node_modules/ace-builds/src-min/ext-themelist.js"></script>
<script src="../resources/katex.min.js"></script> <script src="../resources/katex.min.js"></script>
<script src="../compiled/react.js"></script> <script src="../compiled/react.js"></script>
<script src="../compiled/react-dom.js"></script> <script src="../compiled/react-dom.js"></script>

4
package.json
View File

@@ -40,6 +40,7 @@
"@rokt33r/markdown-it-math": "^4.0.1", "@rokt33r/markdown-it-math": "^4.0.1",
"@rokt33r/node-ipc": "^5.0.4", "@rokt33r/node-ipc": "^5.0.4",
"@rokt33r/sanitize-html": "^1.11.2", "@rokt33r/sanitize-html": "^1.11.2",
"ace-builds": "git+https://git@github.com/ajaxorg/ace-builds.git",
"devicon": "^2.0.0", "devicon": "^2.0.0",
"electron-gh-releases": "^2.0.2", "electron-gh-releases": "^2.0.2",
"font-awesome": "^4.3.0", "font-awesome": "^4.3.0",
@@ -88,9 +89,6 @@
}, },
"optional": false, "optional": false,
"standard": { "standard": {
"ignore": [
"submodules"
],
"globals": [ "globals": [
"localStorage" "localStorage"
] ]

12
readme.md
View File

@@ -2,6 +2,7 @@
Simple opensource note app for developer. Simple opensource note app for developer.
<<<<<<< HEAD
- [日本語](./readme-ja.md) - [日本語](./readme-ja.md)
- [한국어](./readme-ko.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!) - Target OS : OSX, Windows, Linux(also mobile somewhen!)
- Cloud : Google drive, Dropbox, One drive, iCloud... - Cloud : Google drive, Dropbox, One drive, iCloud...
- Remaining opensource forever! - 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 ## Inspired by

1
submodules/ace

Submodule submodules/ace deleted from 8dcfcd6d0d