Commit Graph

245 Commits (940cc2420c64965e7f7b363cd8a9f3b7f10c84ec)

Author SHA1 Message Date
gsw945 8d92550458 fix error `mindoc:runtime error: invalid memory address or nil pointer dereference` 2022-05-18 11:17:03 +08:00
玖亖伍 07204d6d7f 评论功能修复 2022-05-14 20:54:59 +08:00
玖亖伍 a5dfdb4b6e
Merge branch 'master' into master 2022-05-09 18:19:08 +08:00
gsw945 8ff4c28927 Merge branch 'master' of https://github.com/gsw945/mindoc into master 2022-05-07 18:17:38 +08:00
gsw945 0671b0cd40 企业微信登录初步调通 2022-05-07 18:06:46 +08:00
wangbin13 0d0582c37c Merge remote-tracking branch 'upstream/master' 2022-03-05 18:29:59 +08:00
Augists a877083e96 add support for importing docx file 2022-02-11 11:10:58 +08:00
玖亖伍 1609d385c0
Merge pull request #724 from xieyg7919/master
修复项目图标上传的BUG
2021-09-28 13:48:48 +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 354f32be38 update wangEditor 2021-08-25 17:32:31 +08:00
玖亖伍 ee9de3a513
Merge pull request #680 from shiqstone/master
Update to support internationalization
2021-04-30 13:48:46 +08:00
LawyZHENG f8160981f3 fix(document): fail to count times when cache is enabled. 2021-04-25 16:05:05 +08:00
shiqstone f02ff935fe update for init i18n 2021-04-21 22:00:03 +08:00
shiqstone 0fb6fcb114 fix bug for i18n and beego v2 2021-04-21 20:44:19 +08:00
shiqstone 4ad0fe74d0 merge from mindoc-org/mindoc and resolved conflict 2021-04-21 20:40:54 +08:00
shiqstone 883fcec5b2 update i18n(template) 2021-04-21 13:37:47 +08:00
shiqstone cb70c35037 refactor, fix bug and update i18n(management), to be continue 2021-04-21 12:22:34 +08:00
shiqstone d9e2b0bc8b refactor, fix bug and update i18n(user center), to be continue 2021-04-19 14:32:55 +08:00
shiqstone 93d377f3b9 refactor, fix bug and update i18n(blog), to be continue 2021-04-19 11:24:12 +08:00
shiqstone 25e06a767b refactor, fix bug and update i18n(search), to be continue 2021-04-18 14:45:04 +08:00
shiqstone 6eb26fcb23 User
refactor and update i18n, to be continue
2021-04-12 21:12:26 +08:00
wangbin8909 b21035bbfd Merge remote-tracking branch 'upstream/master' 2021-04-11 17:19:54 +08:00
shiqstone a5682f1308 refactor and update i18n, to be continue 2021-04-11 01:20:47 +08:00
wangbin05 27dea7b8bd 提交评论时,判断文章是否存在。删除时判断是否有权限删除。 2021-04-04 16:44:14 +08:00
wangbin05 3d12583eba 增加删除评论 2021-04-03 22:44:43 +08:00
wangbin05 7fb0e66ddc 增加评论功能 2021-04-03 17:40:08 +08:00
roberChen 47a5d5b05c Merge branch 'master' into new-beego-path 2021-04-01 11:33:19 +08:00
wangbin05 323378c0ae 增加阅读次数 2021-04-01 09:23:55 +08:00
wangbin05 5b274ce836 增加文章阅读次数 2021-03-31 19:32:18 +08:00
Ben Stone ec2888940e refactor and add i18n, to be continue 2021-03-30 19:08:50 +08:00
shiqstone 1239620f75 refactor and add i18n, to be continue 2021-03-30 16:18:02 +08:00
shiqstone 782ea44388 refactor, replace beego.Error with logs.Error 2021-03-30 14:24:14 +08:00
Ben Stone 0d5d2e4b38
Update BaseController.go
fix bug, change wrong import
2021-03-29 18:41:10 +08:00
Ben Stone 0694b4554b
Update BaseController.go
i18n, get lang set from url param
2021-03-29 17:56:36 +08:00
roberChen debc3aa5c9 fix(all): don't use adapter in FuncMap and Filter etc. 2021-03-26 15:37:19 +08:00
roberChen 967ef37ce9 chore: use core/logs
- depretace all adapter/logs to core/logs
2021-03-26 14:26:19 +08:00
roberChen 916c9c6c2a fix(models): use client/orm instead of adapter/orm
- using new orm api, change some related logics
- newer orm api has the concept of TxOrmer, for purpose of transaction
handling. A transaction ormer in v2 is a stateful object, it should be
dropped after using. A Ormer object is stateless and thread(routine)
    safe, and should not be used for transaction handling. More details
    count be found at official doc:
    https://beego.me/docs/mvc/model/orm.md, and pr note: https://github.com/mindoc-org/mindoc/pull/662#issuecomment-807040262
2021-03-26 11:34:02 +08:00
roberChen 8b7d56a547 Merge branch 'master' into new-beego-path 2021-03-26 10:43:54 +08:00
LawyZHENG 5404db07eb "dingtalk QR login" frontend 2021-03-25 16:30:12 +08:00
LawyZHENG c768845a45 "dingtalk QR login" button auto appears when dingtalk_corpid is set 2021-03-25 15:31:24 +08:00
LawyZHENG ae780418b5 make "dingtalk QR login" configurable 2021-03-25 15:17:38 +08:00
LawyZHENG 9b94192d99 backend for dingtalk QR login 2021-03-25 15:03:35 +08:00
roberChen 272316f7b4 Merge branch 'master' into new-beego-path 2021-03-25 11:49:39 +08:00
roberChen 2d05b5a80f fix(config): use web.AppConfig instead of adapter
- use web.AppConfig, and change related codes

TODO: handles errors
2021-03-25 10:42:18 +08:00
LawyZHENG 9141487aa3 钉钉免登显示钉钉用户名和头像,配置XSRF,修复一些BUG 2021-03-25 10:04:15 +08:00
LawyZHENG d4f743b7f2 取消临时登录接口 2021-03-24 14:13:36 +08:00
LawyZHENG 34499969cc 修复第一次登录失败的BUG 2021-03-24 13:13:23 +08:00
roberChen 9babd8106c chore: clean import errors for beego update 2021-03-24 00:28:13 +08:00
roberChen 90c1329de2 chore!(all): attempt to update beego to v2
BREAKING CHANGE: beego has update to v2, and this version of mindoc IS
NOT TESTED AND STABLE!!!
2021-03-23 21:55:50 +08:00
LawyZHENG 6f06e72411 Merge branch 'dev/pkg-upgrade'
# Conflicts:
#	commands/command.go
#	commands/daemon/daemon.go
#	controllers/AccountController.go
#	controllers/DocumentController.go
#	models/Member.go
#	models/TeamMember.go
#	models/comment_vote.go
2021-03-23 19:28:22 +08:00