Skip to content

Commit 540d726

Browse files
daiyamdaiyam
committed
Merge branch 'master' into fix-autocomplete-codeblock
2 parents 12f9b93 + 7f3fded commit 540d726

File tree

322 files changed

+21593
-12642
lines changed

Some content is hidden

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

322 files changed

+21593
-12642
lines changed

Diff for: ‎.babelrc

+1-1
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
}

Diff for: ‎.eslintrc

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"extends": ["standard", "standard-jsx", "plugin:react/recommended"],
3-
"plugins": ["react"],
2+
"extends": ["standard", "standard-jsx", "plugin:react/recommended", "prettier"],
3+
"plugins": ["react", "prettier"],
44
"rules": {
55
"no-useless-escape": 0,
66
"prefer-const": ["warn", {
@@ -13,12 +13,15 @@
1313
"react/no-string-refs": 0,
1414
"react/no-find-dom-node": "warn",
1515
"react/no-render-return-value": "warn",
16-
"react/no-deprecated": "warn"
16+
"react/no-deprecated": "warn",
17+
"prettier/prettier": ["error"]
1718
},
1819
"globals": {
1920
"FileReader": true,
2021
"localStorage": true,
21-
"fetch": true
22+
"fetch": true,
23+
"Image": true,
24+
"MutationObserver": true
2225
},
2326
"env": {
2427
"jest": true

Diff for: ‎.github/FUNDING.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
issuehunt: BoostIo/Boostnote

Diff for: ‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@ node_modules/*
99
/secret
1010
*.log
1111
.idea
12-
.vscode
12+
.vscode
13+
package-lock.json
14+
config.json

Diff for: ‎.prettierrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"singleQuote": true,
3+
"semi": false,
4+
"jsxSingleQuote": true
5+
}

Diff for: ‎.travis.yml

+2-3
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 npm@5.2 && grunt pre-build; fi'
6+
- 'if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} = "master" ]]; then npm install -g grunt npm@6.4 && 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

Diff for: ‎ISSUE_TEMPLATE.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ Let us know what is currently happening.
55
66
Please include some **screenshots** with the **developer tools** open (console tab) when you report a bug.
77
8-
If your issue is regarding Boostnote mobile, please open an issue in the Boostnote Mobile repo 👉 https://github.com/BoostIO/boostnote-mobile.
8+
If your issue is regarding the new Boost Note.next, please open an issue in the new repo 👉 https://github.com/BoostIO/BoostNote.next/issues.
99
-->
1010

1111
# Expected behavior
1212

1313
<!--
14-
Let us know what you think should happen!
14+
Let us know what you think should happen.
1515
-->
1616

1717
# Steps to reproduce
1818

1919
<!--
20-
Please be thorough, issues we can reproduce are easier to fix!
20+
Please be thorough, issues we can reproduce are easier to fix.
2121
-->
2222

2323
1.
@@ -26,8 +26,8 @@ Please be thorough, issues we can reproduce are easier to fix!
2626

2727
# Environment
2828

29-
- Version :
30-
- OS Version and name :
29+
- Boostnote version: <!-- 0.x.x -->
30+
- OS version and name: <!-- Windows 10 / Ubuntu 18.04 / etc -->
3131

3232
<!--
3333
Love Boostnote? Please consider supporting us on IssueHunt:

Diff for: ‎LICENSE

+1-1
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

Diff for: ‎PULL_REQUEST_TEMPLATE.md

+6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ Before submitting this PR, please make sure that:
33
- You have read and understand the contributing.md
44
- You have checked docs/code_style.md for information on code style
55
-->
6+
67
## Description
8+
79
<!--
810
Tell us what your PR does.
911
Please attach a screenshot/ video/gif image describing your PR if possible.
1012
-->
1113

1214
## Issue fixed
15+
1316
<!--
1417
Please list out all issue fixed with this PR here.
1518
-->
@@ -20,6 +23,7 @@ your PR will be reviewed faster if we know exactly what it does.
2023
2124
Change :white_circle: to :radio_button: in all the options that apply
2225
-->
26+
2327
## Type of changes
2428

2529
- :white_circle: Bug fix (Change that fixed an issue)
@@ -34,3 +38,5 @@ Change :white_circle: to :radio_button: in all the options that apply
3438
- :white_circle: I have written test for my code and it has been tested
3539
- :white_circle: All existing tests have been passed
3640
- :white_circle: I have attached a screenshot/video to visualize my change if possible
41+
- :white_circle: This PR will modify the UI or affects the UX
42+
- :white_circle: This PR will add/update/delete a keybinding

0 commit comments

Comments
 (0)