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,149 Commits 7 Branches 16 Tags 707 MiB
Commit Graph

873 Commits

Author SHA1 Message Date
yystopf 9f74651a2b Merge branch 'develop' into standalone_develop 2022-11-15 14:42:07 +08:00
“xxq250” 0cb6f233f3 项目搜索增加组织和用户信息搜索 2022-11-15 14:40:37 +08:00
yystopf 64c6f69f56 新增：统计项目分类下私有项目的数量 2022-11-15 14:25:35 +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
yystopf 4a7dcf8a91 Merge branch 'develop' into standalone_develop 2022-11-11 11:50:26 +08:00
yystopf f98886b3a0 修复 2022-11-11 11:50:07 +08:00
yystopf c3703a7f69 merge from develop 2022-11-09 14:42:40 +08:00
yystopf 6d9cf8aad2 修复 2022-11-09 14:41:17 +08:00
yystopf 33a3d7f48c merge from develop 2022-11-09 14:37:27 +08:00
yystopf e3179dfd6e 新增：新增反馈意见邮件回复功能 2022-11-09 14:35:11 +08:00
yystopf 83b46fcb50 新增：用户反馈意见后台管理逻辑 2022-11-09 11:37:12 +08:00
yystopf 2b2a44831e Merge branch 'develop' into standalone_develop 2022-11-08 13:41:00 +08:00
yystopf 3e5c1da2c5 新增：反馈意见模型及接口 2022-11-08 13:27:46 +08:00
viletyy 7f91ebb509 Merge branch 'develop' into standalone_develop 2022-11-01 15:29:30 +08:00
yystopf 423d5a9316 修复：同步项目权限到组织时需预先判断是否存在于团队中 2022-11-01 15:29:07 +08:00
viletyy d665d0edb1 Merge branch 'develop' into standalone_develop 2022-10-27 10:49:05 +08:00
yystopf e15809c186 修复：无法正常转移的问题 2022-10-27 10:48:24 +08:00
viletyy 893f6c04a5 Merge branch 'develop' into standalone_develop 2022-10-26 14:58:25 +08:00
yystopf 3d5b2e76d7 修复：update_column无法触发count_cache 2022-10-26 14:58:04 +08:00
viletyy 6e9962e0da Merge branch 'develop' into standalone_develop 2022-10-26 14:50:23 +08:00
yystopf 8b14ee3c72 修复：更改组织下项目权限同时更改组织下权限同步至gitea 2022-10-26 14:49:40 +08:00
viletyy 2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
yystopf 64d9c334ce 修复：项目语言验证信息统一 2022-10-19 15:18:15 +08:00
viletyy a494a905fa Merge branch 'develop' into standalone_develop 2022-10-17 13:16:49 +08:00
yystopf 30437d828c 新增：项目git忽略文件新增验证 2022-10-17 13:16:22 +08:00
yystopf 5196f33f24 新增：项目许可证新增验证 2022-10-17 12:57:24 +08:00
yystopf 8807be6e4d 新增：项目语言新增唯一性验证 2022-10-17 10:52:57 +08:00
viletyy 732d1a1adb Merge branch 'develop' into standalone_develop 2022-10-15 11:29:58 +08:00
yystopf 630a7aadeb 新增：组织数据修复任务 2022-10-15 11:29:23 +08:00
viletyy 2df259c927 Merge branch 'develop' into standalone_develop 2022-10-14 15:02:53 +08:00
yystopf 9c11cd79e8 修复：消息模版无法查询子类的问题 2022-10-10 19:06:47 +08:00
yystopf a030a01050 Merge branch 'develop' into standalone_develop 2022-09-23 17:56:58 +08:00
yystopf d7f3a21add 修复：周统计数据需加入年份 2022-09-23 17:56:39 +08:00
yystopf af7a779af6 merge from develop 2022-09-23 10:09:51 +08:00
yystopf cc42683316 新增：活跃度计算访问量限制 2022-09-23 10:07:52 +08:00
yystopf 6a2cfc5fde Merge branch 'develop' into standalone_develop 2022-09-15 10:00:09 +08:00
yystopf 007b90c284 修复：删除旧的逻辑 2022-09-15 10:00:00 +08:00
yystopf a1b2bdd048 Merge branch 'develop' into standalone_develop 2022-09-15 09:49:51 +08:00
yystopf 733f64eaec 新增：项目排行榜新增提交数算法 2022-09-15 09:44:12 +08:00
yystopf 383660c778 更改：组织缓存信息方式改在控制器里面 2022-09-15 09:38:28 +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 7a7a1efc46 Merge branch 'develop' into standalone_develop 2022-08-17 18:39:08 +08:00
yystopf 4b167dacbb 修复: trace user 手机号为空 2022-08-17 18:39:01 +08:00
yystopf 1e4aed71fe Merge branch 'develop' into standalone_develop 2022-08-17 15:29:16 +08:00
yystopf a37d7b9840 修复: 手机号默认不传 2022-08-17 15:28:58 +08:00
“xxq250” 98f1723411 fixed 发行版git删除时，不同步处理 2022-08-16 14:28:40 +08:00
“xxq250” 81b64c18b6 fixed 发行版git删除时，不同步处理log 2022-08-16 14:03:05 +08:00
“xxq250” 0c10f3ff10 fixed 发行版git删除时，不同步处理log 2022-08-16 11:50:09 +08:00
“xxq250” c6034ed33f fixed 发行版git删除时，不同步处理test 2022-08-16 11:48:39 +08:00
“xxq250” 4618f4effa fixed 发行版git删除时，不同步处理 2022-08-16 11:46:58 +08:00
viletyy 6bb1dcf718 Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-08-11 15:21:37 +08:00
yystopf 13472b2311 新增: 合并请求评论查询is_full 2022-08-11 15:21:11 +08:00
“xxq250” ad8fed9440 fixed 消息模板配置type 2022-08-11 09:29:35 +08:00
“xxq250” 964bef7896 fixed 消息模板配置type 2022-08-11 09:29:34 +08:00
“xxq250” 4918fda2e1 fixed 消息模板配置type 2022-08-10 17:23:27 +08:00
“xxq250” 9ce7cdf0c3 fixed 消息模板配置type 2022-08-10 17:20:29 +08:00
yystopf 0be06c8282 Merge branch 'develop' into standalone_develop 2022-08-02 19:04:04 +08:00
“xxq250” 8bf4e9b8d2 fixed Repository.url 2022-08-02 18:10:01 +08:00
“xxq250” 321f367e3e Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-07-28 16:46:27 +08:00
“xxq250” 4ccf8ea5ff CloudIDEA文件标记已读未读 2022-07-28 16:42:21 +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
“xxq250” 19ffd9fea1 fixed PullRequest 统一关联关系字段gitea_id 2022-07-26 10:55:42 +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 5463c22518 新增: 合并请求创建审查接口 2022-07-25 17:28:38 +08:00
yystopf 1feb166fd5 修复：合并请求评审模型修改 2022-07-25 16:20:42 +08:00
xiaoxiaoqiong ed0655452c 增加从webhook接收仓库日志记录 2022-07-18 09:34:56 +08:00
xiaoxiaoqiong 07ec114e9a fixed 提交日志记录用户信息 2022-07-13 13:13:10 +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
yystopf 76cc185a1d 新增: 合并请求审核model 2022-06-29 17:16:29 +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
xiaoxiaoqiong 8f45bcf959 Merge remote-tracking branch 'origin/develop' into develop 2022-06-17 17:02:31 +08:00
xiaoxiaoqiong 1f9caeece5 auth2接入 2022-06-17 17:02:24 +08:00
yystopf f4737d88d8 Merge branch 'develop' into standalone_develop 2022-06-17 14:19:58 +08:00
yystopf 5b4e6f4902 修复: 项目存在敏感词更新forked数量使用update_column 2022-06-17 14:19:41 +08:00
yystopf c0c259a5fc Merge branch 'develop' into standalone_develop 2022-06-17 14:07:52 +08:00
yystopf 3d0e323801 fix 2022-06-17 14:07:33 +08:00
yystopf c42f3d5928 新增：邀请用户链接生成 2022-06-17 14:06:59 +08:00
yystopf 0fa5bb2211 Merge branch 'develop' into standalone_develop 2022-06-16 13:48:28 +08:00
yystopf 42d2b51f7f 修复: 项目敏感词判定只在创建或者更新的时候 2022-06-16 13:42:17 +08:00
yystopf 7a0dbaaefb Merge branch 'develop' into standalone_develop 2022-06-08 10:47:08 +08:00
yystopf 3e4dd90e17 修复: 用户名称展示时只去掉首末的空格 2022-06-08 10:46:55 +08:00
yystopf 8a7dc75907 fix merge from develop 2022-06-08 10:38:10 +08:00
yystopf 8ae5587516 fix: search name use strip 2022-06-08 10:37:31 +08:00
xiaoxiaoqiong 15a0b85ae6 通知邮件支持用户不存在时发送base_url 2022-06-01 16:11:18 +08:00
xiaoxiaoqiong 0b543f7dda 通知邮件支持用户不存在时发送base_url 2022-06-01 16:08:20 +08:00
xiaoxiaoqiong a07204111a 通知邮件支持用户不存在时发送 2022-06-01 15:24:39 +08:00
xiaoxiaoqiong a7ce3f3728 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-06-01 15:23:14 +08:00
xiaoxiaoqiong 7290cd6495 通知邮件支持用户不存在时发送 2022-06-01 15:23:05 +08:00
yystopf e69fe13745 merge from develop 2022-06-01 10:03:29 +08:00
yystopf 038df804c0 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-01 10:01:15 +08:00
yystopf 877948b0cd 新增: 通用消息模板后台创建 2022-06-01 10:00:57 +08:00
xiaoxiaoqiong 9a17c4865f 项目名称和描述增加敏感词检测 2022-06-01 09:27:18 +08:00
xiaoxiaoqiong 4a23878185 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-06-01 09:23:21 +08:00
xiaoxiaoqiong dc787a35d4 项目名称和描述增加敏感词检测 2022-06-01 09:23:11 +08:00
yystopf b785406ab8 Merge branch 'develop' into standalone_develop 2022-05-31 16:34:20 +08:00
yystopf 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
yystopf 94881dd72a add: user trace tasks record 2022-05-13 14:31:59 +08:00
yystopf 00fc83235f download file use redirect 2022-05-12 17:11:16 +08:00
yystopf 7750cbe272 add: project trace tasks count 2022-05-12 09:43:55 +08:00
yystopf 1f13bba52e add: trace user tasks_count 2022-05-12 09:43:55 +08:00
yystopf cf09b28f5e add: project menu services 2022-05-12 09:43:54 +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 20af4a7d82 Merge branch 'develop' into standalone_develop 2022-05-06 17:25:52 +08:00
yystopf 000197b0d1 fix: issues and pull_request length calculate 2022-05-06 17:25:34 +08:00
yystopf 9d8df2b4d9 Merge branch 'develop' into standalone_develop 2022-05-06 09:57:23 +08:00
xiaoxiaoqiong 55c74de8e4 fork_users加入组织 2022-05-05 10:41:02 +08:00
yystopf 11724bf63f Merge branch 'develop' into standalone_develop 2022-04-28 11:04:01 +08:00
yystopf ec3a556a6f fix: default value for show super description 2022-04-28 11:03:42 +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 345fd31834 Merge branch 'develop' into standalone_develop 2022-04-18 10:52:59 +08:00
yystopf 8f5bb0e2d9 fix: organization gitea_token read by associations 2022-04-18 10:52:48 +08:00
xiaoxiaoqiong f60cd409b6 竞赛配置子赛项 2022-04-08 18:40:52 +08:00
yystopf 8aa935ad5c add: glcc news management and api data 2022-04-07 16:13:32 +08:00
yystopf 7fd41e13e4 Merge branch 'develop' into standalone_develop 2022-03-31 13:04:02 +08:00
yystopf 9ced678f91 fix: user trace token 2022-03-31 13:03:54 +08:00
yystopf b25db9d37f fix: merge from develop 2022-03-31 13:00:36 +08:00
yystopf 4bbb843edf add: trace users and get trace token 2022-03-31 12:54:39 +08:00
yystopf 1c660213a7 fix: claims is losed 2022-03-10 09:36:51 +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
yystopf 57c60b2fe9 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-24 16:44:58 +08:00
yystopf aa643430fa Merge branch 'develop' into standalone_develop 2022-02-24 14:27:31 +08:00
yystopf 1a93477635 fix: forked templete delay 2022-02-24 14:26:04 +08:00
yystopf 1bb754e9d8 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-22 10:39:47 +08:00
yystopf f2f2ce8252 merge from develop 2022-02-22 10:38:42 +08:00
xiaoxiaoqiong 4e3f9cc019 竞赛通知任务调度 2022-02-21 16:48:59 +08:00
xiaoxiaoqiong 5ed7b3e4ad 竞赛通知任务调度 2022-02-21 16:46:40 +08:00
xiaoxiaoqiong 4e2c46260c Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 18:28:40 +08:00
xiaoxiaoqiong 9ba00b21c9 竞赛通知api 2022-02-17 18:28:32 +08:00
yystopf 1100309038 Merge branch 'develop' into standalone_develop 2022-02-17 11:12:58 +08:00
yystopf b11f5fd228 fix: cache rollback 2022-02-17 11:12:50 +08:00
yystopf af5f2b2fe3 Merge branch 'develop' into standalone_develop 2022-02-17 10:59:29 +08:00
yystopf 90dbe0730a fix: job not affect 2022-02-17 10:59:18 +08:00
yystopf f39e8b7668 Merge branch 'develop' into standalone_develop 2022-02-17 09:43:52 +08:00
yystopf d6633cb73a fix 2022-02-17 09:43:44 +08:00
yystopf 86ef890f8b Merge branch 'develop' into standalone_develop 2022-02-17 09:40:54 +08:00
yystopf a7a6abd22a fix: add rule for issue expire 2022-02-17 09:40:44 +08:00
yystopf 6fd47b56a5 Merge branch 'develop' into standalone_develop 2022-02-17 09:37:00 +08:00
yystopf c956667ce0 fix 2022-02-17 09:36:49 +08:00
yystopf 898453c88c Merge branch 'develop' into standalone_develop 2022-02-16 15:10:19 +08:00
yystopf 5701c818ed fix 2022-02-16 15:10:10 +08:00
yystopf 1ac2ddfaa5 fix: default setting for new template message 2022-02-16 11:46:34 +08:00
yystopf 3c7da85bee Merge branch 'standalone_develop' into pre_trustie_server 2022-02-16 09:35:42 +08:00
yystopf 9751c954df Merge branch 'develop' into standalone_develop 2022-02-16 09:35:22 +08:00
yystopf 84b56bfcb8 fix: project milestone create notice template 2022-02-16 09:34:31 +08:00
yystopf ac07c88f84 Merge branch 'develop' into standalone_develop 2022-02-15 18:30:25 +08:00
yystopf 7485564bb9 add: template message platform varible 2022-02-15 18:30:13 +08:00
yystopf 5e696ae905 Merge branch 'develop' into standalone_develop 2022-02-15 17:33:55 +08:00
yystopf e3f4313c80 fix 2022-02-15 17:29:13 +08:00
yystopf b223abe229 fix: init data 2022-02-15 17:26:46 +08:00
yystopf b3bede308c add: some new message rules 2022-02-15 17:13:06 +08:00
yystopf 22293572ac fix: issue changed about version callback 2022-02-14 17:02:59 +08:00
yystopf 959c1e8d95 add: user profile setting message 2022-02-14 13:55:34 +08:00
yystopf ea11672fff Merge branch 'standalone_develop' into pre_trustie_server 2022-02-11 16:27:56 +08:00
yystopf 09c4f8db0e Merge branch 'develop' into standalone_develop 2022-02-11 16:27:42 +08:00
yystopf 29dc3fff39 fix: migrate use old rule 2022-02-11 16:27:22 +08:00
yystopf 8d18149537 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-10 14:11:06 +08:00
yystopf 8050af23fc Merge branch 'develop' into standalone_develop 2022-02-10 14:10:54 +08:00
yystopf 298abdd1b1 fix: devops organization bug 2022-02-10 14:08:14 +08:00
yystopf b9e2a6edf1 Merge branch 'standalone_develop' into pre_trustie_server 2022-01-24 17:27:21 +08:00
yystopf e0f5337fdd Merge branch 'develop' into standalone_develop 2022-01-24 14:26:36 +08:00
yystopf 380ca3a066 fix: projects query rule 2022-01-24 14:26:24 +08:00
yystopf 7d19849968 Merge branch 'develop' into standalone_develop 2022-01-24 10:44:59 +08:00
yystopf 237b0afb08 fix: team user build use find or create by 2022-01-24 10:44:46 +08:00
yystopf 05f5982a53 Merge branch 'standalone_develop' into pre_trustie_server 2022-01-07 18:04:55 +08:00
yystopf f76dad680a Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop 2022-01-07 18:03:57 +08:00
yystopf 84f12adce8 fix: webhook tasks list error delay 2022-01-06 14:29:31 +08:00
yystopf 4f63caa86c Merge branch 'standalone_develop' into pre_trustie_server 2021-12-28 16:10:44 +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 4ce03145df fix 2021-12-23 14:33:31 +08:00
yystopf 3e04a37ece add: team remove and joined template message 2021-12-23 14:26:40 +08:00
yystopf 26ae9b35df fix: change member role and change team user team 2021-12-22 11:32:40 +08:00
yystopf 8e79b43aaf add: member bind team user 2021-12-22 11:16:27 +08:00
yystopf bec98bbc9d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-17 15:45:57 +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
yystopf 96d1a7440d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-14 10:20:54 +08:00
yystopf 8a34699acd fix: merge from develop 2021-12-14 10:20:35 +08:00
xiaoxiaoqiong efc82b9841 fix: issue is collaborators 2021-12-14 10:17:15 +08:00
xiaoxiaoqiong 9e64a4842d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-08 15:32:47 +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
xiaoxiaoqiong 2116af759d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:40:18 +08:00
xiaoxiaoqiong 38862b9843 fixed owner 2021-12-07 16:40:01 +08:00
xiaoxiaoqiong d4663e410d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:27:52 +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
xiaoxiaoqiong f12b10fa23 merge 测试环境standalone_develop 2021-12-01 10:05:00 +08:00
yystopf 6ffc702209 Merge pull request '提交最新代码到预上线环境' (#272) from develop into standalone_develop 2021-11-29 15:44:51 +08:00
yystopf 22f3371090 fix: change issues priority id default value 2021-11-29 11:05:33 +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
xxq250 72553dec57 Merge pull request '一些功能修改以及bug修复' (#263) from yystopf/forgeplus:hh_hotfix into develop 2021-11-26 09:39:58 +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 1a9ed1425e fix: destroy decrement forked count 2021-11-23 13:48:09 +08:00
yystopf 72ec7bc213 fix: change email default rule 2021-11-19 10:57:25 +08:00
yystopf 55ab694505 fix: change email default rule 2021-11-19 10:21: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 49c7827f87 fix 2021-11-10 16:40:11 +08:00
yystopf 937603d0f2 fix: change params is blank not sent email 2021-11-10 10:05:35 +08:00
yystopf 2e35fb92a9 fix: change message template email title 2021-11-09 17:04:45 +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 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 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 94075717e2 add: home index models 2021-11-02 15:56:47 +08:00
yystopf 46405e704a add: rank not include deleted project 2021-11-02 09:59:21 +08:00
jasder 6c67b92bb1 FIX revert system_notification_histories 2021-11-01 11:06:18 +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
jasder b40cbfbfbb FIX conflict 2021-10-29 15:07:01 +08:00
yystopf 8698829678 fix: organization recommend api 2021-10-28 15:28:33 +08:00
yystopf 43dc966cf9 add: project category upload logo 2021-10-27 18:02:21 +08:00
jasder cbf8f1fa67 FIX code review 2021-10-27 17:19:39 +08:00
yystopf 274e5090ce fix 2021-10-27 17:07:48 +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 01f99a2f12 fix 2021-10-27 11:03:34 +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 69c87fd5a4 add: callback cache 2021-10-26 15:22:42 +08:00
yystopf 91f1f4090f fix: old cache 2021-10-25 18:03:56 +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
yystopf 24ec039895 fix 2021-10-21 11:23:12 +08:00
yystopf 43d125100d fix 2021-10-21 11:19:12 +08:00
yystopf fdcf450eab fix 2021-10-21 11:17:11 +08:00
yystopf 748e8cc92a add: send template message email supplement 2021-10-20 14:34:15 +08:00
yystopf c52f40adbd fix 2021-10-19 16:21:34 +08:00