Commit Graph

996 Commits (master)
 

Author SHA1 Message Date
玖亖伍 d391589a5a
Update .travis.yml
`zip` is installed already, it's no need for manual installation via `apt`
2021-04-01 14:27:40 +08:00
玖亖伍 3031593ca6
fixe error in .travis.yml 2021-04-01 14:22:18 +08:00
玖亖伍 aa6ac4e309
Update .travis.yml
use [Travis CI Build Config Explorer](https://config.travis-ci.com/explore) to validate `.travis.yml`
2021-04-01 14:19:08 +08:00
shiqstone e8d96b64fa refactor, add i18n for go.mod 2021-04-01 14:01:27 +08:00
玖亖伍 3fa2dd37de
Update README.md
- 链接修改
- 项目信息更新
2021-04-01 12:04:30 +08:00
roberChen 47a5d5b05c Merge branch 'master' into new-beego-path 2021-04-01 11:33:19 +08:00
玖亖伍 0dfaa423e1
Merge pull request #675 from wangbin8909/master
增加文章阅读次数
2021-04-01 11:10:28 +08:00
wangbin05 dc578c3b34 修改排版 2021-04-01 10:48:35 +08:00
wangbin05 323378c0ae 增加阅读次数 2021-04-01 09:23:55 +08:00
Ben Stone 9ef0260971 refactor and update i18n, to be continue 2021-03-31 20:46:38 +08:00
wangbin05 5b274ce836 增加文章阅读次数 2021-03-31 19:32:18 +08:00
Ben Stone 10f66681fb fix bug, update i18n 2021-03-31 17:36:52 +08:00
Ben Stone 581d902cd8 refactor and update i18n, to be continue 2021-03-31 17:13:05 +08:00
Ben Stone fa6643ae52
Update en-us.ini
refactor and update i18n, to be continue
2021-03-31 17:10:23 +08:00
Ben Stone f5518d73f7
Update app.conf.example
i18n, add default locale conf
2021-03-31 12:00:10 +08:00
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