cutototo
/
forgeplus
forked from Gitlink/forgeplus
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,856 Commits 29 Branches 0 Tags 560 MiB
Commit Graph

3856 Commits

Author SHA1 Message Date
xxq250 b4d43c44c8 Merge branch 'standalone_develop' into pre_trustie_server 2022-12-08 18:15:56 +08:00
xxq250 487630ad1c fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:28:31 +08:00
xxq250 3db761e2ae fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:25:54 +08:00
xxq250 988ebf3fc3 fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:19:03 +08:00
xxq250 6350d2e5a9 fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:19:02 +08:00
xxq250 19b6737260 Merge branch 'standalone_develop' into pre_trustie_server 2022-12-08 14:53:33 +08:00
xxq250 1aab51104f fixed 第三方授权登录配置支持Get方法 2022-12-08 14:35:46 +08:00
yystopf a01c98164a Merge branch 'develop' into standalone_develop 2022-12-08 11:52:38 +08:00
yystopf dfa0f1161d Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-12-08 11:52:06 +08:00
yystopf bc6f5cec4d 新增：仓库贡献者行数查询接口 2022-12-08 11:51:59 +08:00
xxq250 7b724cfeca fixed 用户简介支持表情 2022-12-07 15:36:33 +08:00
xxq250 2238c8fcbb fixed qq命名调整，方便封装 2022-12-06 10:27:04 +08:00
xxq250 ee27c90205 fixed qq命名调整，方便封装 2022-12-06 10:24:48 +08:00
xxq250 73d89a89e2 fixed 第三方授权登录配置url 2022-12-06 10:12:41 +08:00
xxq250 534ee80523 Merge remote-tracking branch 'origin/develop' into develop 2022-12-05 17:46:25 +08:00
xxq250 daf7514afe fixed 第三方授权登录配置 2022-12-05 17:46:21 +08:00
xxq250 e41adbc4a8 fixed 第三方授权gitee登录 2022-12-05 15:50:57 +08:00
xxq250 ed7c5b0a2d fixed 第三方授权gitee登录 2022-12-05 15:49:59 +08:00
xxq250 86cd8309c4 Merge branch 'standalone_develop' into pre_trustie_server 2022-12-02 16:06:53 +08:00
xxq250 ea187a59a0 fixed 随机密码防止溢出 2022-12-02 15:38:56 +08:00
xxq250 77087345c8 fixed 异常日志 2022-12-02 15:30:43 +08:00
xxq250 05702872b3 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-12-02 15:18:01 +08:00
xxq250 1fc79535ad fixed 错误对象 2022-12-02 15:17:57 +08:00
yystopf af8183485e merge from develop 2022-12-02 14:04:23 +08:00
yystopf 4b1f1c697e 更改：下载excel文件不走跳转 2022-12-02 13:59:41 +08:00
yystopf 77c7acd582 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-12-02 12:11:30 +08:00
yystopf 025a6a53e9 修复：图片无法下载的问题 2022-12-02 12:11:24 +08:00
xxq250 0747fc6849 fixed 用户名称统一nickname 2022-12-02 11:16:13 +08:00
xxq250 cbe10b4b89 fixed 第三方授权登录(github,gitee,qq,wechat)，输出URL到前端 2022-12-01 18:03:06 +08:00
xxq250 5717d0c69f Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-12-01 17:52:27 +08:00
xxq250 6b846b10bb fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:51:54 +08:00
xxq250 feb8c66e4b Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/controllers/concerns/register_helper.rb
#	app/controllers/oauth/base_controller.rb
 2022-12-01 17:48:11 +08:00
xxq250 763d7b499e fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:22:22 +08:00
yystopf 4683b20b3d Merge branch 'develop' into standalone_develop 2022-11-29 17:09:00 +08:00
yystopf 9b39446dfb 修复：提交文件内容格式由前端决定 2022-11-29 17:08:26 +08:00
yystopf c6e77ac7ee 修复：提交文件未创建新分支时为空判断 2022-11-29 17:02:10 +08:00
yystopf f5cdb6f02d 新增：旧统计接口移除处理 2022-11-29 14:31:14 +08:00
xxq250 ed335375bb Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-11-28 16:56:51 +08:00
xxq250 f818a3ac91 fixed 用户名称统一用昵称 2022-11-28 16:56:46 +08:00
yystopf 520ed80224 更改：gitlink特殊表更改 2022-11-28 11:43:37 +08:00
yystopf 90ef8f2f2e Merge branch 'develop' into standalone_develop 2022-11-28 11:42:33 +08:00
yystopf f7ca03db81 修复：通用分支移除projects_activity表修改 2022-11-28 11:41:36 +08:00
xxq250 66a1be944a fixed 组织用户不存在 2022-11-28 11:20:44 +08:00
xxq250 8da8b021f6 Merge remote-tracking branch 'origin/develop' into develop 2022-11-28 11:20:01 +08:00
xxq250 70ba78a9b5 fixed 组织用户不存在 2022-11-28 11:19:56 +08:00
yystopf 6191ddd233 修复：通用分支移除声明表修改 2022-11-28 10:57:05 +08:00
xxq250 901e5b0358 Merge branch 'pre_trustie_server' of https://gitlink.org.cn/Trustie/forgeplus into pre_trustie_server 2022-11-25 16:07:57 +08:00
xxq250 604f5329e2 Merge branch 'standalone_develop' into pre_trustie_server 2022-11-25 16:07:40 +08:00
yystopf 04e8db8b3e Merge branch 'standalone_develop' into pre_trustie_server 2022-11-25 15:39:53 +08:00
xxq250 ee0f09c8fa Merge branch 'develop' into standalone_develop 2022-11-25 14:19:20 +08:00