liuyishou
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,534 Commits 64 Branches 2 Tags 559 MiB
Commit Graph

2534 Commits

Author SHA1 Message Date
xxq250 3800a62810 Merge pull request '更新对不使用/使用区块链的判断适配' (#506) from Nigel/forgeplus-react:master_zxh into dev_nanda 2023-02-04 18:10:18 +08:00
zhangxunhui fcaaef137a 调整了前端对使用和未使用确权项目的支持 2023-02-04 11:08:53 +08:00
zhangxunhui c2a21b2780 change getData file 2023-02-03 14:16:09 +08:00
xxq250 266036cd2a Merge pull request '对区块链相关功能的修改' (#505) from Nigel/forgeplus-react:master_zxh into dev_nanda 2023-02-02 21:51:08 +08:00
zhangxunhui 016b69f5ed 删除了个人赞助信息修改的链接 2023-02-02 21:37:12 +08:00
zhangxunhui 95ebb0aba2 修改了填写项目创始人token占比的文字描述 2023-02-02 21:32:20 +08:00
zhangxunhui 11d0ec97d9 change project name to identifier 2023-02-02 20:45:01 +08:00
xxq250 ed4d11876d Merge pull request '增加了对项目中显示贡献者贡献度的支持' (#504) from Nigel/forgeplus-react:master_zxh into dev_nanda 2023-02-02 17:16:22 +08:00
zhangxunhui 19d025b602 添加了对项目中用户贡献度显示的支持 2023-02-02 17:01:35 +08:00
xxq250 fbf8e7784b Merge pull request '更新了贡献确权（blockchain）相关代码' (#503) from Nigel/forgeplus-react:master_zxh into dev_nanda 2023-01-31 10:31:04 +08:00
zhangxunhui 48d042ad64 修改了blockchain相关前端代码 2023-01-30 21:17:15 +08:00
zhangxunhui 88087b4d62 修改了change_blockchain_type函数 2023-01-30 20:38:09 +08:00
zhangxunhui 806b0e5438 update user infos.js for blockchain 2023-01-30 20:24:04 +08:00
zhangxunhui 95201ec88d 修改了加入确权机制的文字说明 2023-01-29 08:20:29 +08:00
xxq250 99efe31609 Merge pull request 'nanda版本' (#502) from qyzh1996/forgeplus-react:sponsor into dev_nanda 2023-01-12 22:19:42 +08:00
xxq250 bf4165e92c Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus-react into master_zxh 2023-01-12 22:18:53 +08:00
xxq250 cd2b383b0d Merge pull request '区块链版本' (#501) from Nigel/forgeplus-react:master_zxh into dev_nanda 2023-01-12 21:32:26 +08:00
xxq250 5b109d8afa 修正合并错误 2023-01-12 21:27:11 +08:00
xxq250 da5305cb2d Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus-react into master_zxh 
 Conflicts:
	.idea/workspace.xml
	package.json
	src/forge/New/Index.js
	src/forge/Order/order_form.js
	src/forge/users/Infos.js
 2023-01-12 21:12:13 +08:00
xxq250 a9cfa2b56f Merge pull request 'nanda版本' (#500) from qyzh1996/forgeplus-react:sponsor into dev_nanda 2023-01-12 21:07:16 +08:00
xxq250 002156fa61 修正合并错误 2023-01-12 20:52:53 +08:00
xxq250 9e65e9332c Merge branch 'pre_gitlink_server' of https://gitlink.org.cn/Gitlink/forgeplus-react into sponsor 
 Conflicts:
	.gitignore
	package-lock.json
	package.json
	src/App.js
	src/AppConfig.js
	src/forge/Main/sub/DetailBanner.jsx
	src/forge/users/Infos.js
	src/forge/users/InfosUser.js
 2023-01-12 18:50:53 +08:00
caishi 8f75ed4637 动态-新增内容显示 2023-01-06 10:52:57 +08:00
caishi 2731d54fd1 issue 2023-01-05 13:26:19 +08:00
caishi b1d13f4014 个人主页-修改简介 2022-12-30 13:53:36 +08:00
caishi acb87c7e09 update 2022-12-30 11:59:33 +08:00
caishi c0bbe817d8 merge 2022-12-29 11:06:29 +08:00
caishi ef91e6ece9 add 2022-12-29 11:06:05 +08:00
tongChong e789c8365b Merge pull request '增加百度统计，优化项目加载文件，合并css文件，react调用cdn资源' (#493) from tongChong/forgeplus-react:gitlink_server into gitlink_server 2022-12-28 16:14:37 +08:00
何童崇 be3157f9c4 优化项目加载文件，合并css文件，react调用cdn资源 2022-12-28 15:33:19 +08:00
caishi 7cf9e7b6f1 update 同上 2022-12-27 14:18:46 +08:00
caishi 6610f7f065 第三方登录-第二版 2022-12-26 15:26:57 +08:00
caishi a446c45bff merge 2022-12-14 16:02:23 +08:00
tongChong 90898afc81 Merge pull request '更新' (#487) from durian/forgeplus-react:gitlink_server into gitlink_server 2022-12-14 15:42:16 +08:00
caishi 7588cab079 登录后不能进入注册登录等页面 2022-12-14 15:07:38 +08:00
谢思 aa0f02b402 优化导航栏样式，超出显示区域左右滚动 2022-12-12 17:25:05 +08:00
caishi 156b2fd5e3 组织设置为私有+弹框 2022-12-12 16:05:00 +08:00
caishi fd042dec1b style 2022-12-09 15:26:14 +08:00
caishi a1ef6862a0 merge 2022-12-09 14:57:18 +08:00
xxq250 004829eee3 Merge pull request '更新' (#484) from durian/forgeplus-react:gitlink_server into gitlink_server 2022-12-09 14:57:57 +08:00
caishi f37c2b5670 register panel position 2022-12-09 14:56:33 +08:00
caishi 6a2d04c9a5 third login tip 2022-12-09 14:45:38 +08:00
谢思 400ce3f8cd 添加登录注册找回密码等6个网页标题，新增wiki显示文案错误，从我关注的/关注我的跳回个人主页之后无tab导航问题 2022-12-09 14:32:19 +08:00
caishi 56ff7958b4 change 2022-12-08 16:45:34 +08:00
caishi 27d93bd964 merge 2022-12-08 14:52:41 +08:00
xxq250 3bec9b5a1c Merge pull request '更新' (#483) from durian/forgeplus-react:gitlink_server into gitlink_server 2022-12-08 14:53:47 +08:00
caishi f688ef5258 新建文件-content用base64加密 2022-12-08 14:50:49 +08:00
谢思 37499aa201 网页标题修改 2022-12-08 11:01:52 +08:00
谢思 7a48179753 Merge branch 'gitlink_server' of https://git.trustie.net/durian/forgeplus-react into gitlink_server 2022-12-07 18:33:29 +08:00
谢思 ec47699ef8 网页标题修改-个人主页/组织/项目点赞关注fork列表 2022-12-07 18:32:52 +08:00