Skip to content

Commit b91a76b

Browse files
committed
Merge branch 'master' into fixIssue2534
2 parents a19ff67 + d78f6b7 commit b91a76b

File tree

207 files changed

+230291
-5161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+230291
-5161
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"test": {
88
"presets": ["env" ,"react", "es2015"],
99
"plugins": [
10-
[ "babel-plugin-webpack-alias", { "config": "${PWD}/webpack.config.js" } ]
10+
[ "babel-plugin-webpack-alias", { "config": "<rootDir>/webpack.config.js" } ]
1111
]
1212
}
1313
}

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# EditorConfig is awesome: http://EditorConfig.org
1+
# EditorConfig is awesome: https://EditorConfig.org
22

33
# top-most EditorConfig file
44
root = true

.eslintrc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
"globals": {
1919
"FileReader": true,
2020
"localStorage": true,
21-
"fetch": true
21+
"fetch": true,
22+
"Image": true,
23+
"MutationObserver": true
2224
},
2325
"env": {
2426
"jest": true

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
issuehunt: BoostIo/Boostnote

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ node_modules/*
99
/secret
1010
*.log
1111
.idea
12-
.vscode
12+
.vscode
13+
package-lock.json

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
language: node_js
22
node_js:
3-
- 7
3+
- 8
44
script:
55
- npm run lint && npm run test
6-
- yarn jest
7-
- 'if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} = "master" ]]; then npm install -g grunt [email protected] && grunt pre-build; fi'
6+
- 'if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} = "master" ]]; then npm install -g grunt [email protected] && grunt pre-build; fi'
87
after_success:
98
- openssl aes-256-cbc -K $encrypted_440d7f9a3c38_key -iv $encrypted_440d7f9a3c38_iv
109
-in .snapcraft/travis_snapcraft.cfg -out .snapcraft/snapcraft.cfg -d

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"${workspaceFolder}/index.js"
1818
],
1919
"windows": {
20-
"runtimeExecutable": "${workspaceFolder}/node_modeules/.bin/electron.cmd"
20+
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
2121
}
2222
},
2323
{

Backers.md

Lines changed: 0 additions & 72 deletions
This file was deleted.

FAQ.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Frequently Asked Questions
2+
3+
4+
<details><summary>Allowing dangerous HTML tags</summary>
5+
6+
Sometimes it is useful to allow dangerous HTML tags to add interactivity to your notebook. One of the example is to use details/summary as a way to expand/collaps your todo-list.
7+
8+
* How to enable:
9+
* Go to **Preferences****Interface****Sanitization****Allow dangerous html tags**
10+
* Example note: Multiple todo-list
11+
* Create new notes
12+
* Paste the below code, and you'll see that you can expand/collaps the todo-list, and you can have multiple todo-list in your note.
13+
14+
```html
15+
<details><summary>What I want to do</summary>
16+
17+
- [x] Create an awesome feature X
18+
- [ ] Do my homework
19+
20+
</details>
21+
```
22+
23+
</details>
24+
25+
## Other questions
26+
27+
You can ask [here][ISSUES]
28+
29+
[ISSUES]: https://github.com/BoostIO/Boostnote/issues

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ GPL-3.0
22

33
Boostnote - an open source note-taking app made for programmers just like you.
44

5-
Copyright (C) 2017 - 2018 BoostIO
5+
Copyright (C) 2017 - 2019 BoostIO
66

77
This program is free software: you can redistribute it and/or modify
88
it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)