floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
5,944 Commits 7 Branches 16 Tags 707 MiB
Commit Graph

1318 Commits

Author SHA1 Message Date
“xxq250” f031cd4720 cloudIDE saas定制api 2022-10-12 16:34:44 +08:00
“xxq250” bf1e722084 cloudIDE saas定制api 2022-10-12 16:04:27 +08:00
“xxq250” 6d2a6e0331 cloudIDE saas定制api 2022-10-12 15:44:46 +08:00
“xxq250” e7bbe252de cloudIDE saas定制api 2022-10-12 15:37:22 +08:00
viletyy 3d475fdedd Merge branch 'develop' into standalone_develop 2022-09-29 13:59:04 +08:00
yystopf 649d9c4ea6 新增：更改邮箱控制器方法 2022-09-28 16:09:10 +08:00
“xxq250” e33448db4d fixed nps统计 2022-09-26 16:53:55 +08:00
“xxq250” 2adf87a289 fixed nps数据统计 2022-09-20 09:52:40 +08:00
“xxq250” b3afa15d2e fixed nps数据统计 2022-09-20 09:52:14 +08:00
“xxq250” b40f48f87e Merge branch 'develop' into standalone_develop 2022-09-20 09:48:10 +08:00
“xxq250” 6954a860af fixed nps数据统计 2022-09-20 09:47:29 +08:00
“xxq250” b07e5d6993 Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-09-20 09:43:20 +08:00
“xxq250” bb8e6aeaf8 nps数据统计 2022-09-20 09:41:27 +08:00
yystopf dfc2c68225 新增：管理后台新增类型筛选 2022-09-15 10:21:39 +08:00
“xxq250” 2c2c45476d oauth2认证登录logo 2022-09-09 17:55:44 +08:00
“xxq250” 60894f00b1 nps已打分区分 2022-09-06 10:29:51 +08:00
“xxq250” 925b05e004 nps已打分区分 2022-09-06 10:29:49 +08:00
“xxq250” f2b55977c9 nps已打分区分 2022-09-05 13:44:26 +08:00
“xxq250” fd66a3149d nps已打分区分 2022-09-05 13:44:23 +08:00
“xxq250” 4a6e94a98f 调整nps用户调研接口,30天 2022-09-02 15:50:15 +08:00
“xxq250” c60e80da98 调整nps用户调研接口,测试30分钟 2022-09-01 15:13:49 +08:00
“xxq250” d51bb7030f Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/views/users/get_user_info.json.jbuilder
 2022-08-30 18:14:17 +08:00
“xxq250” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
yystopf 98446220a1 Merge branch 'develop' into standalone_develop 2022-08-17 18:05:22 +08:00
yystopf 911c47df8d 新增：文件blame 上个版本的行号 2022-08-17 18:05:15 +08:00
yystopf 144fbac843 Merge branch 'develop' into standalone_develop 2022-08-16 14:07:49 +08:00
yystopf 68a38e75bc 修复: 消息返回接口时间 2022-08-16 14:07:37 +08:00
yystopf a0dcc289c8 Merge branch 'develop' into standalone_develop 2022-08-09 09:48:14 +08:00
yystopf 4b05838498 新增：合并请求评论新增path参数筛选以及去掉分页最多返回200数据 2022-08-09 09:48:02 +08:00
yystopf 0993e5a3ae Merge branch 'develop' into standalone_develop 2022-08-04 17:28:29 +08:00
yystopf f8268accc0 新增： 组织下项目协作者添加当前用户 2022-08-04 17:28:14 +08:00
yystopf 958ee42fa2 Merge branch 'develop' into standalone_develop 2022-08-03 17:13:53 +08:00
yystopf 024bc289de 修改: 合并请求评论必选参数以及审查列表去掉分页 2022-08-03 17:13:45 +08:00
yystopf 64e608ffd7 Merge branch 'develop' into standalone_develop 2022-08-03 14:20:39 +08:00
yystopf fea11bdc2e 新增：webhook type类型 2022-08-03 14:20:25 +08:00
yystopf 0be06c8282 Merge branch 'develop' into standalone_develop 2022-08-02 19:04:04 +08:00
yystopf ab5d273f98 新增：版本diff新增diff信息 2022-08-02 19:03:54 +08:00
yystopf adb55c0910 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-07-28 18:14:05 +08:00
yystopf 902c66d490 更改: oauth2授权页面增加错误提示 2022-07-28 18:14:00 +08:00
“xxq250” 8a187df5f4 fixed CloudIDEA文件标记已读未读列表 2022-07-28 17:59:20 +08:00
“xxq250” 93fd9333ec fixed CloudIDEA文件标记已读未读列表 2022-07-28 17:56:44 +08:00
“xxq250” 487c6dc21a fixed CloudIDEA文件标记已读未读列表 2022-07-28 17:55:31 +08:00
“xxq250” 2b31b683dd fixed CloudIDEA文件标记已读未读列表 2022-07-28 17:53:43 +08:00
“xxq250” 321f367e3e Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-07-28 16:46:27 +08:00
“xxq250” fbc1f95cd1 Merge remote-tracking branch 'origin/develop' into develop 2022-07-28 16:42:29 +08:00
“xxq250” 4ccf8ea5ff CloudIDEA文件标记已读未读 2022-07-28 16:42:21 +08:00
yystopf d5c141f892 修复：pulls文件夹load 2022-07-28 15:19:31 +08:00
yystopf 6e54203ebb 修复：批量提交文件参数缺失以及数据为空处理 2022-07-28 13:56:31 +08:00
yystopf 445ae6fbc3 merge from develop 2022-07-27 16:12:12 +08:00
yystopf a2549f7ff1 新增: 评论及审查相关接口文档 2022-07-27 16:07:15 +08:00
yystopf d6b5dc326a 新增: 评论相关api根据需求重写 2022-07-27 14:52:49 +08:00
yystopf a35db9fe80 新增：reviewers修改入口 2022-07-26 16:45:53 +08:00
yystopf 5025bf6961 Merge branch 'develop' into standalone_develop 2022-07-26 14:38:50 +08:00
yystopf 6183f1f76d 修复: 缺少title和body 2022-07-26 14:38:41 +08:00
yystopf 70220638fd merge from develop 2022-07-26 14:22:18 +08:00
yystopf cc09f724cc Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-07-26 14:14:33 +08:00
yystopf 7a54c5f536 新增: 接口文档更新 2022-07-26 14:14:25 +08:00
“xxq250” 6f9db6b314 Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/models/pull_request.rb
 2022-07-26 10:49:49 +08:00
