Skip to content

Commit b07eeed

Browse files
committed
Merge branch 'master' of https://github.com/jackycute/HackMD
2 parents 4a1d08c + 16d80ed commit b07eeed

7 files changed

Lines changed: 685 additions & 562 deletions

File tree

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ root = true
33
# Tab indentation
44
[*]
55
indent_style = space
6-
indent_size = 4
6+
indent_size = 2
77
trim_trailing_whitespace = true
88
insert_final_newline = true
99

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
HackMD
22
===
33

4-
[![Standard - JavaScript Style Guide](https://cdn.rawgit.com/feross/standard/master/badge.svg)](https://github.com/feross/standard)
4+
[![Standard - JavaScript Style Guide][standardjs-image]][standardjs-url]
55

66
[![Join the chat at https://gitter.im/hackmdio/hackmd][gitter-image]][gitter-url]
77
[![build status][travis-image]][travis-url]
@@ -227,7 +227,10 @@ Additionally, now can show other clients' selections.
227227
See more at [http://operational-transformation.github.io/](http://operational-transformation.github.io/)
228228

229229
**License under MIT.**
230+
230231
[gitter-image]: https://badges.gitter.im/Join%20Chat.svg
231232
[gitter-url]: https://gitter.im/hackmdio/hackmd?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
232233
[travis-image]: https://travis-ci.org/hackmdio/hackmd.svg?branch=master
233234
[travis-url]: https://travis-ci.org/hackmdio/hackmd
235+
[standardjs-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
236+
[standardjs-url]: https://github.com/feross/standard

package.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,27 @@
169169
"webpack-parallel-uglify-plugin": "^0.2.0"
170170
},
171171
"standard": {
172+
"globals": [
173+
"$",
174+
"CodeMirror",
175+
"Cookies",
176+
"moment", "editor",
177+
"ui",
178+
"Spinner",
179+
"modeType",
180+
"Idle",
181+
"serverurl",
182+
"key",
183+
"gapi",
184+
"Dropbox",
185+
"FilePicker",
186+
"ot",
187+
"MediaUploader",
188+
"hex2rgb",
189+
"num_loaded",
190+
"Visibility",
191+
"inlineAttachment"
192+
],
172193
"ignore": [
173194
"lib/ot",
174195
"public/vendor"

0 commit comments

Comments
 (0)