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

2170 Commits

Author SHA1 Message Date
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
Jong-Kai Yang 4c44c7260f
Update README.md 2019-05-23 17:06:52 -07:00
Max Wu 5a73db42a9
Update README.md 2019-05-12 21:36:36 -04:00
Max Wu defa6c823a
Add Gitter channel to README.md 2019-05-12 21:35:43 -04:00
Jong-Kai Yang dd02fc3dad
Update README.md 2019-05-06 22:49:44 -07:00
GHOUL Nadir 779fa59dbb Adding an error code to the `{"status":"forbidden"}` response 
Signed-off-by: Ghoul Nadir <nadir.ghoul@outlook.com>
 2019-05-04 00:18:28 +02:00
Raccoon 65d8fd2613
Merge pull request #1205 from pan93412/develop_translation 
translation: Fix some translations in zh-TW
 2019-05-01 23:03:05 +08:00
pan93412 6f5ed461e2 translation: Fix some translations in zh-TW 
Signed-off-by: pan93412 <pan93412@gmail.com>
 2019-05-01 18:52:40 +08:00
Raccoon 440661f1ce
Merge pull request #1196 from toshi0123/fix_avoiding_crash 
Fix avoiding crash if URL is invalid
 2019-04-30 18:40:18 +08:00
Jong-Kai Yang 5606380235
Update README.md 2019-04-27 18:03:20 -07:00
Jong-Kai Yang 8ffb91a41d
Update README.md 2019-04-27 18:01:11 -07:00
Jong-Kai Yang 61733002c8
Update README.md 2019-04-27 17:54:53 -07:00
Jong-Kai Yang 57672a65c0
Update README.md 2019-04-23 19:58:54 -07:00
Jong-Kai Yang 45bb2c8592
Update README.md 2019-04-23 18:33:44 -07:00
Jong-Kai Yang 0599a325d2
Update README.md 2019-04-23 18:33:21 -07:00
Max Wu 535d740199
Merge pull request #1199 from hackmdio/fix/migration-should-return-promise 
fix: migration should return promise
 2019-04-19 13:07:55 -04:00
BoHong Li fc642e0d14
fix: migration should return promise 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-20 01:00:14 +08:00
toshi0123 eff6e04e2b
Fix avoiding crash if URL is invalid 
Signed-off-by: toshi0123 <7948737+toshi0123@users.noreply.github.com>
 2019-04-18 19:10:46 +09:00
BoHong Li 4e596d724d
Merge branch 'develop' of github.com:hackmdio/codimd into develop 2019-04-15 14:11:50 +08:00
BoHong Li 038803505c
doc: add default setting and README 2019-04-15 14:10:54 +08:00
Raccoon 48a68e015b
Merge pull request #1095 from Thor77/fix-1094 
Hide default ports from minio image upload urls
 2019-04-15 13:48:44 +08:00
Raccoon d127b8ef7f
Merge pull request #1142 from dg-i/configurable-s3-endpoint 
Make AWS S3 endpoint configurable
 2019-04-15 13:37:33 +08:00
BoHong Li 8c26107ab1
fix: lint 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-15 13:36:44 +08:00
Raccoon 43c0bff8c4
Merge pull request #1179 from cdancette/update-history-on-creation 
Update history on note creation
 2019-04-15 13:26:30 +08:00
Raccoon 602548cd24
Merge pull request #1194 from hackmdio/upgrade-dependency 
Upgrade dependency to fix vulnerabilities issue
 2019-04-15 13:21:35 +08:00
BoHong Li 97aecfa8d9
Merge branch 'master' into upgrade-dependency 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-15 13:13:10 +08:00
Raccoon 7a40fdca34
Merge pull request #1192 from hackmdio/fix/js-sequence-diagrams-reverse-signal 
fix: js-sequence-diagram
 2019-04-15 13:09:04 +08:00
BoHong Li 6c137ae6ed
fix: mattermost has been deprecated, use mattermost-redux instead it. 
1. change mattermost color and gitlab color to official color
2. Add mattermost icon because Fork-awesome/font-awesome doesn’t provide mattermost icon

Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-15 13:03:31 +08:00
BoHong Li 013ee9a72e
chore: upgrade dependency 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-15 13:03:31 +08:00
Max Wu 9d7413d596
Merge pull request #1193 from hackmdio/fix-render-view-error-msg-XSS 
Fix stored XSS in the graphviz error message rendering [Security Issue]
 2019-04-14 20:36:27 -04:00
Max Wu fbb18b6e0a Fix stored XSS in the graphviz error message rendering [Security Issue] 
Signed-off-by: Max Wu <jackymaxj@gmail.com>
 2019-04-14 12:12:02 -04:00
BoHong Li c8b59e7b30
fix: js-sequence-diagram 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-13 15:08:22 +08:00
Raccoon 1434cdb6b2
Merge pull request #1190 from hackmdio/refactor 
replace package with npm published version
 2019-04-12 19:02:43 +08:00
BoHong Li dc74a4c94e
fix: remove node 6 support 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-12 18:24:55 +08:00
BoHong Li 9a15af32f9
refactor: fix lint warning on bin/manage_users 
Signed-off-by: BoHong Li <a60814billy@gmail.com>
 2019-04-12 18:24:55 +08:00