mindoc-org
/
mindoc
mirror of https://github.com/mindoc-org/mindoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
981 Commits
8 Branches
38 Tags
127 MiB
Commit Graph

981 Commits (db620be8dfe8eec2e6a806318b2a8399bc5621a4)
 

Author SHA1 Message Date
Ben Stone ec2888940e refactor and add i18n, to be continue 2021-03-30 19:08:50 +08:00
Ben Stone 6cf68605bf refactor and add i18n, to be continue 2021-03-30 18:37:24 +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
roberChen bdaeefc784 fix(login): judging ldap_enable logic error 
review: https://github.com/mindoc-org/mindoc/pull/662#discussion_r603750715
 2021-03-30 11:45:56 +08:00
Ben Stone 0d5d2e4b38
Update BaseController.go 
fix bug, change wrong import
 2021-03-29 18:41:10 +08:00
Ben Stone ef03d5b0a9
Update header.tpl 
i18n
 2021-03-29 18:02:57 +08:00
Ben Stone 53310d4289
Update command.go 
load i18n langs config
 2021-03-29 18:00:24 +08:00
Ben Stone 0694b4554b
Update BaseController.go 
i18n, get lang set from url param
 2021-03-29 17:56:36 +08:00
Ben Stone 7ab07f2ce2
Create en-us.ini 
add i18n en-us config
 2021-03-29 17:52:29 +08:00
Ben Stone eb8f9aa8c4
Create zh-cn.ini 
add i18n zh config
 2021-03-29 17:51:59 +08:00
roberChen 94c233c03a chore(conf): set enablexsrf to false by default 
comment: https://github.com/mindoc-org/mindoc/pull/662#pullrequestreview-622656551
 2021-03-28 12:23:21 +08:00
玖亖伍 8e0e4071ab
Merge pull request #672 from gsw945/master 
update AppVeyor CI/CD config
 2021-03-27 21:45:38 +08:00
玖亖伍 e8ec1cce0e update AppVeyor CI/CD config 2021-03-27 21:40:36 +08:00
roberChen 3ab57e67ec chore: gitignore database file 2021-03-27 00:34:01 +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
玖亖伍 bae6826a97
Merge pull request #669 from LawyZheng/master 
Able to Login via Dingtalk QR Code
 2021-03-26 10:29:31 +08:00
玖亖伍 ac8efeef68
Merge pull request #670 from wangbin8909/master 
修改文档底部信息
 2021-03-26 10:13:45 +08:00
wangbin8909 786b7532cf Merge remote-tracking branch 'upstream/master' 
合并主干
 2021-03-26 08:50:38 +08:00
wangbin8909 79eefb56ac 修改文档底部信息，增加文档创建时间。 2021-03-26 08:43:33 +08:00
LawyZHENG ec5ce5c705 accelerate "dingtalk h5 auto login" speed 2021-03-25 16:54:53 +08:00
LawyZHENG 5404db07eb "dingtalk QR login" frontend 2021-03-25 16:30:12 +08:00
roberChen d069b7c515 fix(member): use client/orm insteal of adapter/orm 
- to avoid type check bug when comparing error, use newer api instead of
old adapter
 2021-03-25 15:32:44 +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 4e243e2d70 chore(member): add debug info print 2021-03-25 11:36:06 +08:00
玖亖伍 8ef7f5458c
Merge pull request #665 from LawyZheng/master 
add dingtalk login and sovle some problems in mobile mode
 2021-03-25 11:30:51 +08:00
LawyZHENG 0c8901ea05 修改配置文件 2021-03-25 10:48:44 +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
roberChen e3a792e6df Merge branch 'master' into new-beego-path 2021-03-24 21:26:43 +08:00
玖亖伍 ff2b850302
Merge pull request #664 from roberChen/master 
chore(doc): update build instruction
 2021-03-24 20:25:11 +08:00
roberChen 9884afc030 chore: update beego/v2 to latest commit 
- dont't use v2.0.1, there has bugs in this version
- update latest version using go get
 2021-03-24 20:16:11 +08:00
LawyZHENG 350bdc4d02 取消路由 2021-03-24 14:31:31 +08:00
LawyZHENG d4f743b7f2 取消临时登录接口 2021-03-24 14:13:36 +08:00
LawyZHENG 34499969cc 修复第一次登录失败的BUG 2021-03-24 13:13:23 +08:00
roberChen a5f28055a9 chore(doc): update build instruction 
- deprecate dep, use go mod
 2021-03-24 12:22:12 +08:00
roberChen b8881dffcd Merge branch 'master' into new-beego-path 2021-03-24 11:26:34 +08:00
玖亖伍 214a9e751e
Merge pull request #663 from wangbin8909/master 
1. 增加文档目录列表展开、收起功能
2. 编辑完成返回按钮，回到编辑前界面
 2021-03-24 10:00:24 +08:00
wangbin05 f616985036 1、增加文档目录列表展开、收起功能 
2、编辑完成返回按钮，回到编辑前界面
 2021-03-24 09:40:27 +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
LawyZHENG 6730f948e4 增加redis 2021-03-23 16:50:53 +08:00
LawyZHENG 9b3a94e4e9 移除Redis缓存，升级Beego v1.12，尝试解决部分设备无法登录问题 2021-03-23 15:54:05 +08:00