morii
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
671 Commits 65 Branches 2 Tags 458 MiB
Commit Graph

671 Commits

Author SHA1 Message Date
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
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 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