Commit Graph

994 Commits (master)
 

Author SHA1 Message Date
wangbin13 a97eb0adb1 Update pagination.go 2022-03-06 14:18:24 +08:00
wangbin13 0d0582c37c Merge remote-tracking branch 'upstream/master' 2022-03-05 18:29:59 +08:00
wangbin13 1eccb69105 Update setting.tpl 2022-03-05 18:15:38 +08:00
sloong 68cfc08e24 fix #776: 修复在mysql8.0中由于member关键词导致系统无法正常使用的异常 2022-03-03 11:38:11 +08:00
玖亖伍 cf628f06ca
Merge pull request #770 from Augists/master
add support for importing docx file
2022-02-24 14:50:26 +08:00
Augists 6703b97a01 remove .docx in name of directory
use /upload/filename(without .docx)/media/imagename.ext
2022-02-15 14:36:05 +08:00
Augists 247dbe8a2d fix image path
use /upload/filename/media/imagename.ext
2022-02-15 10:08:01 +08:00
Augists 63c0ac0a1d add support for importing docx file as book 2022-02-11 16:37:42 +08:00
Augists f3c1c4bd3a html accept docx 2022-02-11 13:42:26 +08:00
Augists 4eec37e7c9 fix bugs 2022-02-11 13:31:03 +08:00
Augists 42c82450ed import but not use 2022-02-11 13:11:59 +08:00
Augists 7de992adb0 woshishazi 2022-02-11 11:36:30 +08:00
Augists 2733498933 fix not enough return 2022-02-11 11:34:29 +08:00
Augists 9bb4f5a5db util -> utils in docx2md 2022-02-11 11:29:12 +08:00
Augists a877083e96 add support for importing docx file 2022-02-11 11:10:58 +08:00
gsw945 50888fb134 新版 mermaid 不需要css文件,移除不存在的css引用 2021-12-27 13:40:37 +08:00
玖亖伍 1c765f3aad
Merge pull request #757 from skiy/patch-1
Update docker-compose.yml
2021-12-24 10:48:31 +08:00
Skiy Chan e28969ea8c
Update docker-compose.yml
修复 docker 镜像路径
2021-12-23 22:55:04 +08:00
玖亖伍 80c89efc6d
Update README.md
更新 演示站点&文档
2021-12-23 12:26:51 +08:00
玖亖伍 c0a91d0547
Merge pull request #745 from jh244212647/master
fix last item be cover after add view_count feature
2021-11-25 16:13:36 +08:00
zhang sheng 88d2207abe fix last item be cover after add view_count feature
修复增加阅读次数后,目录最后一项会被盖住的问题
2021-11-01 22:44:25 +08:00
玖亖伍 e0fb5a67f7
修复docker-compose.yml中volumes配置错误 2021-10-15 15:02:04 +08:00
玖亖伍 8ad0084d12
docker镜像版本更新(v2.1-beta.5) 2021-10-15 13:46:11 +08:00
gsw945 85e31ae106 ubuntu源修复、calibre-github-release下载加速 2021-10-15 12:16:06 +08:00
玖亖伍 552cac764f
Update Dockerfile: 移除apt-get清华源 2021-10-11 18:15:50 +08:00
玖亖伍 654ec053bc
Merge pull request #732 from jh244212647/master
update mermaid and change editormd.js to editormd.min.js
2021-10-09 18:35:45 +08:00
玖亖伍 6715982ad5
Merge pull request #733 from meadlai/master
Update zh-cn.ini(`view_count`)
2021-10-09 18:33:47 +08:00
玖亖伍 c4d05d2a25
Merge pull request #735 from gsw945/master
add iframe support
2021-10-09 18:31:38 +08:00
gsw945 b624fea255 添加iframe支持(conf `enable_iframe`) 2021-10-09 18:23:57 +08:00
gsw945 8515abcd9d markdown编辑页面支持预览跳转 2021-10-09 16:33:11 +08:00
gsw945 019b4e8e1b wangEditor编辑器层级错误bug修复 2021-10-09 15:06:07 +08:00
gsw945 5e7aa98704 引入musl-gcc编译方式操作介绍 2021-10-09 15:05:33 +08:00
Gogs 65cd6b96b8 mindmap add custom-height setting
用户可以通过在```mindmap后追加>number的格式设定思维导图的高度
例如```mindmap>600即设定整体思维导图高度为600px
2021-10-08 17:27:44 +08:00
meadlai 04113a8bdd
Update zh-cn.ini 2021-10-02 22:39:43 +08:00
jh244212647 32a9f979a0
Merge branch 'mindoc-org:master' into master 2021-10-01 21:17:24 +08:00
zhang sheng 53714831f0 update mermaid and change editormd.js to editormd.min.js
可以制作饼图 状态图等图形并且更新editormd.js为editormd.min.js
可以使加载更快,min.js使用uglify-js压缩生成
2021-09-30 15:18:05 +00:00
玖亖伍 e0f6af036b
Merge pull request #731 from jh244212647/master
feature-mindmap: editor.md add mindmap
2021-09-28 13:50:33 +08:00
玖亖伍 1609d385c0
Merge pull request #724 from xieyg7919/master
修复项目图标上传的BUG
2021-09-28 13:48:48 +08:00
zhangsheng 1290dea30d feature-mindmap: editor.md add mindmap
主要在markdown编辑器中增加思维导图渲染方式,引入markmap开源组件
2021-09-24 14:37:52 +00:00
玖亖伍 dc386db159
Merge pull request #726 from gsw945/master
升级 wangEditor, 历史记录查看bug修复
2021-09-09 15:01:54 +08:00
gsw945 7a6a0c5ec0 Merge branch 'master' of https://github.com.cnpmjs.org/gsw945/mindoc into master 2021-09-09 15:00:03 +08:00
gsw945 6dcc714a3f 历史记录对比模板bug修复 2021-09-09 14:58:59 +08:00
玖亖伍 5cc4e14fc8
Merge branch 'mindoc-org:master' into master 2021-09-09 14:45:54 +08:00
gsw945 482305becd closes #699, closes #707, closes #711, closes #720;修复文档历史查看模板bug 2021-09-09 14:43:54 +08:00
xieyg7919 3a7ef4e153 修复项目图标上传的BUG
1.BookController.go中344行,拼接上传图片保存路径时未拼接working directory
2.graphics目录下copy.go文件11行,ImageCopy方法增加image.Paletted类型的处理
2021-09-07 17:06:20 +08:00
gsw945 2ede417d40 adjust layout and menus for wangEditor 2021-08-31 11:10:29 +08:00
玖亖伍 acdd2e2f4b
Update sync_host.sh
修复目录容器内不存在导致备份脚本失败的bug
2021-08-31 09:59:33 +08:00
gsw945 354f32be38 update wangEditor 2021-08-25 17:32:31 +08:00
玖亖伍 097af0077e
Merge pull request #712 from LawyZheng/master
Fix Bug 'Can't Connect to Redis' (Fix #708)
2021-08-11 09:59:20 +08:00
LawyZHENG 5aa7f01970 Merge branch 'master' of https://github.com/LawyZheng/mindoc 2021-08-08 11:20:51 +08:00