nanda版本 #502

Merged
xxq250 merged 19 commits from qyzh1996/forgeplus-react:sponsor into dev_nanda 2023-01-12 22:19:43 +08:00

19 Commits

Author SHA1 Message Date
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
qyzh 600227600a 本地化改动 2021-12-16 19:43:58 +08:00
qyzh f05984a7ca merge gitlink/develop 2021-09-24 17:20:33 +08:00
qyzh b03d8c2f07 所有图表的前后端交互 2021-06-09 11:03:22 +08:00
qyzh 25e768f5af 修复取消赞助重复提示 2021-06-02 11:22:02 +08:00
qyzh d35da06e5b fix bugs 2020-12-27 21:55:20 +08:00
qyzh c27b64eecc fix bugs 2020-12-14 22:05:53 +08:00
qyzh f4fca18228 merge dev_bei to sponsor, fix conflict 2020-12-01 19:10:26 +08:00
qyzh 2cc888a972 fix bugs 2020-12-01 14:52:23 +08:00
qyzh ccace2a879 新增:修改赞助关系 2020-11-09 21:00:40 +08:00
qyzh fc55df4d30 添加部分布局 2020-10-20 19:59:18 +08:00
qyzh 236a8f127a sponsor tiers增删改查 2020-09-19 10:00:30 +08:00
qyzh c696924523 赞助管理页面修改 2020-09-10 15:55:52 +08:00
qyzh 381ad7135b 开发赞助管理页面 2020-09-10 10:12:49 +08:00
qyzh 016c0bee00 编辑资助页面 2020-09-08 10:05:27 +08:00
qyzh 0f5712eb0e fix conflicts 2020-07-23 09:06:24 +08:00
qyzh df9d6aa8a2 ignore sublime workspace file 2020-07-22 17:34:43 +08:00
qyzh 622715919e before merge 2020-07-22 17:33:05 +08:00