Gitlink
/
forgeplus-react
0
0
Fork 37
Code Issues Pull Requests 5 Releases 1 Wiki Activity

资助激励功能合并 #1

Closed
qyzh1996 wants to merge 128 commits from qyzh1996/forgeplus-react:sponsor into newVersion_forge
pull from: qyzh1996/forgeplus-react:sponsor
merge into: Gitlink:newVersion_forge
Conversation 0 Commits 128 Files Changed 115 +6632 -1435

128 Commits

Author SHA1 Message Date
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
caishi 57363291f1 change 2020-12-01 16:49:24 +08:00
qyzh 2cc888a972 fix bugs 2020-12-01 14:52:23 +08:00
caishi 2ba469f210 分支设置 2020-11-30 16:14:55 +08:00
caishi 06f0c53d3b 工作流分页 2020-11-27 16:29:08 +08:00
caishi 9005106332 clear 2020-11-27 15:43:55 +08:00
caishi 89b78bc046 修改和新建文件branch 2020-11-27 11:59:21 +08:00
caishi a38b74041e babelrc-runtime 2020-11-26 15:45:54 +08:00
caishi ccb5eb8ae5 Merge commit 'ef6559400411d4e9de4072441c9865e226936ba7' into dev_bei 
# Conflicts:
#	src/AppConfig.js
 2020-11-26 11:21:48 +08:00
caishi ef65594004 babel 2020-11-25 17:25:59 +08:00
caishi b27f0e796d === 2020-11-25 12:39:59 +08:00
caishi 92699347ec 分支设置 2020-11-24 18:00:34 +08:00
caishi 0062e84a45 Merge branch 'dev_bei' into dev_local 2020-11-24 10:47:05 +08:00
caishi 5827e96a53 branch router 2020-11-24 10:46:27 +08:00
caishi 8cc13f77e1 工作流-无权限提示 2020-11-23 15:23:19 +08:00
caishi ac5b50c26d detail 2020-11-23 10:14:29 +08:00
caishi b2eca51bd8 merge.css not found 2020-11-19 09:45:54 +08:00
caishi cbfb9c3ffe 本地版本-注册页面 2020-11-18 11:31:52 +08:00
caishi 1867497d52 detail 2020-11-17 14:08:21 +08:00
caishi d6fa304d01 detail 2020-11-17 09:48:33 +08:00
caishi bf84063a3c root 2020-11-16 16:17:03 +08:00
caishi 43fc24e114 没有数据时tab也不会显示 2020-11-16 14:18:41 +08:00
caishi a2e1b2abd1 version style 2020-11-13 14:26:06 +08:00
caishi 4edef931d5 style 2020-11-13 14:14:49 +08:00
caishi 49795b0682 && 2020-11-12 14:43:33 +08:00
caishi 0c59855e9c bug 2020-11-11 16:09:57 +08:00
caishi ef19107fcd sha link 2020-11-10 18:09:38 +08:00
caishi 0712904506 小bug 2020-11-10 16:56:05 +08:00
caishi 2f755e8d65 diff页面 2020-11-10 16:42:32 +08:00
qyzh ccace2a879 新增：修改赞助关系 2020-11-09 21:00:40 +08:00
caishi 0dd33faeb5 合并请求编辑权限 2020-11-09 09:57:15 +08:00
caishi 0dd722d898 router 2020-11-06 22:35:28 +08:00
caishi 2e04851b66 update 2020-11-06 18:41:23 +08:00
caishi f9588407b8 合并请求 2020-11-06 16:30:01 +08:00
caishi e9fef026a6 pr 2020-11-05 11:31:26 +08:00
caishi 5e36abb259 清除选中项-任务 2020-11-02 09:58:19 +08:00
caishi 0cb6986aed 无数据提示 2020-10-30 10:42:02 +08:00
caishi 80ef857048 box top 2020-10-30 10:13:08 +08:00
caishi 5bc172a492 update 2020-10-29 15:40:30 +08:00
caishi e42de09b99 pullrequest 2020-10-28 16:07:45 +08:00
caishi 3591666e5e 搜索时清除选中状态 2020-10-27 16:47:14 +08:00
caishi eb8cae5fb3 细节修改 2020-10-27 14:38:44 +08:00
caishi 8645eb8e1b merge 2020-10-23 10:34:03 +08:00
caishi 02f286ffad Merge branch 'dev_devOps' of https://git.trustie.net/jasder/forgeplus-react into dev_devOps 2020-10-23 10:15:48 +08:00
caishi ee6356daa0 style 2020-10-23 10:15:40 +08:00
caishi 62b99c7921 Merge branch 'dev_chain' of https://git.trustie.net/jasder/forgeplus-react into dev_devOps 
# Conflicts:
#	src/forge/Merge/UpdateMerge.js
#	src/forge/Order/Detail.js
#	src/forge/Order/OrderItem.js
#	src/forge/Order/order_form.js
 2020-10-22 22:41:16 +08:00
