 yystopf
|
6de6e34a4e
|
Merge branch 'develop' into standalone_develop
|
2022-07-15 17:03:31 +08:00 |
|
yystopf
|
0dd062ce1c
|
新增: blobs和文件树接口及文档
|
2022-07-15 17:03:18 +08:00 |
|
yystopf
|
63cd6bb0a4
|
merge from develop
|
2022-07-15 14:04:02 +08:00 |
|
yystopf
|
24d83133e7
|
新增: 创建分支接口
|
2022-07-15 14:02:48 +08:00 |
|
yystopf
|
4ed3a9d478
|
修复:cherry pick doorkeeper配置
|
2022-07-14 18:13:06 +08:00 |
|
yystopf
|
d7a970e7d5
|
修复: oauth2 验证统一改为application控制器里的user_setup
|
2022-07-11 18:51:07 +08:00 |
xiaoxiaoqiong
|
915e689ef9
|
oauth2 增加client方式
|
2022-07-11 18:19:08 +08:00 |
|
xiaoxiaoqiong
|
e919b03e90
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-07-11 15:52:57 +08:00 |
|
xiaoxiaoqiong
|
4fa1a433fa
|
增加从webhook接收仓库日志记录
|
2022-07-11 15:52:38 +08:00 |
|
yystopf
|
f8b63ff02e
|
merge from develop
|
2022-07-07 13:47:47 +08:00 |
|
xiaoxiaoqiong
|
d1d7ae5b7f
|
fixed oauth2 管理员配置
|
2022-07-06 10:35:32 +08:00 |
|
xiaoxiaoqiong
|
eb0bda81e9
|
fixed oauth2 管理员配置
|
2022-07-06 10:30:23 +08:00 |
|
xiaoxiaoqiong
|
c50913495e
|
fixed oauth2 管理员配置
|
2022-07-06 10:27:35 +08:00 |
|
xiaoxiaoqiong
|
1bc7c48876
|
fixed oauth2 code授权方式登录default_scopes
|
2022-07-05 16:30:11 +08:00 |
|
xiaoxiaoqiong
|
14dd7a3b60
|
fixed oauth2 code授权方式登录
|
2022-07-05 15:27:10 +08:00 |
|
xiaoxiaoqiong
|
959191c8bb
|
fixed oauth2 code授权方式登录
|
2022-07-05 15:19:30 +08:00 |
|
xiaoxiaoqiong
|
abfefdf8eb
|
oauth2 code授权方式登录
|
2022-07-05 14:38:11 +08:00 |
|
yystopf
|
76cc185a1d
|
新增: 合并请求审核model
|
2022-06-29 17:16:29 +08:00 |
|
xiaoxiaoqiong
|
bdaca48fde
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2022-06-27 18:05:52 +08:00 |
|
xiaoxiaoqiong
|
41eedff819
|
auth token 接入验证登录接口
|
2022-06-27 18:05:46 +08:00 |
|
yystopf
|
fb2e2d9534
|
merge from develop
|
2022-06-24 14:18:53 +08:00 |
|
yystopf
|
fe58175ee0
|
新增: webhooks使用token访问的接口
|
2022-06-23 16:14:00 +08:00 |
|
yystopf
|
5d0849a148
|
新增: 用户项目列表以及helper方法
|
2022-06-23 12:19:03 +08:00 |
|
yystopf
|
d7dd3901b8
|
新增: 项目详情
|
2022-06-22 19:08:14 +08:00 |
|
yystopf
|
aefd6c08dc
|
新增: gitea-client引入以及路由定义
|
2022-06-21 17:39:11 +08:00 |
|
yystopf
|
7ba77680ac
|
Merge branch 'develop' into standalone_develop
|
2022-06-20 16:36:10 +08:00 |
|
xiaoxiaoqiong
|
c426467a68
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-06-20 15:38:48 +08:00 |
|
xiaoxiaoqiong
|
9fe8df3c1b
|
auth token过期时间7天
|
2022-06-20 15:38:42 +08:00 |
|
yystopf
|
7e5d5e31e5
|
merge from develop
|
2022-06-20 10:21:10 +08:00 |
|
yystopf
|
45b7f70d9f
|
新增：项目邀请链接增加时间限制，以及show_link接口新增
|
2022-06-20 10:16:39 +08:00 |
|
yystopf
|
1ebb6cb561
|
Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop
|
2022-06-20 09:34:29 +08:00 |
|
yystopf
|
21ccedab9c
|
修复: doorkeeper 无法生成jwt token
|
2022-06-17 18:33:37 +08:00 |
|
xiaoxiaoqiong
|
1f9caeece5
|
auth2接入
|
2022-06-17 17:02:24 +08:00 |
|
yystopf
|
c42f3d5928
|
新增：邀请用户链接生成
|
2022-06-17 14:06:59 +08:00 |
|
yystopf
|
e69fe13745
|
merge from develop
|
2022-06-01 10:03:29 +08:00 |
|
yystopf
|
877948b0cd
|
新增: 通用消息模板后台创建
|
2022-06-01 10:00:57 +08:00 |
|
yystopf
|
19ec81e975
|
Merge branch 'develop' into standalone_develop
|
2022-05-25 11:47:44 +08:00 |
|
yystopf
|
2ea78b4f20
|
增加: 已登录用户对用户名、邮箱、电话进行校验
|
2022-05-25 11:47:35 +08:00 |
|
yystopf
|
9979c87d0c
|
修复: 合并从develop
|
2022-05-24 17:27:24 +08:00 |
|
yystopf
|
8e8ec821f2
|
新增: 根据邮箱来获取用户
|
2022-05-24 17:26:10 +08:00 |
|
yystopf
|
fb43268444
|
fix: merge from develop
|
2022-05-24 11:03:54 +08:00 |
|
yystopf
|
c27cc063e6
|
add: new update user info simple and sync gitea
|
2022-05-24 10:59:52 +08:00 |
|
yystopf
|
59db914bcc
|
change route position
|
2022-05-12 09:42:59 +08:00 |
|
yystopf
|
72a32ed8c4
|
rename namespace
|
2022-05-12 09:42:59 +08:00 |
|
yystopf
|
12cc37443e
|
add: trace controller and router
|
2022-05-12 09:42:59 +08:00 |
|
yystopf
|
9d8df2b4d9
|
Merge branch 'develop' into standalone_develop
|
2022-05-06 09:57:23 +08:00 |
|
yystopf
|
ae7d0d1329
|
add: issues description and journals notes validate
|
2022-05-06 09:56:22 +08:00 |
|
yystopf
|
52c94effdc
|
Merge branch 'develop' into standalone_develop
|
2022-05-05 10:18:19 +08:00 |
|
yystopf
|
7c88ea3d67
|
add: quit repo
|
2022-05-05 10:00:02 +08:00 |
|
yystopf
|
246b484ad8
|
fix merge from develop
|
2022-04-18 14:14:48 +08:00 |
|
yystopf
|
fc3cf01d3f
|
add: get user image action
|
2022-04-18 13:49:08 +08:00 |
|
yystopf
|
8aa935ad5c
|
add: glcc news management and api data
|
2022-04-07 16:13:32 +08:00 |
|
yystopf
|
b25db9d37f
|
fix: merge from develop
|
2022-03-31 13:00:36 +08:00 |
|
yystopf
|
747646cd9d
|
add: trace client and api completed
|
2022-03-30 16:19:32 +08:00 |
|
yystopf
|
1c660213a7
|
fix: claims is losed
|
2022-03-10 09:36:51 +08:00 |
|
xiaoxiaoqiong
|
664b806c0a
|
routes合并
|
2022-03-03 15:06:56 +08:00 |
|
yystopf
|
3091593d14
|
add: standalone admin menu
|
2022-03-02 10:48:21 +08:00 |
|
xiaoxiaoqiong
|
28d07d5c54
|
fixed 合并冲突
|
2022-02-22 17:49:14 +08:00 |
|
yystopf
|
f2f2ce8252
|
merge from develop
|
2022-02-22 10:38:42 +08:00 |
|
xiaoxiaoqiong
|
9ba00b21c9
|
竞赛通知api
|
2022-02-17 18:28:32 +08:00 |
|
yystopf
|
f76dad680a
|
Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop
|
2022-01-07 18:03:57 +08:00 |
|
yystopf
|
f339df699e
|
add: user upload image
|
2022-01-03 22:32:09 +08:00 |
|
yystopf
|
af160084c4
|
fix: merge from develop
|
2021-12-17 15:45:28 +08:00 |
|
yystopf
|
da4fd3a762
|
fix: 易修 to 疑修
|
2021-12-17 15:35:30 +08:00 |
|
xiaoxiaoqiong
|
efc82b9841
|
fix: issue is collaborators
|
2021-12-14 10:17:15 +08:00 |
 xxq250
