status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,326 Commits 23 Branches 35 Tags 26 MiB
Commit Graph

2326 Commits

Author SHA1 Message Date
Max Wu e2b9ea8f15
Merge pull request #1136 from Dylanderv/feature/lutim 
Add support for file hosting with lutim
 2019-08-01 00:37:25 +08:00
Max Wu 62918134c0
Merge branch 'develop' into feature/lutim 2019-08-01 00:22:23 +08:00
Max Wu 9f16f32675 Merge branch 'master' into develop 2019-08-01 00:04:26 +08:00
Raccoon ba0e4df6b7
Merge pull request #1228 from hackmdio/refactor-realtime 
Refactor realtime
 2019-07-31 22:38:10 +08:00
BoHong Li 79af236405
test: Note.update should returns an array 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-07-30 18:32:31 +08:00
BoHong Li c628737411
Merge branch 'develop' into refactor-realtime 
Signed-off-by: BoHong Li <raccoon@hackmd.io>

# Conflicts:
#	README.md
#	package.json
 2019-07-30 18:20:09 +08:00
BoHong Li 0f51d1e306
fix: change note permission cause error 
Signed-off-by: BoHong Li <raccoon@hackmd.io>
 2019-07-30 18:09:17 +08:00
Max Wu 7f6020695e
Fix js-sequence-diagrams bundling (#1243) 
Fix js-sequence-diagrams bundling
 2019-07-29 16:51:23 +08:00
Max Wu ce914ad276
Upgrade mermaid to 8.2.3 (#1242) 
Upgrade mermaid to 8.2.3
 2019-07-29 09:31:10 +08:00
Yukai Huang 5e1eeec71c
Fix js-sequence-diagrams bundling 
Signed-off-by: Yukai Huang <yukai@hackmd.io>
 2019-07-29 00:36:33 +08:00
Max Wu fadc599fe7 Merge branch 'develop' 2019-07-28 20:37:25 +08:00
Max Wu bb0247ae79 Merge branch 'develop' into feature/upgrade-mermaid-for-xss 2019-07-28 20:15:37 +08:00
Max Wu ec2b040781 feat: update README.md for ToC 
Signed-off-by: Max Wu <jackymaxj@gmail.com>
 2019-07-28 20:15:29 +08:00
Max Wu 282a79f9e9 Merge branch 'develop' into feature/upgrade-mermaid-for-xss 2019-07-28 20:12:36 +08:00
Max Wu 688ca95164 feat: update README.md for ToC 
Signed-off-by: Max Wu <jackymaxj@gmail.com>
 2019-07-28 20:10:40 +08:00
Max Wu f1680ef7fa fix: code style 
Signed-off-by: Max Wu <jackymaxj@gmail.com>
 2019-07-28 20:04:41 +08:00
Max Wu dd267096c9 fix: use lodash escapeHTML 
Signed-off-by: Max Wu <jackymaxj@gmail.com>
 2019-07-28 20:04:41 +08:00
Max Wu a7082633aa Upgrade mermaid to 8.2.3 
to avoid XSS inside the svg tag

Signed-off-by: Max Wu <jackymaxj@gmail.com>
 2019-07-28 20:04:41 +08:00
Max Wu 76c7b70246 Merge branch 'master' into develop 
# Conflicts:
#	README.md
 2019-07-28 19:47:08 +08:00
Max Wu 8947c89da5 Update links of Gitter, POEditor and Travis CI 2019-07-28 19:00:17 +08:00
Max Wu b26d75f054
Make toobusy.maxLag configurable (#1239) 
Make toobusy.maxLag configurable
 2019-07-18 13:20:40 +08:00
Toshinori Notake 4e91268e1f Make toobusy.maxLag configurable 
Signed-off-by: Toshinori Notake <toshi.notake.43568@gmail.com>
 2019-07-18 13:57:14 +09:00
Raccoon d5f60d8c63
Merge pull request #1169 from pastleo/feature/slides-spotlight 
add spotlight feature
 2019-06-27 17:37:33 +08:00
Yukai Huang f3a3c14aca
Merge branch 'develop' into feature/slides-spotlight 2019-06-27 17:37:16 +08:00
Raccoon 2f3f3c56a8
Merge pull request #1162 from pastleo/feature/slides-timer 
add feature: elapsed-time-bar in slides mode
 2019-06-27 17:35:19 +08:00
Raccoon a338346261
Merge branch 'develop' into feature/slides-timer 2019-06-27 17:34:47 +08:00
Raccoon b6d6eb3639
Merge branch 'develop' into feature/slides-spotlight 2019-06-27 17:33:40 +08:00
Raccoon a4fdb4f4b7
Merge pull request #1227 from hackmdio/feature/upgrade-codemirror 
Update codemirror to 5.46.2
 2019-06-27 17:32:13 +08:00
Raccoon 231c7a7033
Merge pull request #1211 from gndu91/develop 
Adding an error code to the `{"status":"forbidden"}` response
 2019-06-27 17:29:17 +08:00
Yukai Huang d7fa4000c2
Update codemirror to 5.46.2 
Signed-off-by: Yukai Huang <yukaihuangtw@gmail.com>
 2019-06-27 17:24:47 +08:00
Yukai Huang e315127d31
Merge branch 'master' into feature/slides-timer 2019-06-26 11:39:22 +08:00
Yukai Huang d5a5ebc4d0
Merge branch 'master' into feature/slides-spotlight 2019-06-26 11:39:19 +08:00
Raccoon d4aea92488
Merge pull request #1226 from evilscientress/feature/flowchart.js-v1.12.0-update 
updated flowchart.js to v1.12.0 closing #1225
 2019-06-24 11:51:41 +08:00
Jenny Danzmayr df101168d4
updated flowchart.js to v1.12.0 
Signed-off-by: Jenny Danzmayr <mail@evilscientress.at>
 2019-06-24 05:13:13 +02:00
BoHong Li b41de7820c
doc: change travis-ci badge to travis-ci.com 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-28 10:03:46 +08:00
BoHong Li 2f8f912565
ci: update 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 18:35:35 +08:00
BoHong Li 3d48eb67fb
ci: update 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 18:29:30 +08:00
BoHong Li a1836b3c28
doc: update toc 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:56:50 +08:00
BoHong Li a1bb450f47
ci: refind config 2019-05-27 17:53:10 +08:00
BoHong Li cc5aaa1228
chore: cleanup jsonlint output, only show filename and error 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:08 +08:00
BoHong Li 6b549d3642
fix: move babel-polyfill to dependency 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:08 +08:00
BoHong Li a6036cb70b
refactor: back to use js-standard 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:08 +08:00
BoHong Li 1ac6434ab7
refactor(realtime): parseNoteIdFromSocket to async-await style function 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:08 +08:00
BoHong Li 17e82c11c9
refactor(realtime): connection flow to queue 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:07 +08:00
BoHong Li 0b03b8e9ba
refactor(realtime): ifMayEdit 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:07 +08:00
BoHong Li e773182db0
refactor(realtime): updateNote 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:07 +08:00
BoHong Li 2dedc84e28
refactor(realtime): extract "save note as revision" to job 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:06 +08:00
BoHong Li ab37a33e0b
refactor(realtime): add test case for clean dangling user 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:06 +08:00
BoHong Li d8b18ee241
refactor(realtime): disconnect flow 
1. use queue for queueing disconnect request

Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:06 +08:00
BoHong Li f892c68e30
refactor(realtime): update dirty note job 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-05-27 17:53:06 +08:00