Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
646 Commits 28 Branches 0 Tags 188 MiB
Commit Graph

646 Commits

Author SHA1 Message Date
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 d1e7d2e935 image url 2020-10-22 18:20:42 +08:00
caishi ac2ac26036 Merge branch 'newVersion_forge' into dev_devOps 2020-10-21 17:29:35 +08:00
caishi 42ddb67c0e spin 2020-10-21 17:29:25 +08:00
caishi 849f695a78 Merge branch 'newVersion_forge' into dev_devOps 2020-10-21 16:50:15 +08:00
caishi d80f1d32dc 非trustie则新开页 2020-10-21 16:49:59 +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 7edaa9e09c manager/owner 2020-10-19 15:41:10 +08:00
caishi ded423ee2c ismanager 2020-10-19 11:45:58 +08:00
caishi a5657390fe 工作流权限 2020-10-16 17:29:10 +08:00
sylor_huang@126.com 5a8daf7cfe Change NewHeader active 2020-10-16 17:17:14 +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 3949584549 编辑文件-提交至 2020-10-16 10:35:51 +08:00
caishi d029a9ab6f devops流程 2020-10-15 19:44:17 +08:00
caishi 4f13421872 style 2020-10-12 14:00:18 +08:00
caishi 46097ee5e1 Merge branch 'newVersion_forge' into dev_devOps 2020-10-10 15:55:58 +08:00
caishi 611dada014 update 2020-10-10 15:55:42 +08:00
caishi c66717bf1b Merge branch 'newVersion_forge' into dev_devOps 2020-10-10 10:11:58 +08:00
caishi 37b0ca5817 detail update 2020-10-10 10:11:44 +08:00
caishi 8b1b923c92 Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 16:32:59 +08:00
caishi c93b874493 背景颜色 2020-10-09 16:32:47 +08:00
caishi 4afa382c7c Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 16:05:00 +08:00
caishi a0f279342a 搜索 2020-10-09 16:04:45 +08:00
caishi b27f6d5732 Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 11:45:17 +08:00
caishi 3dc1129a34 nav icon 2020-10-09 11:45:04 +08:00
caishi 4e657a4c15 Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 10:17:20 +08:00
caishi 619acfe9e4 需求 2020-10-09 10:17:00 +08:00
caishi 229b5a704e Merge branch 'newVersion_forge' into dev_devOps 2020-10-09 09:25:08 +08:00
caishi 36a9f16634 头部改版 2020-10-09 09:24:57 +08:00
caishi 69a9137c34 Merge branch 'newVersion_forge' into dev_devOps 2020-10-06 13:25:21 +08:00
caishi 36833232e3 编辑权限 2020-10-06 13:21:12 +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 ef465b1ce0 主页 2020-10-05 18:01:56 +08:00
caishi f7adc17b5d Merge branch 'newVersion_forge' into dev_devOps 2020-09-30 16:54:43 +08:00
caishi 61f656ca8f reset keywords 2020-09-30 16:54:23 +08:00