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

247 Commits

Author SHA1 Message Date
yystopf 24fe22398e 修复 2023-03-16 16:09:42 +08:00
yystopf a5f5f71fb5 Merge branch 'develop' into standalone_develop 2023-03-16 15:47:07 +08:00
yystopf 9c1b21f246 修复 2023-03-16 15:46:56 +08:00
yystopf 2e7a4d9877 Merge branch 'develop' into standalone_develop 2023-03-16 15:39:59 +08:00
yystopf 2c9d2746ba 修复：readme 修复 2023-03-16 15:39:49 +08:00
yystopf 980b65a817 Merge branch 'develop' into standalone_develop 2023-03-16 11:33:53 +08:00
yystopf 5a2e642579 修复：readme 修复 2023-03-16 11:33:39 +08:00
yystopf 9c85fdfeaf 修复：配置 2023-03-10 14:49:18 +08:00
xxq250 a0d4f2f404 群智熵分析报表接口调整 2023-03-10 14:35:20 +08:00
xxq250 6bb3f92973 开启确权激励的用户或项目可配置 2023-03-09 17:45:03 +08:00
xxq250 db845e7df0 开启确权激励的用户或项目 2023-03-07 09:59:42 +08:00
xxq250 9cd150be88 开启确权激励的用户或项目 2023-03-07 09:49:17 +08:00
xxq250 b1c10d66f9 区块链确权相关 2023-03-02 13:49:50 +08:00
xxq250 2842df87c6 群智熵分析报表接口调整到项目动态接口 2023-02-28 15:01:23 +08:00
xxq250 6f9d902e70 群智熵分析报表接口调整到项目动态接口 2023-02-28 14:59:06 +08:00
xxq250 558d720203 群智熵分析报表接口调整到项目动态接口 2023-02-28 09:26:45 +08:00
xxq250 46da5a0d84 群智熵分析报表接口调整 2023-02-27 16:41:40 +08:00
xxq250 f8350c4043 群智熵分析报表接口 2023-02-27 16:02:08 +08:00
chenjing b9e2a3736c admins org list 2023-02-22 09:24:11 +08:00
yystopf 8210404f4a Merge branch 'develop' into standalone_develop 2023-02-07 15:56:52 +08:00
yystopf 128c5c48e6 修复 2023-02-07 15:56:35 +08:00
yystopf c983df57ee merge from develop 2023-02-07 14:21:32 +08:00
yystopf 39ae14bce7 新增：entry新增submodule url 2023-02-07 14:18:57 +08:00
yystopf a15d0827b7 merge from develop 2022-12-09 11:49:26 +08:00
xxq250 a631d423c6 fixed 项目跳转链接修正 2022-12-09 11:07:00 +08:00
xxq250 6350d2e5a9 fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:19:02 +08:00
xxq250 1c16b74f1b fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:15:33 +08:00
yystopf af8183485e merge from develop 2022-12-02 14:04:23 +08:00
yystopf 4b1f1c697e 更改：下载excel文件不走跳转 2022-12-02 13:59:41 +08:00
viletyy 2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
yystopf 58a43a8b80 更改：合并请求和issue仅加载开启中的里程碑 2022-10-18 13:43:16 +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
“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
“xxq250” b2af43ee2a 增加建木devops地址配置 2022-08-16 11:34:20 +08:00
“xxq250” f211fbaec3 增加建木devops地址配置URI.encode 2022-08-16 11:31:43 +08:00
“xxq250” 14c1be1bea 增加建木devops地址配置 2022-08-16 11:29:33 +08:00
“xxq250” 12cc870dc7 fixed time ago优化 2022-08-15 15:47:30 +08:00
“xxq250” 7597f1fd8f fixed 建木认证code,项目成员可见 2022-07-29 16:30:56 +08:00
“xxq250” 8dba81bfca fixed 建木认证code加密生成,key=Client Secret 2022-07-29 15:37:24 +08:00
“xxq250” 531747024d fixed 建木认证code加密生成,key=Client Secret 2022-07-29 15:35:12 +08:00
“xxq250” a560a5034c fixed 建木认证code加密生成 2022-07-29 14:20:56 +08:00
“xxq250” 29342e11fb 建木认证code加密生成 2022-07-29 14:18:53 +08:00
yystopf 9b50b9df00 merge from develop 2022-07-14 09:38:00 +08:00
yystopf fbbacfa983 修复: apk文件为下载文件 2022-07-14 09:36:52 +08:00
yystopf ed22ff921e merge from develop 2022-07-08 11:35:25 +08:00
yystopf d154f0aecc 修复: readme匹配修复 2022-07-08 11:31:17 +08:00
yystopf cf24e01c2a merge from develop 2022-07-07 15:03:30 +08:00
yystopf 29d9410e42 修复: readme 匹配项目 2022-07-07 15:02:25 +08:00
yystopf fb2e2d9534 merge from develop 2022-06-24 14:18:53 +08:00
yystopf d14bf35ca1 修复: gitea module命名重复问题 2022-06-23 11:33:11 +08:00
yystopf dd03b9f147 merge from develop 2022-06-13 12:54:56 +08:00
yystopf ce467736a7 修复: readme无法正常跳转目录的问题 2022-06-13 12:53:40 +08:00
xiaoxiaoqiong cc2c0e8e26 调整日志输出 2022-06-09 14:50:00 +08:00
yystopf 6223cf41e2 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-05-23 18:10:54 +08:00
yystopf 1d3f79e777 Merge branch 'develop' into standalone_develop 2022-05-23 18:10:47 +08:00
yystopf b0092487e6 fix: is readme use regex 2022-05-23 18:10:41 +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
xiaoxiaoqiong 05b3f2a2fb fixed timego时间差 2022-05-23 18:05:13 +08:00
yystopf 02681abaee Merge branch 'develop' into standalone_develop 2022-05-21 16:46:14 +08:00
yystopf fe23c2afbf fix: replace content next if blank 2022-05-21 16:45:42 +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 803fdfc49e fix: merge from develop 2022-05-20 11:44:56 +08:00
yystopf 83e43f0c97 add: new readme delay function 2022-05-20 11:43:22 +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 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 a5be4a9502 fix: readme image regex error rescued 2022-03-28 11:25:13 +08:00
yystopf d0d906d04c fix: readme image regex error rescued 2022-03-28 11:05:21 +08:00
xiaoxiaoqiong 930805704a fixed: 文件目录加载性能优化 2022-03-18 17:32:29 +08:00
xiaoxiaoqiong 9912ad0779 fixed: 1.readme加载不正常 2022-03-18 17:09:06 +08:00
xiaoxiaoqiong d9ae4e4ba0 fixed: 1.readme加载不正常, 2.文件目录加载性能优化 2022-03-18 16:52:23 +08:00
xiaoxiaoqiong fe5c18c019 readme.md支持图片相对路径 2022-03-18 14:24:03 +08:00
xiaoxiaoqiong fa6f015128 readme.md支持图片相对路径 2022-03-18 14:21:12 +08:00
xiaoxiaoqiong 7f1b95c7d7 readme.md支持图片相对路径 2022-03-18 14:03:59 +08:00
xiaoxiaoqiong 2346b0f848 readme.md支持图片相对路径 2022-03-18 11:41:26 +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 7a1e6cfbad fix: issue edit and new branches only load name api 2022-01-07 15:19:10 +08:00
yystopf f339df699e add: user upload image 2022-01-03 22:32:09 +08:00
yystopf c2bd78d70d Merge branch 'develop' into standalone_develop 2021-12-21 15:17:08 +08:00
yystopf df69dee282 fix: some error for read raw data 2021-12-21 15:14:10 +08:00
yystopf fae8313df6 Merge branch 'develop' into standalone_develop 2021-12-21 14:31:24 +08:00
yystopf 45a77e5c07 fix: readme private file path use authorize 2021-12-21 14:24:27 +08:00
yystopf d48700d200 Merge pull request '同步代码' (#288) from develop into standalone_develop 2021-12-10 09:19:42 +08:00
yystopf f79beef3f9 fix: issues branch educoder use master 2021-12-09 14:33:46 +08:00
yystopf 6ffc702209 Merge pull request '提交最新代码到预上线环境' (#272) from develop into standalone_develop 2021-11-29 15:44:51 +08:00
yystopf ea156cec7e fix: download type add video type 2021-11-29 15:33:09 +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 c19c83d505 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-05 11:36:51 +08:00
jasder 538d2113f1 FIX 完善重置密码功能 2021-11-03 17:19:43 +08:00
jasder 1008f17849 FIX 调整注册接口 2021-11-02 13:39:45 +08:00
yystopf 7193323be9 fix: field upper but 2021-11-02 09:59:21 +08:00
yystopf 28c3b4dda4 add: repo commit user use cache data 2021-11-02 09:59:21 +08:00