|
93dd5b5d84
|
Merge pull request '易修声明功能' (#284) from starlee/forgeplus:lzx-claim-2.0 into standalone_develop
|
2021-12-08 15:12:15 +08:00 |
|
yystopf
|
24170fc2cb
|
Merge pull request '同步通用代码到预上线' (#274) from develop into standalone_develop
|
2021-11-30 17:09:31 +08:00 |
|
yystopf
|
4e3c8e414c
|
fix
|
2021-11-30 15:36:51 +08:00 |
|
yystopf
|
d588a78f62
|
fix: locales for projects update form
|
2021-11-30 15:35:36 +08:00 |
|
xxq250
|
7c765817c9
|
Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop
|
2021-11-26 14:21:53 +08:00 |
starlee
|
e25e2fdd77
|
add the claim mechanism
|
2021-11-25 13:33:32 +08:00 |
|
xiaoxiaoqiong
|
399558550e
|
fix 验证码过期等#53446，#50806，#50880
|
2021-11-24 18:13:15 +08:00 |
|
yystopf
|
6713f9b280
|
fix: pullrequest trend action name
|
2021-11-17 11:04:15 +08:00 |
jasder
|
651bf34cfc
|
FIX code review and conflict
|
2021-11-14 20:50:22 +08:00 |
|
jasder
|
03beee6cae
|
FIX code review
|
2021-11-11 18:03:30 +08:00 |
|
jasder
|
77ad959a8c
|
Merge remote-tracking branch 'gitlink/featrue_login_and_register' into standalone_develop
|
2021-11-08 15:08:47 +08:00 |
|
jasder
|
9d05973700
|
FIX 解决featrue_homepage分支代码冲突
|
2021-11-08 15:07:35 +08:00 |
|
jasder
|
7ad3789fe2
|
FIX 解决develop分支代码冲突
|
2021-11-08 14:59:06 +08:00 |
jasder
|
e3588291b2
|
Merge pull request '首页api数据以及后台管理' (#240) from yystopf/forgeplus:hh_home_index into featrue_homepage
|
2021-11-08 14:35:19 +08:00 |
|
jasder
|
6fe3507a16
|
Merge remote-tracking branch 'gitlink/develop' into develop
|
2021-11-08 14:22:57 +08:00 |
|
yystopf
|
eb18a1e7aa
|
add: project members api and update forks api
|
2021-11-08 11:35:14 +08:00 |
|
yystopf
|
e243a61d0c
|
add: request api data and topic group
|
2021-11-03 14:21:02 +08:00 |
|
jasder
|
06cf52c384
|
ADD 注册接口添加确认密码参数
|
2021-11-03 13:50:38 +08:00 |
|
yystopf
|
18bbbce7b3
|
add: home index api
|
2021-11-03 10:19:01 +08:00 |
|
yystopf
|
35f04afe91
|
add: home index admins
|
2021-11-02 19:00:07 +08:00 |
|
yystopf
|
385f45ddde
|
add: home index controllers
|
2021-11-02 15:59:57 +08:00 |
|
jasder
|
6c67b92bb1
|
FIX revert system_notification_histories
|
2021-11-01 11:06:18 +08:00 |
|
jasder
|
1533f40890
|
Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop
|
2021-11-01 11:00:01 +08:00 |
|
yystopf
|
91852d7957
|
add: project explore management
|
2021-10-27 16:50:18 +08:00 |
|
jasder
|
2719e60248
|
ADD 邮箱、登录名、手机号验证api
|
2021-10-27 15:15:06 +08:00 |
|
yystopf
|
a43f6714de
|
add: project explore api
|
2021-10-27 14:20:27 +08:00 |
|
yystopf
|
21fa609e05
|
add: project rank and user rank api
|
2021-10-26 18:42:35 +08:00 |
|
jasder
|
5b19a333ef
|
Merge branch 'develop' into dev_trustie_server
|
2021-10-21 14:41:43 +08:00 |
|
yystopf
|
dbdd2e2dd3
|
add: user template message setting
|
2021-10-19 14:40:45 +08:00 |
|
yystopf
|
d54dcb6b67
|
add: template message settings api
|
2021-10-19 14:40:21 +08:00 |
|
jasder
|
33a5b7f4f9
|
FIX 合并主干分支代码并解决代码冲突
|
2021-10-18 18:16:12 +08:00 |
|
yystopf
|
1dcc38f617
|
fix: remove system_notification_history
|
2021-10-18 13:51:32 +08:00 |
|
yystopf
|
21af31f23c
|
add: system notification history api
|
2021-10-18 13:49:58 +08:00 |
|
yystopf
|
d176508010
|
add: system notification management
|
2021-10-18 13:49:58 +08:00 |
|
jasder
|
3325ec842d
|
Merge pull request 'FIX 代码库二级页面改版以及其他bug' (#172) from develop into dev_trustie_server
|
2021-10-09 16:15:12 +08:00 |