caishi 4ce8e4edd1 文件详情 2020-10-22 22:24:49 +08:00
caishi bba939094c educoder 项目 2020-10-22 19:34:11 +08:00
caishi 8d3c5c4c06 Merge branch 'newVersion_forge' into dev_devOps 2020-10-22 18:20:54 +08:00
caishi ac2ac26036 Merge branch 'newVersion_forge' into dev_devOps 2020-10-21 17:29:35 +08:00
caishi 849f695a78 Merge branch 'newVersion_forge' into dev_devOps 2020-10-21 16:50:15 +08:00
qyzh fc55df4d30 添加部分布局 2020-10-20 19:59:18 +08:00
caishi b6dfe2cd4a Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Main/Detail.js
 2020-10-19 15:43:53 +08:00
caishi ded423ee2c ismanager 2020-10-19 11:45:58 +08:00
caishi a5657390fe 工作流权限 2020-10-16 17:29:10 +08:00
caishi 51c2729916 马上认证 2020-10-16 11:39:12 +08:00
caishi aca923fe07 Merge branch 'newVersion_forge' into dev_devOps 2020-10-16 10:36:04 +08:00
caishi d029a9ab6f devops流程 2020-10-15 19:44:17 +08:00
caishi 46097ee5e1 Merge branch 'newVersion_forge' into dev_devOps 2020-10-10 15:55:58 +08:00
caishi c66717bf1b Merge branch 'newVersion_forge' into dev_devOps 2020-10-10 10:11:58 +08:00
caishi 8b1b923c92 Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 16:32:59 +08:00
caishi 4afa382c7c Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 16:05:00 +08:00
caishi b27f6d5732 Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 11:45:17 +08:00
caishi 4e657a4c15 Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 10:17:20 +08:00
caishi 229b5a704e Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 09:25:08 +08:00
caishi 69a9137c34 Merge branch 'newVersion_forge' into dev_devOps 2020-10-06 13:25:21 +08:00
caishi 8cee70c195 Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	public/css/iconfont.css
#	public/css/iconfont.eot
#	public/css/iconfont.js
#	public/css/iconfont.json
#	public/css/iconfont.svg
#	public/css/iconfont.ttf
#	public/css/iconfont.woff
#	public/css/iconfont.woff2
 2020-10-05 18:03:32 +08:00
