Commit Graph

435 Commits

Author SHA1 Message Date
xxq250 9a92a8c58c Merge branch 'pre_trustie_server' into trustie_server 2023-03-03 10:27:39 +08:00
chenjing 8e547c178a 后台组织管理 2023-03-02 17:54:34 +08:00
xxq250 81aa786121 Merge branch 'pre_trustie_server' into trustie_server 2023-02-17 15:01:58 +08:00
xxq250 a35e24468c Merge branch 'standalone_develop' into pre_trustie_server 2023-02-17 15:01:20 +08:00
xxq250 3c51d69555 调整Bot授权接口 2023-02-16 09:57:25 +08:00
xxq250 6fe16c7c82 调整Bot授权接口 2023-02-16 09:19:37 +08:00
xxq250 1cd43de75b 增加Bot授权相关 2023-02-15 18:37:36 +08:00
yystopf 11cbe170bc Merge branch 'pre_trustie_server' into trustie_server 2023-02-10 16:21:23 +08:00
yystopf e423e8d20b merge from stadalone_develop 2023-02-10 16:20:47 +08:00
yystopf 3a14aa10ce Merge branch 'develop' into standalone_develop 2023-02-10 13:44:43 +08:00
yystopf 7c911f5b86 新增:路由匹配特殊符号 2023-02-06 09:49:36 +08:00
yystopf 2772b97e32 新增:标签列表和删除接口 2023-02-03 18:03:57 +08:00
yystopf 8b90164247 新增:删除分支接口 2023-02-03 15:03:59 +08:00
yystopf a0f386950b Merge branch 'pre_trustie_server' into trustie_server 2023-02-03 14:12:23 +08:00
yystopf 8e94b28ba8 Merge branch 'standalone_develop' into pre_trustie_server 2023-02-03 14:11:05 +08:00
yystopf f2cdba29ea 新增:更改默认分支接口 2023-02-03 13:45:32 +08:00
yystopf 08d8abd163 Merge branch 'develop' into standalone_develop 2023-02-01 14:26:52 +08:00
yystopf 0229d99e74 新增:后台管理排行榜数据 2023-02-01 14:25:55 +08:00
xxq250 fbc8d68996 Merge branch 'standalone_develop' into pre_trustie_server 2022-12-26 11:31:11 +08:00
xxq250 911fb2712a fixed qq认证密钥读取错误 2022-12-09 17:55:09 +08:00
xxq250 309ba151be fixed qq认证密钥读取错误 2022-12-09 17:54:34 +08:00
xxq250 98fb7308a6 Merge branch 'pre_trustie_server' into trustie_server 2022-12-08 14:54:06 +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 983f488177 fixed 第三方授权登录配置支持Get方法 2022-12-08 14:31:20 +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 ee27c90205 fixed qq命名调整,方便封装 2022-12-06 10:24:48 +08:00
xxq250 73d89a89e2 fixed 第三方授权登录配置url 2022-12-06 10:12:41 +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 ae9f98dae5 Merge branch 'pre_trustie_server' into trustie_server 2022-12-02 16:07:28 +08:00
xxq250 86cd8309c4 Merge branch 'standalone_develop' into pre_trustie_server 2022-12-02 16:06:53 +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
xxq250 604f5329e2 Merge branch 'standalone_develop' into pre_trustie_server 2022-11-25 16:07:40 +08:00
yystopf 22450c2748 Merge branch 'pre_trustie_server' into trustie_server 2022-11-25 15:59:12 +08:00
yystopf 04e8db8b3e Merge branch 'standalone_develop' into pre_trustie_server 2022-11-25 15:39:53 +08:00
xxq250 4e244bed3a 增加手机验证码校验 2022-11-24 14:28:49 +08:00
xxq250 fd2b20ed87 个人资料修改手机号 2022-11-24 11:09:58 +08:00
“xxq250” 5d2c27ad84 Merge branch 'pre_trustie_server' into trustie_server 2022-11-11 14:58:05 +08:00
“xxq250” a66920089b fixed 合并代码 2022-11-11 14:56:37 +08:00
yystopf 4687a51327 Merge branch 'pre_trustie_server' into trustie_server 2022-11-11 14:55:53 +08:00
yystopf 7cf556809d merge from stadalone_develop 2022-11-11 14:55:41 +08:00
“xxq250” 69037beee2 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-11-11 14:55:00 +08:00
“xxq250” babcb16c41 fixed 埋点记录 2022-11-11 14:54:54 +08:00
yystopf 84bfdf749f Merge branch 'develop' into standalone_develop 2022-11-11 12:25:46 +08:00
yystopf b56930b9ab 修复:反馈意见发送邮件失败错误返回 2022-11-11 12:25:25 +08:00