KingChan
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,186 Commits 67 Branches 0 Tags 728 MiB
Commit Graph

4186 Commits

Author SHA1 Message Date
xxq250 52457e92c7 Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus into dev_nanda 
# Conflicts:
#	app/controllers/issues_controller.rb
 2023-02-04 18:09:46 +08:00
xxq250 1c1388dec5 Merge pull request '更新对不使用/使用区块链的判断适配' (#326) from Nigel/forgeplus:master into dev_nanda 2023-02-04 18:08:29 +08:00
zhangxunhui 06a6794245 调整了blockchain api 2023-02-04 11:06:04 +08:00
zhangxunhui b1ef05e0be change reponame to identifier 2023-02-03 14:08:22 +08:00
zhangxunhui 11023cbc70 change reponame to identifier 2023-02-03 14:07:39 +08:00
zhangxunhui 7b1b03ab41 change push_activity_2_blockchain by querying projects with identifier 2023-02-03 13:19:27 +08:00
zhangxunhui 7aca2e487e change find by name to find by identifier 2023-02-03 09:23:31 +08:00
zhangxunhui 8aa844749f 对token初始化增加了非空数量的判断 2023-02-03 09:11:45 +08:00
xxq250 fbb88455a3 Merge pull request '对区块链相关功能的修改' (#325) from Nigel/forgeplus:master into dev_nanda 2023-02-02 21:50:53 +08:00
xxq250 674b2b1b7f Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus into dev_nanda 2023-02-02 21:49:24 +08:00
zhangxunhui 8e89be831c 添加了对blockchain相关数据格式的检查 2023-02-02 21:31:05 +08:00
zhangxunhui 45cef457d3 修改了use blockchain的判断条件 2023-02-02 20:44:01 +08:00
zhangxunhui 015d221ccf fix bug of blockchain_balance_one_project function 2023-02-02 20:42:38 +08:00
xxq250 0b760c4ea6 Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus into dev_nanda 2023-02-02 17:19:28 +08:00
xxq250 490d875618 Merge pull request '增加了对项目中显示贡献者贡献度的支持' (#324) from Nigel/forgeplus:master into dev_nanda 2023-02-02 17:16:03 +08:00
zhangxunhui 2f6c568688 添加了对区块链项目基本信息的查询函数 2023-02-02 17:00:49 +08:00
zhangxunhui 18a900a07e 添加了对contribution perc的路由支持 2023-02-02 17:00:12 +08:00
zhangxunhui 1da1c51ba7 watchable用户贡献度的支持 2023-02-02 16:59:10 +08:00
zhangxunhui efc96f3467 添加对hovercard4proj的支持 2023-02-02 16:56:04 +08:00
zhangxunhui c5ee0e5400 添加了针对项目贡献度量的hover json请求模板 2023-02-02 16:55:25 +08:00
zhangxunhui ada6afa500 修改了contribution_perc函数，添加了对区块链确权项目的支持 2023-02-02 14:00:13 +08:00
zhangxunhui c5314f7439 添加了对区块链上仓库基本信息的查询 2023-02-02 13:59:24 +08:00
zhangxunhui bbe8407311 add contribution percentage route 2023-02-01 14:48:10 +08:00
zhangxunhui 19e7fcaafa add contribution_perc function 2023-02-01 14:47:56 +08:00
zhangxunhui 3c18d1ee9b remove duplicate render of journal 2023-02-01 14:45:04 +08:00
zhangxunhui aabf1ee50f remove render_ok after creating pull request 2023-01-31 15:29:08 +08:00
xxq250 45f120028e fixed 错误代码 2023-01-30 23:04:47 +08:00
xxq250 05cdffdce7 fixed 错误代码 2023-01-30 22:59:36 +08:00
xxq250 d294a68624 fixed 错误代码 2023-01-30 22:58:37 +08:00
xxq250 2271afe98c fixed 错误代码 2023-01-30 22:58:29 +08:00
xxq250 0ca2ee7959 Merge pull request '更新了贡献确权（blockchain）相关代码' (#323) from Nigel/forgeplus:master into dev_nanda 2023-01-30 21:50:04 +08:00
zhangxunhui 6b6a4bc48e change render_okr to render_ok 2023-01-30 21:45:48 +08:00
zhangxunhui 84f094ac55 change end comment 2023-01-30 21:37:31 +08:00
zhangxunhui d9a0b34cb8 comment user.current 2023-01-30 21:35:22 +08:00
zhangxunhui 81685f88cd Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus 2023-01-30 21:25:20 +08:00
zhangxunhui 79eb1b93e9 update blockchain related services 2023-01-30 21:18:11 +08:00
zhangxunhui 3f618b3a09 update application_service 2023-01-30 20:21:36 +08:00
zhangxunhui 31a3e6ccea update push_activity_2_blockchain function 2023-01-30 20:20:44 +08:00
zhangxunhui 744e0eddf8 update two services 2023-01-30 14:32:14 +08:00
zhangxunhui dc486d0a73 update issue controller for blockchain 2023-01-28 16:50:46 +08:00
zhangxunhui f0f7a1dcd7 update configuration 2023-01-28 10:14:21 +08:00
zhangxunhui 38333ab7b1 re-add the invocation of create_repo_on_blockchain when creating projects 2023-01-28 10:12:01 +08:00
xxq250 cc9f2214b5 redis对象开启 2023-01-13 11:19:53 +08:00
xxq250 8a1c8074c3 Merge pull request '修正合并错误' (#322) from Nigel/forgeplus:master into dev_nanda 2023-01-12 23:58:07 +08:00
xxq250 45d23a0aad 修正合并错误 2023-01-12 23:55:17 +08:00
xxq250 86e36263fd Merge pull request '修正合并错误' (#321) from Nigel/forgeplus:master into dev_nanda 2023-01-12 23:50:37 +08:00
xxq250 6be3fbbebd Merge pull request '合并代码错误' (#320) from Nigel/forgeplus:master into dev_nanda 2023-01-12 23:48:25 +08:00
xxq250 141414dcf2 修正合并错误 2023-01-12 23:47:43 +08:00
xxq250 422c801224 修正合并错误 2023-01-12 23:43:19 +08:00
xxq250 a8ae755af3 Merge pull request '区块链版本' (#319) from Nigel/forgeplus:master into dev_nanda 2023-01-12 21:33:25 +08:00