caishi f7adc17b5d Merge branch 'newVersion_forge' into dev_devOps 2020-09-30 16:54:43 +08:00
caishi 48d9580e78 Merge branch 'newVersion_forge' into dev_devOps 2020-09-30 16:34:14 +08:00
caishi f3d6e8c6dc Merge branch 'newVersion_forge' into dev_devOps 2020-09-29 11:21:13 +08:00
caishi a14b125d34 Merge branch 'newVersion_forge' into dev_devOps 2020-09-29 10:41:17 +08:00
caishi 593f76bba0 update 2020-09-28 17:56:27 +08:00
caishi 45273782c5 工作流流程更改 2020-09-28 14:51:24 +08:00
caishi c3ed52bc32 Merge branch 'newVersion_forge' into dev_devOps 2020-09-27 13:59:04 +08:00
caishi 8397daec22 Merge branch 'newVersion_forge' into dev_devOps 2020-09-24 10:34:22 +08:00
caishi 1e80457885 Merge branch 'newVersion_forge' into dev_devOps 2020-09-23 21:33:00 +08:00
caishi c052cf715b Merge branch 'newVersion_forge' into dev_devOps 2020-09-23 16:19:21 +08:00
qyzh 236a8f127a sponsor tiers增删改查 2020-09-19 10:00:30 +08:00
caishi 53e444d85e Merge branch 'newVersion_forge' into dev_devOps 2020-09-16 18:28:03 +08:00
caishi cd6540a84c Merge branch 'newVersion_forge' into dev_devOps 2020-09-16 18:00:07 +08:00
caishi 10d4ad7221 Merge branch 'newVersion_forge' into dev_devOps 2020-09-16 17:48:12 +08:00
caishi 440e7cd91e 头部 2020-09-16 17:10:26 +08:00
Jasder 0991fee06a FIX 局部优化 2020-09-11 17:35:05 +08:00
Jasder 8307c014f6 FIX 项目激活ci服务的认证地址根据用户是否认证的状态来显示 2020-09-11 16:51:23 +08:00
Jasder dace62e2de skilled status css color for ci build 2020-09-11 16:44:15 +08:00
qyzh c696924523 赞助管理页面修改 2020-09-10 15:55:52 +08:00
qyzh 381ad7135b 开发赞助管理页面 2020-09-10 10:12:49 +08:00
caishi 74ea4d504d 细节 2020-09-10 09:47:09 +08:00
caishi 942e88a6ea selectkeys 2020-09-09 16:50:48 +08:00
caishi 87449bde46 暂无-手动创建 2020-09-09 15:35:22 +08:00
caishi 3060c4bb2b Merge branch 'newVersion_forge' into dev_devOps 2020-09-09 14:20:52 +08:00
caishi b6bc59a775 Merge branch 'newVersion_forge' into dev_devOps 2020-09-09 10:46:56 +08:00
caishi 745179adae Merge branch 'newVersion_forge' into dev_devOps 2020-09-08 14:55:29 +08:00
caishi 15bd20122a Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Images/banner_list_old.png
#	src/forge/Main/list.css
 2020-09-08 14:37:05 +08:00
caishi afeff6b0af Merge branch 'newVersion_forge' into dev_devOps 2020-09-08 10:23:28 +08:00
qyzh 016c0bee00 编辑资助页面 2020-09-08 10:05:27 +08:00
caishi b66c1c01de image 2020-09-07 17:15:03 +08:00
caishi ec98b6ad44 status 2020-09-07 15:29:25 +08:00
caishi e252f168f8 Merge branch 'newVersion_forge' into dev_devOps 2020-09-07 15:02:43 +08:00
caishi 6944406c49 status 2020-09-07 15:02:25 +08:00
caishi 2f09ca4315 link 2020-09-07 12:00:07 +08:00
caishi 4329b89ddf 列表 2020-09-07 11:38:43 +08:00
caishi 30f0fd82de devops-个人中心-权限 2020-09-07 11:00:59 +08:00
caishi 6795e61870 个人中心-工作流CI 2020-09-04 18:00:22 +08:00
caishi 3169867415 merge 2020-09-03 14:16:55 +08:00
caishi d697ad24a7 个人中心-devops 2020-09-03 14:14:49 +08:00
caishi f05b6eb804 loading 2020-09-02 18:09:06 +08:00
caishi d702a92e81 about 2020-09-02 11:29:56 +08:00
caishi 11e58a200c input 2020-09-02 11:29:31 +08:00
sylor_huang@126.com 6d478dd911 Merge branch 'newVersion_forge' into dev_devOps 2020-09-01 11:41:59 +08:00
caishi 15d3102c51 Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Main/CoderRootDirectory.js
 2020-08-31 16:37:31 +08:00
caishi bac40864eb update 2020-08-31 14:07:09 +08:00
caishi cccdfeab32 build 2020-08-28 11:58:32 +08:00
caishi 3abbaa8899 devops 2020-08-27 15:15:03 +08:00
caishi 42a1418181 path 2020-08-27 10:26:28 +08:00
caishi ec073cdf71 .json 2020-08-26 18:37:15 +08:00
caishi a09b81df3f devops 2020-08-26 17:11:42 +08:00
caishi a411d2c111 devops 2020-08-26 16:09:27 +08:00
caishi 2f1bac24d5 Merge branch 'newVersion_forge' into dev_devOps 
# Conflicts:
#	src/forge/Main/Detail.js
 2020-08-21 10:29:08 +08:00
caishi 940c9c0253 工作流 2020-08-09 22:39:58 +08:00
caishi dfbcc09e5b devops 2020-07-31 20:15:28 +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