Commit Graph

1456 Commits

Author SHA1 Message Date
fb2e2d9534 merge from develop 2022-06-24 14:18:53 +08:00
7cad953413 新增: 用户项目列表支持多个参数 2022-06-23 18:16:57 +08:00
fe58175ee0 新增: webhooks使用token访问的接口 2022-06-23 16:14:00 +08:00
5d0849a148 新增: 用户项目列表以及helper方法 2022-06-23 12:19:03 +08:00
d14bf35ca1 修复: gitea module命名重复问题 2022-06-23 11:33:11 +08:00
d7dd3901b8 新增: 项目详情 2022-06-22 19:08:14 +08:00
aefd6c08dc 新增: gitea-client引入以及路由定义 2022-06-21 17:39:11 +08:00
430582aa3d Merge branch 'develop' into standalone_develop 2022-06-21 11:18:28 +08:00
9221e55752 修复: 邀请链接跳转用户已加入仓库的提示以及项目申请记录只创建一条 2022-06-21 11:18:14 +08:00
d6bbc7554f Merge branch 'develop' into standalone_develop 2022-06-20 16:38:06 +08:00
ba1fa8b685 修复: 项目邀请链接私有项目无法访问的情况 2022-06-20 16:37:59 +08:00
7ba77680ac Merge branch 'develop' into standalone_develop 2022-06-20 16:36:10 +08:00
29e3a55a0c 修复: 项目邀请链接私有项目无法访问的情况 2022-06-20 16:36:01 +08:00
7e5d5e31e5 merge from develop 2022-06-20 10:21:10 +08:00
45b7f70d9f 新增:项目邀请链接增加时间限制,以及show_link接口新增 2022-06-20 10:16:39 +08:00
1ebb6cb561 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-20 09:34:29 +08:00
xiaoxiaoqiong
1f9caeece5 auth2接入 2022-06-17 17:02:24 +08:00
f6fb50529c 新增: 邀请项目链接接口文档 2022-06-17 14:06:59 +08:00
c42f3d5928 新增:邀请用户链接生成 2022-06-17 14:06:59 +08:00
xiaoxiaoqiong
f727e8f94e 用户头像访问取消权限制 2022-06-11 12:35:21 +08:00
e69fe13745 merge from develop 2022-06-01 10:03:29 +08:00
877948b0cd 新增: 通用消息模板后台创建 2022-06-01 10:00:57 +08:00
b785406ab8 Merge branch 'develop' into standalone_develop 2022-05-31 16:34:20 +08:00
9427db3e5a 新增: 通用消息模板 2022-05-31 16:34:08 +08:00
xiaoxiaoqiong
f66e951f31 Merge branch 'develop' into standalone_develop 2022-05-30 11:19:13 +08:00
xiaoxiaoqiong
d6fd85f536 Repository.url重写,导入项目时为空 2022-05-30 11:18:24 +08:00
xiaoxiaoqiong
331dfa4b12 Merge branch 'develop' into standalone_develop 2022-05-30 10:26:35 +08:00
xiaoxiaoqiong
6448a30e03 render_error替换成tip_exception 2022-05-30 10:25:43 +08:00
xiaoxiaoqiong
17fb43cea8 render_error替换成tip_exception 2022-05-30 10:24:39 +08:00
xiaoxiaoqiong
e76822eb34 fixed ci报错200处理 2022-05-27 16:54:09 +08:00
2a387ad997 Merge branch 'develop' into standalone_develop 2022-05-27 10:48:38 +08:00
a6e50d2a25 修复 devops无法激活项目的问题 2022-05-27 10:48:20 +08:00
19ec81e975 Merge branch 'develop' into standalone_develop 2022-05-25 11:47:44 +08:00
2ea78b4f20 增加: 已登录用户对用户名、邮箱、电话进行校验 2022-05-25 11:47:35 +08:00
ad9bb8e542 修复: 合并从develop 2022-05-24 18:10:20 +08:00
e36c7a4b6a 修复: 邮箱搜索不需要return 404 2022-05-24 18:09:36 +08:00
9979c87d0c 修复: 合并从develop 2022-05-24 17:27:24 +08:00
8e8ec821f2 新增: 根据邮箱来获取用户 2022-05-24 17:26:10 +08:00
xiaoxiaoqiong
85a36ca2e7 fixed 增加自动登录,gitea注册 2022-05-24 14:14:57 +08:00
xiaoxiaoqiong
75cef14605 fixed 增加自动登录,gitea注册 2022-05-24 14:08:33 +08:00
xiaoxiaoqiong
b45ee11239 fixed 增加自动登录,gitea注册 2022-05-24 13:46:58 +08:00
xiaoxiaoqiong
643a99fdf1 fixed 增加自动登录,gitea注册 2022-05-24 11:48:56 +08:00
183eb15c7d Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-05-24 11:03:59 +08:00
fb43268444 fix: merge from develop 2022-05-24 11:03:54 +08:00
c27cc063e6 add: new update user info simple and sync gitea 2022-05-24 10:59:52 +08:00
xiaoxiaoqiong
b673909f9e fixed 增加自动登录,手机号先记录,后续用 2022-05-24 10:47:17 +08:00
xiaoxiaoqiong
ee3a14fa28 fixed 增加自动登录 2022-05-24 10:34:31 +08:00
xiaoxiaoqiong
26bfc2c0bf fixed 增加自动登录 2022-05-24 10:33:21 +08:00
xiaoxiaoqiong
2959414d56 fixed 增加自动登录 2022-05-24 10:25:58 +08:00
xiaoxiaoqiong
0ae3544235 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
# Conflicts:
#	app/controllers/users_controller.rb
#	app/helpers/application_helper.rb
2022-05-23 18:06:24 +08:00