Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,516 Commits 28 Branches 0 Tags 169 MiB
Commit Graph

2516 Commits

Author SHA1 Message Date
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
caishi 311c3d072c pull 2022-12-05 09:34:25 +08:00
caishi 9ed47edb27 save 2022-12-05 09:32:11 +08:00
谢思 308a75ac0b 代码库上传文件放开文件类型限制 2022-12-02 11:36:36 +08:00
tongChong fa47fcf0f6 Merge pull request '代码库上传文件限制文件类型' (#481) from durian/forgeplus-react:gitlink_server into gitlink_server 2022-12-02 11:22:32 +08:00
谢思 4f29bb1c3d Merge branch 'gitlink_server' of http://106.75.45.236:3000/Gitlink/forgeplus-react into gitlink_server 2022-12-02 10:22:31 +08:00
caishi 2c07870f9e issue筛选条件清除 2022-11-30 11:07:44 +08:00
谢思 28e0afedef 代码库上传文件限制文件类型 2022-11-29 16:46:33 +08:00
caishi 4f05ce683a remove console 2022-11-29 12:23:16 +08:00
tongChong 2873c4425d Merge pull request 'issue' (#480) from durian/forgeplus-react:gitlink_server into gitlink_server 2022-11-28 16:08:37 +08:00
谢思 6547657e45 仓库readme展示优化、组织项目列表翻页组件bug、关于我们-合作伙伴样式优化以及参数调整 2022-11-28 16:01:43 +08:00
caishi ed1b881cf4 issue 2022-11-28 15:46:05 +08:00
谢思 4b381b8b56 Merge branch 'gitlink_server' of http://106.75.45.236:3000/Gitlink/forgeplus-react into gitlink_server 2022-11-28 15:45:11 +08:00
谢思 6278d0651c Merge branch 'gitlink_server' of http://106.75.45.236:3000/Gitlink/forgeplus-react into gitlink_server 2022-11-28 15:25:49 +08:00
caishi 008bab7131 修改资料-提示 2022-11-25 16:22:34 +08:00
caishi 78a762f775 add supplyPhone modal 2022-11-25 15:57:26 +08:00
谢思 8d92f2962b Merge branch 'gitlink_server' of http://106.75.45.236:3000/Gitlink/forgeplus-react into gitlink_server 2022-11-25 15:37:53 +08:00
caishi c23dbaa492 更新手机号 2022-11-24 17:37:54 +08:00
caishi 3e56087c33 退出、登录反复情况下头像下拉框的内容无法渲染 2022-11-22 15:27:58 +08:00