“xxq250” 5877474f59 Merge remote-tracking branch 'origin/develop' into develop 2022-07-26 10:44:21 +08:00
“xxq250” 1bbde165c2 reposyncer同步仓库接口 2022-07-26 10:44:12 +08:00
yystopf 3f5754a3a5 新增：合并请求详情接口 2022-07-25 18:23:06 +08:00
yystopf 5463c22518 新增: 合并请求创建审查接口 2022-07-25 17:28:38 +08:00
yystopf 5db43bf768 新增：新合并请求列表接口 2022-07-25 16:21:03 +08:00
yystopf 56b1110e4d Merge branch 'develop' into standalone_develop 2022-07-22 18:10:09 +08:00
yystopf 0df1e5fdd0 新增：合并请求版本列表和diff接口文档 2022-07-22 18:08:16 +08:00
yystopf 8ba70a33be 新增: pr版本列表和diff接口 2022-07-22 17:33:08 +08:00
yystopf 545ec28561 Merge branch 'develop' into standalone_develop 2022-07-19 16:47:19 +08:00
yystopf 25afedcdfd 新增: 批量更改文件 2022-07-19 16:47:01 +08:00
yystopf 1882120df3 新增: 获取单文件blame信息 2022-07-19 11:14:50 +08:00
yystopf 274cd81655 新增：获取commit列表 2022-07-19 10:41:25 +08:00
yystopf 92be882e54 Merge branch 'develop' into standalone_develop 2022-07-18 15:40:42 +08:00
yystopf 6273349334 新增: 获取比较blame、token以及异常捕获处理 2022-07-18 15:39:51 +08:00
yystopf f161349bd7 Merge branch 'develop' into standalone_develop 2022-07-18 11:19:23 +08:00
yystopf 52701d1c2f Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-07-18 11:18:35 +08:00
yystopf b248f770f1 新增：获取单个提交的blame信息接口以及文档 2022-07-18 11:18:29 +08:00
xiaoxiaoqiong 04b9e43382 fixed 后台统计优化,新增项目数 2022-07-18 11:14:45 +08:00
xiaoxiaoqiong 07518f0d00 fixed 后台统计优化,新增项目数 2022-07-18 11:11:15 +08:00
xiaoxiaoqiong e6e1b56309 后台统计优化 2022-07-18 10:42:45 +08:00
xiaoxiaoqiong 8dae15225e 后台统计优化 2022-07-18 10:37:53 +08:00
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 c30c56f77b Merge branch 'develop' into standalone_develop 2022-07-15 14:41:12 +08:00
yystopf b8d4b15b40 新增: 分支接口文档 2022-07-15 14:40:35 +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 f8b63ff02e merge from develop 2022-07-07 13:47:47 +08:00
yystopf 1d6d48fc94 新增: pr 最后一次审核展示 2022-07-07 09:24:11 +08:00
xiaoxiaoqiong 850d743b16 oauth2 code授权方式登录css 2022-07-05 15:04:46 +08:00
xiaoxiaoqiong f01da70e8a oauth2 code授权方式登录css 2022-07-05 15:01:12 +08:00
xiaoxiaoqiong 1a2d01df17 oauth2 code授权方式登录css 2022-07-05 14:53:42 +08:00
xiaoxiaoqiong abfefdf8eb oauth2 code授权方式登录 2022-07-05 14:38:11 +08:00
yystopf a608803aa8 新增: 合并请求审查需审查权限 2022-06-30 11:00:18 +08:00
yystopf 76cc185a1d 新增: 合并请求审核model 2022-06-29 17:16:29 +08:00
yystopf fb2e2d9534 merge from develop 2022-06-24 14:18:53 +08:00
yystopf 7cad953413 新增: 用户项目列表支持多个参数 2022-06-23 18:16:57 +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 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 f6fb50529c 新增: 邀请项目链接接口文档 2022-06-17 14:06:59 +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 2d52dbfc2f Merge branch 'develop' into standalone_develop 2022-05-30 14:50:48 +08:00
yystopf 169dc84e22 新增: 组织下项目需返回是否为公有项目字段 2022-05-30 14:50:12 +08:00
xiaoxiaoqiong 1220223322 rake导入项目,无语言处理 2022-05-27 14:43:16 +08:00
yystopf ad9bb8e542 修复: 合并从develop 2022-05-24 18:10:20 +08:00
yystopf e36c7a4b6a 修复: 邮箱搜索不需要return 404 2022-05-24 18:09:36 +08:00
yystopf 9979c87d0c 修复: 合并从develop 2022-05-24 17:27:24 +08:00
yystopf 8e8ec821f2 新增: 根据邮箱来获取用户 2022-05-24 17:26:10 +08:00
xiaoxiaoqiong 94166a363c fixed 增加自动登录，gitea注册 2022-05-24 15:24:15 +08:00
xiaoxiaoqiong 93f8b659a1 fixed 增加自动登录，gitea注册 2022-05-24 14:00:15 +08:00
xiaoxiaoqiong 2959414d56 fixed 增加自动登录 2022-05-24 10:25:58 +08:00
yystopf b06ad71082 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-05-20 17:06:10 +08:00
yystopf 3212bc4842 fix: merge from develop 2022-05-20 17:06:00 +08:00
yystopf 779c86108a fix: readme relative delay and replace_content 2022-05-20 17:00:02 +08:00
yystopf e4779926bd Merge pull request '代码溯源部分代码' (#9) from yystopf/forgeplus:standalone_develop into standalone_develop 2022-05-20 14:46:33 +08:00
yystopf d9b3711e08 Merge branch 'develop' into standalone_develop 2022-05-16 16:59:36 +08:00
yystopf 77620f7735 add: download and import user template xlsx 2022-05-16 16:59:25 +08:00
yystopf 3eccd6be64 add: user has trace user field 2022-05-12 09:45:37 +08:00
yystopf 0afac46778 Merge branch 'develop' into standalone_develop 2022-05-07 11:58:13 +08:00
yystopf a6cee63d17 fix: change owner must fix foreign_key 2022-05-07 11:57:58 +08:00
yystopf d799d329ff add: compare add paginate 2022-04-28 18:54:56 +08:00
yystopf f15cd44dff add: compare add paginate 2022-04-28 18:53:33 +08:00
yystopf 91ea5ca96a Merge branch 'develop' into standalone_develop 2022-04-28 11:12:35 +08:00
yystopf 3abd6037d9 fix: show super description aways desplay 2022-04-28 11:12:16 +08:00
yystopf 1d7c7eba24 Merge branch 'develop' into standalone_develop 2022-04-28 10:54:02 +08:00
yystopf 396ac55429 add: user super description 2022-04-28 10:42:55 +08:00
yystopf fc3cf01d3f add: get user image action 2022-04-18 13:49:08 +08:00
yystopf 7aea481ccf add: glcc_apply_infomations admin navbar 2022-04-18 10:24:54 +08:00
xiaoxiaoqiong f60cd409b6 竞赛配置子赛项 2022-04-08 18:40:52 +08:00
xiaoxiaoqiong 9d46f2743d 竞赛配置子赛项 2022-04-08 17:45:15 +08:00
xiaoxiaoqiong aaf2b43986 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-04-08 17:38:59 +08:00
xiaoxiaoqiong 75a9a65b9b 竞赛配置子赛项 2022-04-08 17:38:26 +08:00
yystopf 18cf1d3ecb Merge branch 'glcc_news_develop' into standalone_develop 2022-04-08 13:23:49 +08:00
yystopf 8aa935ad5c add: glcc news management and api data 2022-04-07 16:13:32 +08:00
xiaoxiaoqiong c4f91fb054 搜索用户增加email和单位 2022-04-06 20:32:02 +08:00
yystopf d56da6d020 Merge branch 'develop' into standalone_develop 2022-03-31 16:08:43 +08:00
yystopf 882a50cf56 add: setting navbar varible 2022-03-31 16:04:48 +08:00
xiaoxiaoqiong d9ae4e4ba0 fixed: 1.readme加载不正常, 2.文件目录加载性能优化 2022-03-18 16:52:23 +08:00
xiaoxiaoqiong 23dc2d7fb6 目录树加载图片不需要Content 2022-03-18 14:55:42 +08:00
yystopf 1fe8d1defc Merge branch 'develop' into standalone_develop 2022-03-07 11:20:23 +08:00
yystopf 5cb2e55f74 add: organization users insist team nickname search 2022-03-07 09:58:05 +08:00
xiaoxiaoqiong 1dd3fbc69a fixed fork列表中存在组织时显示错误 2022-03-03 14:16:57 +08:00
yystopf 5e696ae905 Merge branch 'develop' into standalone_develop 2022-02-15 17:33:55 +08:00
xiaoxiaoqiong 2f170a54c6 fixed setting编辑类型下拉选中 2022-02-15 17:10:57 +08:00
yystopf 67914201bf merge from develop 2022-01-24 10:06:20 +08:00
yystopf 1c7e414aa4 fix: owner allow nil 2022-01-21 18:19:43 +08:00
yystopf b1884d30d5 fix: detail result delay 2022-01-21 18:19:06 +08:00
yystopf 612101498c Merge branch 'develop' into standalone_develop 2022-01-14 17:38:09 +08:00
yystopf f33b9559cd fix: download delay 2022-01-13 11:24:27 +08:00
yystopf f76dad680a Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop 2022-01-07 18:03:57 +08:00
yystopf 2a09ced1ce fix: branches use branch name api 2022-01-07 15:41:50 +08:00
yystopf 47d1f727ce fix: create team count limit 2022-01-06 17:38:44 +08:00
yystopf 84f12adce8 fix: webhook tasks list error delay 2022-01-06 14:29:31 +08:00
yystopf 7fde1e0e12 fix: webhook field changed 2022-01-06 11:10:49 +08:00
yystopf 43e0617429 fix: webhook field changed 2021-12-30 09:47:12 +08:00
yystopf 96b0f2d167 Merge branch 'develop' into standalone_develop 2021-12-28 16:10:16 +08:00
yystopf 12edc620df fix: complete profile condition 2021-12-24 16:15:59 +08:00
yystopf e1a5918c22 add: project trends project info 2021-12-22 13:57:02 +08:00
yystopf 688be1bb7d fix: return issue version id 2021-12-21 15:16:38 +08:00
xiaoxiaoqiong efc82b9841 fix: issue is collaborators 2021-12-14 10:17:15 +08:00
yystopf 1d13b3686b Merge branch 'develop' into standalone_develop 2021-12-13 16:39:47 +08:00
yystopf f8a6f62342 fix: project rank include educoder 2021-12-10 09:35:03 +08:00
yystopf d48700d200 Merge pull request '同步代码' (#288) from develop into standalone_develop 2021-12-10 09:19:42 +08:00
yystopf 81e6691632 fix: educoder entries image file type 2021-12-09 11:33:43 +08:00
yystopf 102858bc8c fix: educoder entries file use hash 2021-12-09 11:06:49 +08:00
yystopf beccac652f fix 2021-12-08 18:25:31 +08:00
yystopf 30eb1958c1 fix 2021-12-08 18:23:29 +08:00
yystopf 33e17e8439 fix: educoder sub_entries and commit author 2021-12-08 18:18:19 +08:00
yystopf 657e2cf169 fix: merge from develop 2021-12-08 16:22:34 +08:00
yystopf e0c47c2abd fix: educoder clone url 2021-12-08 16:18:13 +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 422549f9e7 fix 2021-12-08 15:01:33 +08:00
yystopf c4586fbb36 fix: remove detail language and contributors 2021-12-08 14:11:37 +08:00
xiaoxiaoqiong d85a446edc Merge branch 'develop' into standalone_develop 2021-12-07 16:48:52 +08:00
xiaoxiaoqiong 4d61e7618a fixed detail 2021-12-07 16:46:06 +08:00
xiaoxiaoqiong 20bfbdc06f fixed owner 404 2021-12-07 16:32:14 +08:00
xiaoxiaoqiong 5c445b9ea0 merge develop 2021-12-07 16:27:17 +08:00
xiaoxiaoqiong 36286d9003 fixed:educode项目 2021-12-07 16:20:05 +08:00
yystopf 51356da7f3 fix: owners not return 404 2021-12-07 14:34:57 +08:00
yystopf 24170fc2cb Merge pull request '同步通用代码到预上线' (#274) from develop into standalone_develop 2021-11-30 17:09:31 +08:00
yystopf a7d681c4dd fix: compare commit author image url 2021-11-30 15:03:55 +08:00
yystopf 7a93db9ed2 fix: labels limit and issues operate field 2021-11-30 13:58:51 +08:00
yystopf 6ffc702209 Merge pull request '提交最新代码到预上线环境' (#272) from develop into standalone_develop 2021-11-29 15:44:51 +08:00
xiaoxiaoqiong 16f37a3729 email中logo 2021-11-29 15:35:54 +08:00
yystopf 7586a0fb21 fix: change issue tag change size 2021-11-29 10:27:41 +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
yystopf abca0fe432 fix: change pr path id to number 2021-11-25 15:08:59 +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 8011dabaac fix: undo events 2021-11-18 17:02:09 +08:00
jasder 651bf34cfc FIX code review and conflict 2021-11-14 20:50:22 +08:00
jasder e216d7da70 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-11 18:09:26 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
yystopf 222e5c1050 fix: atme sender info 2021-11-10 11:32:59 +08:00
yystopf 1298fedcbb fix: user rank 2021-11-10 10:47:03 +08:00
yystopf c4e88ad690 fix 2021-11-09 16:56:49 +08:00
yystopf e316a60433 fix: pullrequest fork_project_user_name 2021-11-09 16:56:49 +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
jasder 6b0f9a689a Merge pull request '@我功能' (#239) from yystopf/forgeplus:hh_notification_v2_2 into develop 2021-11-08 14:21:00 +08:00
yystopf eb18a1e7aa add: project members api and update forks api 2021-11-08 11:35:14 +08:00
jasder c19c83d505 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-05 11:36:51 +08:00
jasder 9f31dc02f4 FIX 后台管理修改用户信息时同步git用户 2021-11-04 17:58:45 +08:00
yystopf 18cf2ca78a fix 2021-11-03 14:26:19 +08:00
yystopf 0d1fa2995a fix 2021-11-03 14:25:04 +08:00
yystopf e243a61d0c add: request api data and topic group 2021-11-03 14:21:02 +08:00
yystopf a3f57d3cbc fix: paginate and img width 2021-11-03 11:38:47 +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 43c683e83f fix: contributor load cache data 2021-11-02 11:27:17 +08:00
yystopf 1b47f51550 fix 2021-11-02 10:03:13 +08:00
yystopf 28c3b4dda4 add: repo commit user use cache data 2021-11-02 09:59:21 +08:00
jasder ab2e1ffa0e FIX revert system_notification_histories[bug] 2021-11-01 11:06:08 +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 de2399a0a1 fix: project category load slowly 2021-10-29 19:54:58 +08:00
yystopf eba672f39a fix: user popular project nil 2021-10-29 19:39:08 +08:00
yystopf 8698829678 fix: organization recommend api 2021-10-28 15:28:33 +08:00
yystopf 3f690fd9a0 add: pinned projects size 2021-10-28 11:00:32 +08:00
yystopf 2b6d5e694e fix 2021-10-28 10:56:30 +08:00
yystopf 43dc966cf9 add: project category upload logo 2021-10-27 18:02:21 +08:00
yystopf cc0e01cc47 fix 2021-10-27 17:06:35 +08:00
jasder 4676b756e8 FIX 完善邮箱注册发送邮件功能 2021-10-27 17:01:16 +08:00
yystopf f0580720e3 fix 2021-10-27 16:58:31 +08:00
yystopf 91852d7957 add: project explore management 2021-10-27 16:50:18 +08:00
yystopf 0970a402c8 fix 2021-10-27 14:38:30 +08:00
yystopf a43f6714de add: project explore api 2021-10-27 14:20:27 +08:00
yystopf e6c6e544fe fix 2021-10-27 10:00:06 +08:00
yystopf d0791ee653 fix: privacy project not use cache 2021-10-27 09:48:23 +08:00
yystopf 21fa609e05 add: project rank and user rank api 2021-10-26 18:42:35 +08:00
yystopf fa476732e5 add: user common info cache service 2021-10-25 17:23:17 +08:00
jasder 683c00a73e Merge branch 'trustie_server' into standalone 2021-10-22 11:16:30 +08:00
jasder 74a7bc62ea FIX 合并develop分支代码并处理冲突 2021-10-22 11:16:22 +08:00
jasder 5b19a333ef Merge branch 'develop' into dev_trustie_server 2021-10-21 14:41:43 +08:00
jasder 401798ebdd Merge pull request '通知系统自定义发送规则功能' (#205) from yystopf/forgeplus:hh_notification_v2_1 into develop 2021-10-21 14:25:58 +08:00
jasder 9ffe10bd5b FIX 调整detail接口数据 2021-10-21 10:48:14 +08:00
yystopf 7d98bd0bbe fix: template message settinng type order by order index 2021-10-19 14:40:47 +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 2d4f083164 fix 2021-10-18 13:51:32 +08:00
yystopf 0d60e58304 fix: system notification edit error 2021-10-18 13:51:32 +08:00
yystopf 21af31f23c add: system notification history api 2021-10-18 13:49:58 +08:00
yystopf 490ce7a234 add: setting of system notification 2021-10-18 13:49:58 +08:00
yystopf d176508010 add: system notification management 2021-10-18 13:49:58 +08:00
jasder 7030e0b5bc Merge pull request 'FIX some bug' (#191) from develop into dev_trustie_server 2021-10-14 18:12:36 +08:00
yystopf 8ba1198b4a fix: pr files commits count 2021-10-14 16:38:12 +08:00
jasder 7c8843fda7 Merge branch 'develop' into dev_trustie_server 2021-10-12 14:02:33 +08:00
yystopf 350502b499 fix: pullrequest create info 2021-10-11 10:07:35 +08:00
jasder 3325ec842d Merge pull request 'FIX 代码库二级页面改版以及其他bug' (#172) from develop into dev_trustie_server 2021-10-09 16:15:12 +08:00
yystopf a22327d0df fix: add comments_total_count 2021-10-09 14:19:02 +08:00
yystopf 6e653f768a fix: pullrequest comments_count 2021-10-09 10:45:13 +08:00
yystopf 46ab55d50f fix: issue change operate permission and repository detail remove garbage 2021-10-09 09:50:56 +08:00
yystopf 588850440e fix: decode error 2021-09-30 19:49:17 +08:00
yystopf 9685c97177 fix: add user login and release authorize 2021-09-30 17:40:18 +08:00
yystopf 59fe010fdb add: page totalcount 2021-09-30 11:15:11 +08:00
yystopf aabfaad458 add: release use database data 2021-09-30 11:09:13 +08:00
yystopf c1db02171a add: release admin permission field 2021-09-29 17:16:21 +08:00
yystopf 69b8e0710c add: organization info 2021-09-29 17:09:30 +08:00
yystopf d1f5c32f68 fix 2021-09-29 11:34:21 +08:00
yystopf c9bd81af4e fix: lastcommit author and committer 2021-09-29 11:34:21 +08:00
yystopf cae59383b4 add: commit show committer 2021-09-29 11:34:21 +08:00
yystopf 1d0255440a add: release list sha 2021-09-29 11:34:21 +08:00
yystopf 24e77300ad fix: relase attachments 2021-09-29 11:34:21 +08:00
yystopf 46a083239b add: release show api 2021-09-29 11:34:21 +08:00
yystopf 133713ae7f add: tag created at unix 2021-09-29 11:34:21 +08:00
yystopf ab6b597d7b fix 2021-09-29 11:34:21 +08:00
yystopf 33473eecc2 fix: tag addition message 2021-09-29 11:34:21 +08:00
yystopf bbcca413c6 add: tags commiter message 2021-09-29 11:34:21 +08:00
yystopf ec22124004 add: readme by filepath 2021-09-29 11:34:21 +08:00
yystopf 333d6a8ea4 add: branch commiter user info 2021-09-29 11:34:21 +08:00
yystopf af7488505d add: project commit_slice 2021-09-29 11:34:21 +08:00
yystopf 91feb8cf89 add: project branch_slice 2021-09-29 11:34:21 +08:00
jasder 14949c0bfd ADD 通知系统模块代码 2021-09-28 15:59:06 +08:00
yystopf 04207595d8 fix: template fix 2021-09-24 15:40:07 +08:00
yystopf 6b68ea998d add: email message sended by html 2021-09-24 15:37:55 +08:00
yystopf 1c27e9ccd8 fix: textarea md editor 2021-09-23 17:08:53 +08:00
jasder 5b16138c5a Merge pull request '通知系统功能模块' (#153) from yystopf/forgeplus:hh_notice_system into develop 2021-09-22 14:43:04 +08:00
yystopf 53212975f1 add: init data button 2021-09-22 09:53:43 +08:00
yystopf 0581c59a84 fix: message template simple type 2021-09-18 18:50:45 +08:00
yystopf d957e0544f add: message template management 2021-09-18 18:41:03 +08:00
yystopf a2ae8f1630 fix: profile completed 2021-09-18 10:24:16 +08:00
yystopf a0b6041394 add: get user info unread total 2021-09-13 18:17:09 +08:00
yystopf 877a20350d fix: notice messages status value 2021-09-13 10:34:28 +08:00
yystopf 86d634d94f add: notice message skeletal code 2021-09-13 10:34:28 +08:00
jasder 00ed177089 Merge pull request 'FIX bug' (#148) from develop into dev_trustie_server 2021-09-10 18:32:08 +08:00
jasder e594c72c43 Merge pull request '一些bug修复' (#147) from yystopf/forgeplus:hh_fix_bug into develop 2021-09-10 18:30:40 +08:00
jasder 26c0d36227 Merge pull request 'FIX 优化项目流程' (#146) from develop into dev_trustie_server 2021-09-10 18:28:36 +08:00
jasder 29ec3bed09 Merge branch 'feature_optimize_project_creation_process' into develop 2021-09-10 18:01:29 +08:00
jasder 4c41d50506 ADD 后台系统配置管理功能 2021-09-10 15:29:08 +08:00
yystopf 90ace8b753 fix: download file need authorize 2021-09-10 10:52:21 +08:00
jasder 7549557a62 FIX 更改hovercard接口中相关路由 2021-09-09 18:40:53 +08:00
jasder 36adfcf016 FIX 整理后台管理相关功能 2021-09-09 17:34:09 +08:00
jasder 143e88593f Merge pull request 'FIX 路由优化' (#138) from develop into dev_trustie_server 2021-09-03 17:55:43 +08:00
jasder cb1d77ee6d Merge pull request '系统保留关键词模块' (#137) from yystopf/forgeplus:hh_reversed_keyword into develop 2021-09-03 17:52:48 +08:00
yystopf a422aa638d fix: update user profile completed rule 2021-09-02 11:48:53 +08:00
yystopf 48f66f345c fix 2021-09-02 10:55:31 +08:00
yystopf 039779339a add: user and organization merge show api 2021-09-02 10:55:31 +08:00
jasder 7d12a25088 Merge pull request 'FIX commit user info' (#133) from develop into dev_trustie_server 2021-09-01 19:01:22 +08:00
yystopf c50f9ef28d fix: first commit show real commiter 2021-09-01 14:53:41 +08:00
yystopf 7e8e3e1b39 fix: commiter email is blank 2021-09-01 10:28:11 +08:00
yystopf 4cb71179fd add: reversed keyword management 2021-08-31 14:22:49 +08:00
jasder 0f57844106 Merge pull request 'FIX some bug' (#128) from develop into dev_trustie_server 2021-08-27 15:12:27 +08:00
yystopf cf8278ee5e fix: owners add login 2021-08-27 10:20:36 +08:00
yystopf 7d26fba3c0 add: pullrequest admin or developer 2021-08-26 17:56:19 +08:00
yystopf 68712f9b4c add: project team can add authorize 2021-08-25 15:25:08 +08:00
jasder 299e8534d1 Merge branch 'develop' into dev_trustie_server 2021-08-19 17:48:31 +08:00
yystopf f996525e8e fix: version issues percent 2021-08-17 15:33:03 +08:00
jasder b11d515ec6 Merge branch 'develop' into dev_trustie_server 2021-08-06 17:20:30 +08:00
yystopf ffb58b788a fix: migrate project return owner login 2021-08-03 14:15:00 +08:00
jasder 27e5febef2 Merge branch 'develop' into dev_trustie_server 2021-07-30 17:04:21 +08:00
yystopf 4b8bb8a65f fix: pullrequest name 2021-07-29 16:17:30 +08:00
yystopf 264a831a1c add: webhook tasks and test 2021-07-28 14:27:11 +08:00
yystopf 8b53aac8a6 add: repository update destroy webhook 2021-07-27 16:44:58 +08:00
yystopf cb1a4d8c8c add: repository create webhook 2021-07-27 11:11:23 +08:00
yystopf ebc4305ca8 add: repository webhooks 2021-07-26 17:25:06 +08:00
yystopf c6f2021017 Merge branch 'develop' into dev_trustie_server 2021-07-23 14:53:06 +08:00
yystopf f334864f1b fix: get file extname 2021-07-23 14:50:01 +08:00
yystopf fcc7736c34 fix some bug pick 2ea0c6e3 add: remove public key from api 2021-07-23 14:49:31 +08:00
jasder deebfc3292 fix merge develop branch 2021-07-23 14:16:29 +08:00
yystopf e4fda9243b fix: create project add login 2021-07-21 09:43:35 +08:00
viletyy 998381585a add: user public keys controller 2021-07-14 15:38:14 +08:00
viletyy de2b54c39e add: compare code return can merge status 2021-07-12 18:10:26 +08:00
viletyy d271a684fa add: compare code return can merge message 2021-07-12 17:24:35 +08:00
jasder 3614f3e15b FIX 解决私有版本库库不能访问、下载图片的问题 2021-07-09 16:57:11 +08:00
jasder e76d475fef FIX show realname for create project 2021-07-06 11:04:00 +08:00
jasder 8131d8cd48 Merge branch 'sync_develop' into dev_trustie_server 2021-07-01 10:08:58 +08:00
jasder 87049b74ef Merge branch 'develop' into sync_develop 2021-07-01 10:06:00 +08:00
jasder f19219a467 FIX 解决标签列表和发行版列表中下周zip包、tar包导致的404问题 2021-06-30 14:30:01 +08:00
jasder 83b7b8cd9c Merge branch 'develop' into dev_trustie_server 2021-06-25 18:03:28 +08:00
jasder c298ff02b8 ADD pr冲突文件展示 2021-06-25 18:03:07 +08:00
jasder e111f40c69 fix 修复bug 2021-06-25 16:13:23 +08:00
jasder b7dd12927b ADD conflicts file for pull api 2021-06-24 16:08:32 +08:00
jasder 23f7439a8c Merge branch 'develop' into dev_trustie_server 2021-06-22 09:51:46 +08:00
jasder fff21a1bc8 FIX 处理版本库zip、gzip包链接为无效的问题 2021-06-22 09:39:44 +08:00
vilet.yy 526920f564 fix: version issues count except pull requests count 2021-06-21 18:50:45 +08:00
vilet.yy ea82a52b7b fix: version issues count 2021-06-21 14:45:41 +08:00
jasder 6f19093dc2 FIX merge develop flick 2021-06-18 17:23:48 +08:00
jasder f0b1c9e80b Merge branch 'develop' into dev_trustie_server 2021-06-18 11:03:41 +08:00
jasder aff088a444 ADD issues all count for issues api 2021-06-18 11:02:58 +08:00
jasder dc23be9001 Merge branch 'develop' into dev_trustie_server 2021-06-18 10:54:29 +08:00
jasder 67e49a4f56 FIX 修复pulls、issues 搜索数量统计问题 2021-06-18 10:52:14 +08:00
jasder e24269c2a7 Merge branch 'develop' into dev_trustie_server 2021-06-17 18:14:19 +08:00
vilet.yy bdb8154a55 add: fork user type 2021-06-17 16:25:48 +08:00
vilet.yy 880f09a94a fix: change pulls navbar count 2021-06-16 11:10:26 +08:00
vilet.yy 80c1573aea fix: change issue navbar count 2021-06-16 10:42:04 +08:00
vilet.yy be63beb78b fix: update openning count navbar 2021-06-16 09:49:08 +08:00
jasder bf390c8366 Merge branch 'develop' into dev_trustie_server 2021-06-11 18:03:35 +08:00
jasder 7c43f2d8fc ADD 邀请码功能 2021-06-11 17:43:14 +08:00
vilet.yy bdec369ec2 back: change navbar count 2021-06-11 16:19:43 +08:00
vilet.yy 672f37fe48 add: project detail show open task count 2021-06-11 14:11:44 +08:00
jasder a99fb69b30 Merge branch 'develop' into sync_develop 2021-06-11 11:22:12 +08:00
jasder d2340e30cb ADD admim statistics url 2021-06-11 11:21:44 +08:00
vilet.yy 44cbb537ca add: role field 2021-06-10 11:44:48 +08:00
vilet.yy 77c1b1e188 add: undo_join_projects 2021-06-10 10:49:26 +08:00
jasder fc60278f9a FIX * ENHANCEMENTS 
* ADD 用户活动统计图表功能
  * ADD 用户精选项目功能
  * ADD 用户贡献度统计图表功能
  * ADD 用户开发能力数据统计工
  * ADD 用户角色定位展示功能
  * ADD 用户专业定位标签展示功能
  * ADD 修改用户基本资料功能
  * ADD 更改密码功能
  * ADD 用户个人主页基本现在展示可配置功能

* BUGFIXES
  * Fix 解决一些bug
  * Fix 优化美化页面change license
 2021-06-09 17:52:57 +08:00
vilet.yy 5489ea9fbc add: applied join project 2021-06-09 16:53:09 +08:00
vilet.yy d4b8b3e24f add: invite code 2021-06-09 13:36:57 +08:00
jasder 5ef9549b6b change license 2021-06-09 09:48:51 +08:00
jasder 632a06e575 Merge branch 'develop' into dev_trustie_server 2021-06-08 18:13:16 +08:00
jasder 04c7887319 Merge branch 'sync_develop' into dev_trustie_server 2021-06-08 14:34:29 +08:00
jasder 39acaa7f21 FIX 解决头歌版本库无法访问的问题 2021-06-08 14:34:03 +08:00
vilet.yy 02fe8a8966 add: user and platform cache 2021-06-08 11:51:46 +08:00
jasder d75b79670d Merge branch 'develop' into dev_trustie_server 2021-06-04 18:51:47 +08:00
vilet.yy 12c252ea10 fix: merge from hh_develop 2021-06-04 18:36:33 +08:00
viletyy 93169f8c96 fix: user update return info 2021-06-03 15:43:36 +08:00
viletyy 6b436acfaf add: user info add gender 2021-06-03 15:22:08 +08:00
viletyy 317c211de9 add: user info add show field 2021-06-03 11:56:32 +08:00
vilet.yy 7dc21ff388 add: update user more info 2021-06-03 11:27:13 +08:00
vilet.yy fff790bb19 add: pinned projects project_id 2021-06-03 11:27:13 +08:00
vilet.yy 16c293562a add: pinned projects order by position 2021-06-03 11:27:12 +08:00
vilet.yy 7ba45bc866 fix: some bug 2021-06-03 11:27:12 +08:00
vilet.yy 86f0f2051d add: update user_info 2021-06-03 11:27:12 +08:00
vilet.yy dc4c99c305 fix: psimple issue field 2021-06-03 11:27:12 +08:00
vilet.yy 7fa1cdf73e add: user created time 2021-06-03 11:27:12 +08:00
vilet.yy cdce7049ad fix 2021-06-03 11:27:12 +08:00
vilet.yy 2410f5bbc0 add: user statistics 2021-06-03 11:27:12 +08:00
vilet.yy ca8fa20c2c add: user project trends 2021-06-03 11:27:12 +08:00
vilet.yy ea79772bd2 add: user pinned projects 2021-06-03 11:27:12 +08:00
vilet.yy 422fd35f1e add: user headmap 2021-06-03 11:27:12 +08:00
vilet.yy 496867cac7 add: update user more info 2021-06-03 10:19:33 +08:00
vilet.yy c727ccf3e6 add: pinned projects project_id 2021-06-02 17:29:11 +08:00
vilet.yy 96a8da5d26 add: pinned projects order by position 2021-06-02 16:40:40 +08:00
vilet.yy df6da37b95 fix: some bug 2021-06-02 15:29:00 +08:00
vilet.yy 0b450c0c5f add: update user_info 2021-05-31 18:39:49 +08:00
vilet.yy a0f0b5e3f1 fix: psimple issue field 2021-05-28 18:00:53 +08:00
vilet.yy 9a2b067bc1 add: user created time 2021-05-28 16:53:37 +08:00
vilet.yy 5431349d46 fix 2021-05-28 16:08:49 +08:00
vilet.yy 1df95eab4d add: user statistics 2021-05-28 15:36:05 +08:00
vilet.yy ff1c80d1de add: user project trends 2021-05-27 16:40:15 +08:00
vilet.yy c2449d59af add: user pinned projects 2021-05-27 14:23:59 +08:00
vilet.yy cacc807978 add: user headmap 2021-05-27 10:30:34 +08:00
jasder aeeaedbd7a Merge branch 'develop' into standalone 2021-05-24 10:11:02 +08:00
jasder 72b89d4b2b Merge branch 'develop' into dev_trustie_server 2021-05-21 19:26:47 +08:00
jasder a8e53d4e5c FIX [code bug]临时处理获取readme文件问题 2021-05-21 18:51:46 +08:00
jasder 1c8d0686ee FIX [base64解码操作]临时处理获取readme文件问题 2021-05-21 18:41:29 +08:00
jasder ffa74e92a3 FIX 临时处理获取readme文件问题 2021-05-21 18:29:14 +08:00
jasder 8a47761afb ADD mergeable column for get pull api 2021-05-21 11:39:50 +08:00
jasder 8a4b0ba966 Merge branch 'develop' into dev_trustie_server 2021-05-14 17:34:36 +08:00
jasder dac07bcae0 ADD 页面置顶功能、帮助文档快速入口 2021-05-14 16:23:19 +08:00
jasder 2cca2c756e ADD recommend organizations api 2021-05-13 14:52:07 +08:00
jasder b568ac4e97 ADD title 2021-05-12 17:48:05 +08:00
jasder 91bbb58d4f FIX delete input readonly 2021-05-12 17:44:45 +08:00
jasder 4023b8980e FIX 完善通过大赛点击项目链接自动注册关联Educoder平台账号的功能 2021-05-12 17:01:30 +08:00
jasder e5f591e509 Merge branch 'develop' into dev_trustie_server 2021-05-10 14:38:58 +08:00
jasder 23704dbae3 FIX get mirror url bug with get detail repo api 2021-05-10 14:38:39 +08:00
jasder 60b22b3912 Merge develop 2021-05-08 18:16:45 +08:00
jasder 7a752b177d Merge branch 'develop' into dev_trustie_server 2021-05-08 14:23:34 +08:00
vilet.yy 1c111e83b3 fix: project controbutor nil 2021-05-06 14:48:59 +08:00
jasder c1ef39b262 Merge branch 'develop' into dev_trustie_server 2021-04-29 18:37:35 +08:00
jasder 1277e717ff ADD github gitlab镜像加速器 2021-04-29 18:35:57 +08:00
jasder 876591100e Merge branch 'develop' into dev_trustie_server 2021-04-28 21:17:36 +08:00
vilet.yy ea42b0d6ed fix: pull_request can not select reporter and compare userinfo lose 2021-04-28 20:10:21 +08:00
vilet.yy 65d51e8578 add: project operate add organization team users 2021-04-28 15:15:45 +08:00
jasder ba9848ebe7 Merge branch 'develop' into dev_trustie_server 2021-04-27 18:24:41 +08:00
jasder 7d612ea6b3 ADD 转移仓库功能以及待办事项 2021-04-27 18:24:10 +08:00
vilet.yy 120a33bc8a add: undo count 2021-04-27 15:43:37 +08:00
vilet.yy b68c9945e5 add: project edit transfer 2021-04-27 14:40:18 +08:00
jasder 09ac49dda5 Merge branch 'develop' into dev_trustie_server 2021-04-26 16:46:24 +08:00
jasder 95a355b87c FIX admin projects api bug 2021-04-26 16:45:26 +08:00
vilet.yy d532dc7cf5 fix: some bug and users api doc 2021-04-26 10:57:57 +08:00
vilet.yy 1e081b5a3e add: transfer project 2021-04-25 18:41:13 +08:00
jasder b161b66d79 Merge branch 'develop' into standalone 2021-04-23 17:55:42 +08:00
jasder 34edd78ae7 Merge branch 'develop' into dev_trustie_server 2021-04-23 17:21:34 +08:00
jasder c1d4df6e06 FIX release show time bug 2021-04-23 17:21:17 +08:00
jasder 713e0bba18 Merge branch 'develop' into standalone 2021-04-23 16:18:31 +08:00
jasder 36fb5a118c Merge branch 'develop' into dev_trustie_server 2021-04-23 14:40:41 +08:00
jasder aa314c141c ADD some url with in hovercoard api 2021-04-23 14:40:26 +08:00
jasder b756be1d6a Merge branch 'develop' into dev_trustie_server 2021-04-22 18:10:32 +08:00
jasder 37e1704897 ADD location column for user hovercard api 2021-04-22 18:10:20 +08:00
jasder 348c2244f7 Merge branch 'develop' into dev_trustie_server 2021-04-22 16:45:40 +08:00
jasder ddacf2a733 FIX get organzition's name bug 2021-04-22 16:45:26 +08:00
jasder 39193324e9 Merge branch 'develop' into dev_trustie_server 2021-04-22 16:38:58 +08:00
jasder 908cda56f3 ADD users/hovercard api 2021-04-22 16:36:40 +08:00
jasder 841778900c FIX code review 2021-04-22 16:35:54 +08:00
jasder 6a3d297b30 FIX code bug 2021-04-20 19:07:48 +08:00
jasder 45f05c9fc4 FIX render commmiter and author avatar bug 2021-04-20 18:58:14 +08:00
jasder 84e48d25c1 FIX render user bug with pull‘s commits and repo's commits api 2021-04-20 18:35:41 +08:00
jasder db476a1a9b Merge branch 'develop' into dev_trustie_server 2021-04-20 11:37:08 +08:00
vilet.yy da98efe04f add: org project field 2021-04-20 10:50:06 +08:00
jasder 0d7a11f3ab Merge branch 'develop' into dev_trustie_server 2021-04-19 18:41:18 +08:00
vilet.yy a3c49b3d5f add: org valid 2021-04-19 18:37:30 +08:00
vilet.yy 5a9f29c25f fix 2021-04-19 18:37:30 +08:00
vilet.yy 3a47c61010 add: team nickname 2021-04-19 18:37:30 +08:00
jasder f055fed7d0 ADD 创建团队支持中文名称 
创建组织团队使用中文名称报错、组织项目下创建issue报错
 2021-04-19 18:10:31 +08:00
jasder 9cddda7fd4 Update render user avatar url in projects api 2021-04-19 15:38:51 +08:00
vilet.yy 1c6982d15b add: org valid 2021-04-19 12:07:12 +08:00
vilet.yy 9300483c1a fix 2021-04-19 11:40:38 +08:00
vilet.yy 506ab1722d add: team nickname 2021-04-19 10:54:36 +08:00
jasder 3af75e1a1c FIX merge develop branch 2021-04-13 10:18:35 +08:00
jasder 5c8e561bd8 Merge branch 'develop' into trustie_server 2021-04-08 18:36:27 +08:00
vilet.yy 04a1376820 add: project's lesson_url 2021-04-08 15:20:34 +08:00
jasder 2b0c987558 Merge branch 'develop' into trustie_server 2021-04-07 11:35:09 +08:00
vilet.yy d6c3bcfaf1 add: org add nickname 2021-04-07 11:29:44 +08:00
vilet.yy c417fa7369 add: project list author type 2021-04-07 11:29:44 +08:00
jasder 6796805b21 Merge branch 'develop' into trustie_server 2021-04-02 18:58:08 +08:00
vilet.yy c175fa1339 fix: commit author and fork create units 2021-04-02 18:53:53 +08:00
vilet.yy fba58800a7 fix 2021-04-02 18:08:36 +08:00
vilet.yy c4a43c4392 add: need edit user password 2021-04-02 16:44:36 +08:00
vilet.yy 0d97d7d4f0 add: educoder third party 2021-04-01 18:01:51 +08:00
jasder c55c04b137 Merge branch 'standalone' of https://git.trustie.net/jasder/forgeplus into standalone 2021-03-31 12:45:09 +08:00
jasder d2293a2778 FIX setting api bug 2021-03-31 12:44:40 +08:00
jasder 7c2aa2209d delete helps sidebar 2021-03-31 11:21:09 +08:00
jasder 860b46685a fix bug 2021-03-31 10:24:37 +08:00
jasder 3869529620 Update setting api 2021-03-31 09:49:05 +08:00
vilet.yy d0a65775aa fix: not show commiter avatar 2021-03-30 16:34:12 +08:00
jasder 7c0a2aa89e Merge branch 'develop' into trustie_server 2021-03-25 14:31:45 +08:00
vilet.yy 7f28f07665 fix: readme error 2021-03-25 11:31:43 +08:00
vilet.yy 66608b3baa add: detail project description 2021-03-24 13:59:24 +08:00
vilet.yy 9ee42e805b fix: update error 2021-03-24 13:50:17 +08:00
vilet.yy 15f9004f63 add: edit permit website 2021-03-24 10:50:47 +08:00
jasder 815b364428 ADD common url with setting api 2021-03-23 15:42:56 +08:00
jasder 18ae3853d7 FIX update setting api 2021-03-23 11:42:22 +08:00
jasder ce18cc380a Merge branch 'develop' into trustie_server 2021-03-22 21:02:17 +08:00
jasder aa23762b2f FIX update setting api for nav bar url 2021-03-22 18:02:12 +08:00
jasder 0909223867 FIX get readme api method 2021-03-21 11:24:34 +08:00
vilet.yy db2ba95e24 fadd: repo edit unit 2021-03-19 15:05:09 +08:00
vilet.yy 39f0811f0a fix:simple unit 2021-03-19 14:58:25 +08:00
vilet.yy 6a7ef2a1a7 add: repo contributors 2021-03-18 16:35:46 +08:00
vilet.yy a627ab4d82 fix 2021-03-18 09:51:56 +08:00
vilet.yy 8f98a83379 add: project unit list 2021-03-17 13:50:26 +08:00
vilet.yy b43926f69f add: new project detail 2021-03-15 19:01:35 +08:00
victor cb90dc1f51 参数管理 2021-03-03 15:36:59 +08:00
jasder fc680b5372 fix notice api 2021-02-26 14:38:32 +08:00
viletyy 2b898b0d1f [FIX]remove description 2021-02-06 16:43:41 +08:00
viletyy 54204d4db8 [ADD]org team search, project teams add\remove, org can create field 
[FIX]
 2021-02-06 15:49:55 +08:00
viletyy 4f6f257b37 [FIX]concat change to concat_ws, org render 403, normal team leave 2021-02-06 15:49:54 +08:00
viletyy ddaca5bafc [ADD]organization add num_teams 2021-02-06 15:49:54 +08:00
viletyy 1e70764d63 [FIX]teams add user info 2021-02-06 15:49:54 +08:00
viletyy 152e301bf3 [ADD]search is_member is_admin 2021-02-06 15:49:54 +08:00
viletyy c6269f44ee [FIX]add user organization count 2021-02-06 15:49:54 +08:00
viletyy 3d495797c0 [FIX]organization add created_at and total_count 2021-02-06 15:49:54 +08:00
viletyy 289d1877d6 [ADD]组织、组织团队 2021-02-06 15:49:53 +08:00
viletyy 0c58447afb [FIX]组织上传头像支持多种格式、项目详情返回拥有者类型 
[FIX]

[FIX]
 2021-02-06 15:49:52 +08:00
viletyy 3f73484596 [FIX]一些筛选以及创建最大项目数量验证 
[FIX]
 2021-02-06 15:49:49 +08:00
viletyy f094fe1799 [ADD]组织项目相关 2021-02-06 14:27:47 +08:00
viletyy 31858a79e3 [FIX]成员细节修改 2021-02-06 14:27:47 +08:00
viletyy 7f309edc91 [ADD]组织、组织团队 2021-02-06 14:27:47 +08:00
viletyy c278ed1863 [FIX] 2021-02-06 14:27:47 +08:00
viletyy 2434ca9681 [ADD]组织模块相关代码 2021-02-06 14:27:47 +08:00
viletyy c00336e7b5 [ADD]统计平台概况 
[FIX]更改请求参数

[FIX]

[ADD]rank statistic

[FIX]
 2021-02-06 11:15:25 +08:00
victor 22d7478349 content接口返回分支 2021-02-01 10:36:30 +08:00
victor 6c77b73ec6 创建多条流水线、模板管理 2021-01-26 17:15:53 +08:00
Jasder 6d51657ecf FIX get latest commit bug 
(cherry picked from commit b7e23a62d0)
 2021-01-20 14:30:49 +08:00
Jasder ffeb076086 FIX pull api bug 
(cherry picked from commit 36a3e36edb)
 2021-01-20 14:30:29 +08:00
Jasder 06a7cb7558 FIX get readme file bug 
(cherry picked from commit 30138cc1fa)
 2021-01-20 14:30:26 +08:00
Jasder 5667c0854c FIX [api] get pull bug 
(cherry picked from commit fa01194d3c)
 2021-01-20 14:30:10 +08:00
Jasder b6aa0fd76c FIX render json builder partil performance for pull some api 
(cherry picked from commit f084b72e3a)
 2021-01-20 14:30:06 +08:00
moshenglv 0d6ddad013 查询steps接口修改 2021-01-19 16:23:19 +08:00
moshenglv 7e9acd1850 返回流水线文件sha 2021-01-19 14:19:06 +08:00
moshenglv 703be3f9a1 返回流水线内容同步状态 2021-01-19 13:59:55 +08:00
moshenglv f90bc0897b 流水线关联项目 2021-01-19 11:52:29 +08:00
moshenglv 05416339e5 流水线查询返回字段修改 2021-01-19 11:10:47 +08:00
moshenglv c6aeecb33c 查询阶段返回流水线名称 2021-01-18 09:58:33 +08:00
moshenglv 9af0ff4a71 步骤查询接口返回模板信息修改 2021-01-15 11:05:38 +08:00
moshenglv da1a992670 流水线查询返回时间格式化 2021-01-13 15:10:24 +08:00
moshenglv cb6c4b1e3f 阶段新增、删除、查询步骤接口修改 2021-01-12 17:40:42 +08:00
moshenglv 77529319a1 可视化创建流水线后端代码 2021-01-12 10:23:26 +08:00
moshenglv 9a66b48726 用户可以查看其他用户的构建列表 2021-01-06 18:47:39 +08:00
moshenglv a3724e80b9 增加trustie提供服务器流程。 
1、增加接口trustie_bind
2、根据server_type字段判断使用哪个数据库连接
 2020-12-24 10:35:38 +08:00
Jasder 3f60dd3f83 ADD edit protected branch api 2020-12-04 16:18:27 +08:00
Jasder b3649f03e7 ADD get protected branch api 2020-12-04 11:06:12 +08:00
Jasder 6a8ae5234b ADD protected branch Features 2020-12-03 15:24:40 +08:00
Jasder 69f2fd2fbb FIX code review 2020-11-23 15:52:00 +08:00
Jasder fa6b25a22d FIX render commit bug for sub entries api 2020-11-16 16:03:41 +08:00
Jasder 7449351270 FIX sub entries api return hash object when entries is file 2020-11-16 15:34:16 +08:00
Jasder 1c386e0ab3 FIX coder review 2020-11-10 10:03:30 +08:00
Jasder 939f33a8a2 FIX sha value bug 2020-11-09 17:23:19 +08:00
Jasder 97973b95bf ADD sha column ro pull request's files compare api 2020-11-06 22:03:12 +08:00
Jasder a8c3328bd6 ADD get a commit api 2020-11-06 17:23:14 +08:00
Jasder c85ad6444d FIX code bug 2020-11-04 15:03:21 +08:00
Jasder 0fe0f8a38b ADD some fileds for pull api 2020-11-04 14:08:34 +08:00
Jasder 58d8c911a8 ADD format time method 2020-11-04 11:21:51 +08:00
Jasder cfb794c94f FIX bug 2020-11-04 10:09:49 +08:00
Jasder 2347697e93 ADD some api 
* api/v1/repos/{owner}/{repo}/pulls/{number}/commits
* api/v1/repos/{owner}/{repo}/pulls/{number}/files
* api/v1/repos/{owner}/{repo}/compare/{base}...{head}
 2020-11-03 18:37:47 +08:00
Jasder 1bc935ffd5 FIX code review and user cache 2020-10-30 15:47:09 +08:00
Jasder bfbe1fdce5 FIX bug 2020-10-22 22:16:55 +08:00
Jasder 91c9423c72 add platform column for projects api 2020-10-22 20:12:28 +08:00
Jasder 58f8d60646 FIX 版本库兼容euducoder平台数据 2020-10-22 18:00:31 +08:00
Jasder 9477555ebd FIX merge dev_devops branch 2020-10-21 11:56:30 +08:00
Jasder e3d9dae8fd Update projects sime api with statics 2020-10-21 11:45:55 +08:00
Jasder 2eca095608 Merge branch 'dev_devops' into dev_sync_project_educoder 2020-10-20 16:45:04 +08:00
Jasder 2eef143251 ADD 同步educoder平台实训项目 2020-10-19 22:59:41 +08:00
Jasder 1ac606a8aa FIX 去掉区块链相关的token值 2020-10-19 15:20:30 +08:00
Jasder 232bb054ce Merge branch 'dev_trustie' into dev_devops 2020-10-16 16:48:26 +08:00
sylor_huang@126.com 32bc3fe9f5 FIX merge 2020-10-16 16:48:11 +08:00