durian
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dev_bei->test_forge #1

Closed
durian wants to merge 423 commits from dev_bei into test_forge
pull from: dev_bei
merge into: durian:test_forge
Conversation 0 Commits 423 Files Changed 411 +20084 -53453

423 Commits

Author SHA1 Message Date
caishi 5c91569bac c 2020-12-18 17:14:51 +08:00
caishi a4dbda8c5d 分支设置下拉列表不可选择标签 2020-12-18 14:01:38 +08:00
caishi e3c1e7b82f markdown 2020-12-17 17:59:30 +08:00
caishi 7795fe1d04 markdown 2020-12-17 14:35:36 +08:00
caishi 5d0afb265b 镜像设置相关 2020-12-16 13:52:44 +08:00
caishi 45fc4dcdcd position 2020-12-16 11:37:56 +08:00
caishi 2129a222e5 锚点跳转 2020-12-15 18:01:16 +08:00
caishi 68eb499a8c CI服务 2020-12-14 17:04:58 +08:00
caishi 5f36f9306a tag color 2020-12-14 14:12:41 +08:00
caishi e95ef11058 style 2020-12-11 18:14:25 +08:00
caishi 851afbc6c4 小修 2020-12-09 14:19:55 +08:00
caishi ee79efa6de bug 2020-12-08 17:16:07 +08:00
caishi 6b203d9d24 分支设置 2020-12-04 20:30:23 +08:00
caishi 0d1345f957 分支设置 2020-12-04 19:26:14 +08:00
caishi 57363291f1 change 2020-12-01 16:49:24 +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
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
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
caishi 48d9580e78 Merge branch 'newVersion_forge' into dev_devOps 2020-09-30 16:34:14 +08:00
caishi c646862f01 keywords 2020-09-30 16:34:03 +08:00
sylor_huang@126.com 5b627f787f Change 2020-09-29 14:47:45 +08:00
sylor_huang@126.com 876a1ccc3c Conficts 2020-09-29 14:26:00 +08:00
sylor_huang@126.com 17c6d94d7e Add Download 2020-09-29 14:25:16 +08:00
caishi f3d6e8c6dc Merge branch 'newVersion_forge' into dev_devOps 2020-09-29 11:21:13 +08:00
caishi 74803c7bc2 editor 2020-09-29 11:21:00 +08:00
caishi a14b125d34 Merge branch 'newVersion_forge' into dev_devOps 2020-09-29 10:41:17 +08:00
caishi d7103d44f7 decodeURL 2020-09-29 10:41:04 +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 35046ba96a Merge branch 'newVersion_forge' of https://git.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-09-27 13:58:51 +08:00
caishi 2a5823a347 小修 2020-09-27 13:58:44 +08:00
sylor_huang@126.com c6eb67404a Add Attachment4 2020-09-25 11:00:17 +08:00
sylor_huang@126.com d228d7bcbf Add Attachment3 2020-09-25 10:53:30 +08:00
sylor_huang@126.com dd9de256e4 Add Attachment Video 2020-09-24 14:57:11 +08:00
sylor_huang@126.com 615a4debe5 Add Attachment Video 2020-09-24 14:55:44 +08:00
caishi 8397daec22 Merge branch 'newVersion_forge' into dev_devOps 2020-09-24 10:34:22 +08:00
caishi 68a859d1c7 header 2020-09-24 10:34:10 +08:00
caishi 1e80457885 Merge branch 'newVersion_forge' into dev_devOps 2020-09-23 21:33:00 +08:00
caishi 0c966b4ad3 logo闪现 2020-09-23 21:32:46 +08:00
caishi c052cf715b Merge branch 'newVersion_forge' into dev_devOps 2020-09-23 16:19:21 +08:00
caishi 2e6acd0024 name 2020-09-23 16:08:38 +08:00
sylor_huang@126.com 7b32b39285 Change Issues Clean Routes 2020-09-18 17:25:36 +08:00
sylor_huang@126.com abe2d8d537 Change Issues Clean Routes 2020-09-18 17:18:28 +08:00
caishi 53e444d85e Merge branch 'newVersion_forge' into dev_devOps 2020-09-16 18:28:03 +08:00
caishi 8a3c4f3000 banner 2020-09-16 18:27:51 +08:00
caishi cd6540a84c Merge branch 'newVersion_forge' into dev_devOps 2020-09-16 18:00:07 +08:00
caishi 44ac961ef1 color 2020-09-16 17:59:57 +08:00
caishi 10d4ad7221 Merge branch 'newVersion_forge' into dev_devOps 2020-09-16 17:48:12 +08:00
caishi c7b462957e 用户名 2020-09-16 17:47:56 +08:00
caishi 440e7cd91e 头部 2020-09-16 17:10:26 +08:00
caishi 776ebfdef5 头部 2020-09-16 17:09:31 +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
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 f019d2da69 console 2020-09-09 14:20:27 +08:00
caishi b6bc59a775 Merge branch 'newVersion_forge' into dev_devOps 2020-09-09 10:46:56 +08:00
caishi 460a258213 切换分支、未查询到对应的文件或者文件夹 2020-09-09 10:46:40 +08:00
caishi 745179adae Merge branch 'newVersion_forge' into dev_devOps 2020-09-08 14:55:29 +08:00
caishi e38dd724cf 图片压缩 2020-09-08 14:55:15 +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 0e54e49b98 详情banner 2020-09-08 14:35:50 +08:00
caishi 5415d40f26 首页banner 2020-09-08 14:31:49 +08:00
caishi afeff6b0af Merge branch 'newVersion_forge' into dev_devOps 2020-09-08 10:23:28 +08:00
caishi 397caa1f89 Merge branch 'newVersion_forge' of https://git.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-09-08 10:23:00 +08:00
caishi 90e773bad0 开源项目首页banner 2020-09-08 10:22:34 +08:00
sylor_huang@126.com 5efc8fffd6 Fixed: Activity 2020-09-07 18:41:40 +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
sylor_huang@126.com 12d603a0d2 Merge branch 'newVersion_forge' of http://git.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-09-07 11:50:46 +08:00
sylor_huang@126.com 3758e0397f Change Href 2020-09-07 11:50:35 +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 cb0c9328e4 issue列表没有对齐 2020-09-03 14:16:12 +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
caishi 41a3e9f3d9 newheader 2020-09-02 10:49:59 +08:00
caishi 9e5b8a0859 autocomplete 2020-09-02 10:49:17 +08:00
sylor_huang@126.com 6d478dd911 Merge branch 'newVersion_forge' into dev_devOps 2020-09-01 11:41:59 +08:00
sylor_huang@126.com 0aa8aafac8 Merge branch 'newVersion_forge' of http://git.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-09-01 11:29:31 +08:00
sylor_huang@126.com 91fdeb9fd4 Change Header Nav 2020-09-01 11:29:10 +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 8be0341137 图片放大后点击隐藏 2020-08-31 16:31:00 +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 81f9e9728e path 2020-08-27 10:27:31 +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 ce950ea45c url 2020-08-20 18:07:37 +08:00
caishi a7f4ee418e remove coders 2020-08-19 18:34:52 +08:00
caishi d05096561a url 2020-08-18 17:59:45 +08:00
caishi 6efe287bc1 labels 2020-08-18 17:21:11 +08:00
caishi 85585746f7 check&change 2020-08-18 16:56:52 +08:00
caishi 8120a2d4e2 renderHtml 2020-08-18 09:55:20 +08:00
caishi 2f418c6cd7 route 2020-08-17 18:44:02 +08:00
caishi 9f43848bdb url 2020-08-17 13:59:05 +08:00
sylor_huang@126.com 7d315ebc47 change 2020-08-15 15:14:32 +08:00
sylor_huang@126.com 3e2d89724a Merge branch 'newVersion_forge' of http://git.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-08-15 15:08:21 +08:00
sylor_huang@126.com ef5d2318d6 change 2020-08-15 15:08:20 +08:00
caishi 4843cb1f35 链接 2020-08-15 15:06:42 +08:00
caishi 774904f1c4 merge 2020-08-15 14:10:53 +08:00
caishi 7cb76d7189 url 2020-08-15 11:22:47 +08:00
caishi 8f76e46644 nodata-link 2020-08-14 11:45:33 +08:00
caishi 1027156adb fork 2020-08-14 10:08:38 +08:00
caishi 6e7b6f3928 删除文件 2020-08-13 18:10:08 +08:00
caishi 262f70e538 language 2020-08-13 17:59:32 +08:00
caishi ca03171d06 文本语言 2020-08-13 17:46:50 +08:00
caishi 2805324921 接口 2020-08-13 17:37:52 +08:00
caishi b743bdaf3c Merge branch 'newVersion_forge' of https://git.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-08-13 15:44:06 +08:00
caishi aa28f8a99d route 2020-08-13 15:44:02 +08:00
sylor_huang@126.com 7e89e4229d Merge branch 'newVersion_forge' of http://git.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-08-13 11:56:01 +08:00
sylor_huang@126.com c820d88a34 Change 2020-08-13 11:55:48 +08:00
caishi b5811aa33b Merge branch 'newVersion_forge' of https://git.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-08-13 11:42:47 +08:00
caishi 6fe871b8cb route 2020-08-13 11:42:44 +08:00
sylor_huang@126.com c30c270371 Fix: Add New File Language Api Wrong 2020-08-13 10:51:24 +08:00
sylor_huang@126.com 0e2cc884a7 Fix: Add New File Language Api Wrong 2020-08-13 10:38:18 +08:00
caishi 537c9ae40a route 2020-08-12 18:13:18 +08:00
caishi 940c9c0253 工作流 2020-08-09 22:39:58 +08:00
caishi dfbcc09e5b devops 2020-07-31 20:15:28 +08:00
caishi cefd974498 md p标签不换行 2020-07-31 11:21:02 +08:00
caishi efc96cfc8c status_type 2020-07-28 10:01:49 +08:00
caishi d4e9d0128b 里程碑 2020-07-27 18:45:18 +08:00
caishi 904da46b8c git地址提示 2020-07-22 15:50:08 +08:00
caishi 46b5123fab 复制 2020-07-22 10:30:54 +08:00
caishi 21ec6df821 新建任务 2020-07-22 10:13:12 +08:00
caishi 2a758e088f md 2020-07-21 17:36:44 +08:00
caishi e3b46dbde8 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-07-21 15:29:16 +08:00
caishi c71feff3fc 问题反馈 2020-07-21 15:29:11 +08:00
sylor_huang@126.com 0354377539 Change Editor word break 2020-07-20 15:55:55 +08:00
sylor_huang@126.com 403e20ea99 Change Urls 2020-07-20 11:46:52 +08:00
sylor_huang@126.com f635a0aad6 Change URLS 2020-07-20 11:40:55 +08:00
caishi 37e3fbae91 setting接口不停调用 2020-07-20 10:20:26 +08:00
caishi 9e456c0cca md换行无效 2020-07-17 18:09:24 +08:00
caishi 72bb222e95 使用手册 2020-07-17 17:36:36 +08:00
caishi 529184f6a5 里程碑数量 2020-07-17 09:45:02 +08:00
caishi 9ebf207602 issue新开页 2020-07-17 09:33:51 +08:00
caishi d327647f3d style 2020-07-16 18:55:40 +08:00
caishi b1cc0af5c3 style 2020-07-16 18:52:32 +08:00
caishi 07a81578d9 组件公用-选择文件语言类型 2020-07-16 16:33:14 +08:00
sylor_huang@126.com d4220b9a6b change bugs 2020-07-16 14:15:02 +08:00
sylor_huang@126.com 4a5d52116c Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-07-16 11:30:54 +08:00
sylor_huang@126.com e8145fb0a4 change 2020-07-16 11:30:41 +08:00
caishi 6251255e0a Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-07-16 11:22:02 +08:00
caishi c90b17bf26 update 2020-07-16 11:21:56 +08:00
sylor_huang@126.com c7e95674bb 隐藏项目，并使用后端返回 2020-07-16 10:13:05 +08:00
caishi fd0f26a043 loading 2020-07-16 09:54:40 +08:00
caishi fd7d32de41 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-07-16 09:40:45 +08:00
caishi 138a4c551d hide 2020-07-16 09:40:39 +08:00
sylor_huang@126.com cee30e200f change 2020-07-16 00:37:41 +08:00
caishi c3d80fb588 样式 2020-07-15 17:17:31 +08:00
caishi a203c2285f hide 2020-07-13 15:24:13 +08:00
caishi 2bd7a24f98 fault 2020-07-13 15:17:28 +08:00
caishi 108c4484e8 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-07-10 15:43:03 +08:00
caishi 2f8fd57349 new page + fix bug 2020-07-10 15:42:57 +08:00
sylor_huang@126.com e07e5d9952 change projects styles2 2020-07-07 14:28:02 +08:00
sylor_huang@126.com b8badbb0d7 change projects styles 2020-07-07 13:55:53 +08:00
sylor_huang@126.com 7847637355 change 2020-07-07 12:00:12 +08:00
837816638@qq.com d6c4979bff new_coyrse没值的问题 2020-07-07 09:25:56 +08:00
sylor_huang@126.com d147960fc7 change some bug 2020-07-06 16:26:18 +08:00
caishi b92bdb275e bug 2020-07-06 16:11:44 +08:00
caishi 8e0f2ca2bb render 内尽量不放方法 2020-07-06 14:21:48 +08:00
caishi 4534bfdd3d Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-07-03 19:26:11 +08:00
caishi 2e28484f66 out of memory 2020-07-03 19:26:04 +08:00
sylor_huang@126.com af191c4f76 change icon 2020-07-03 18:16:16 +08:00
sylor_huang@126.com 36a438a54c change icon 2020-07-03 18:09:47 +08:00
caishi 0a2423e648 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-07-03 17:26:13 +08:00
caishi fccabebc59 新建分支需要刷新 2020-07-03 17:26:07 +08:00
sylor_huang@126.com 58d6a625fc change pr 2020-07-03 17:01:58 +08:00
caishi 2dca31f6c6 顶部count 2020-07-03 16:32:47 +08:00
caishi 7e6c988ef7 clear 2020-07-03 11:17:23 +08:00
caishi fa1f6eab7e 冲突 2020-07-03 10:27:04 +08:00
caishi 1cdf81eb8a 项目详情-项目类型显示 2020-07-03 10:25:07 +08:00
Jasder 3f117cddfa FIX websocket wss location bug 2020-07-02 18:22:54 +08:00
sylor_huang@126.com a037820905 修改登录注册链接 2020-07-02 17:09:49 +08:00
caishi 47e04190ca wss 2020-07-02 17:03:28 +08:00
caishi 09b05a1f3d 查看md文件时用md编辑器渲染 2020-07-02 16:41:06 +08:00
caishi 07df361102 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-07-02 16:07:43 +08:00
caishi be354adac4 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 
# Conflicts:
#	src/AppConfig.js
#	src/forge/Main/Detail.js
 2020-07-02 16:07:35 +08:00
sylor_huang@126.com c86ce8036f Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-07-02 14:41:19 +08:00
sylor_huang@126.com 6b5c5a52c4 change user_permission 2020-07-02 14:40:57 +08:00
caishi 51e78c1ef4 bug 2020-07-02 14:21:22 +08:00
Jasder 1d54c1a8f7 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-07-02 14:18:21 +08:00
Jasder e5008ee57f FIX migrate project with websocket sidekiq 2020-07-02 14:17:47 +08:00
sylor_huang@126.com 221cf4fa81 change user permission 2020-07-02 14:13:04 +08:00
Jasder 7d4f7e9f1f ADD actioncable package 2020-07-02 14:13:01 +08:00
sylor_huang@126.com 6b11852d1c change readme content 2020-07-02 10:14:00 +08:00
sylor_huang@126.com c5ce12104d change some bugs 2020-06-30 18:30:33 +08:00
sylor_huang@126.com cb4c062f3d change some bugs 2020-06-30 18:15:48 +08:00
sylor_huang@126.com 582ae7765d change some bugs 2020-06-30 16:19:22 +08:00
sylor_huang@126.com 39698e42da change style for tag 2020-06-30 10:27:05 +08:00
sylor_huang@126.com b38e8bd1b9 change pr 2020-06-30 10:08:36 +08:00
caishi ab2787d2bc 新建项目：版本库地址和仓库名称同步 2020-06-29 17:46:43 +08:00
caishi 9b042c0113 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-29 16:32:44 +08:00
caishi 10bf79843d bug 2020-06-29 16:32:39 +08:00
Jasder a031d9a8cc FIX bug 2020-06-29 15:28:24 +08:00
Jasder 81056a2614 ADD get simple project api 2020-06-29 14:48:46 +08:00
Jasder 1ea3c1c36b Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-29 11:34:31 +08:00
Jasder da57718743 FIX performance for project detail's page 2020-06-29 11:34:05 +08:00
sylor_huang@126.com 4ab6194c5e Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-28 16:03:43 +08:00
sylor_huang@126.com c2a10b8f01 in small screen ,background_color has three3 2020-06-28 16:03:29 +08:00
caishi 7c85ff88a9 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-28 15:53:53 +08:00
caishi d80c703173 文件移除 2020-06-28 15:53:46 +08:00
sylor_huang@126.com c2f2b168ad in small screen ,background_color has three2 2020-06-28 15:51:28 +08:00
sylor_huang@126.com 0dcc0fbd00 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-28 15:39:56 +08:00
sylor_huang@126.com a6920c1a04 in small screen ,background_color has three 2020-06-28 15:39:43 +08:00
caishi af5c671fcb Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-24 18:14:28 +08:00
caishi 2a47b82fe5 组织团队新建 2020-06-24 18:14:22 +08:00
sylor_huang@126.com 464c5d1986 修改项目分类项目名 2020-06-24 16:11:50 +08:00
sylor_huang@126.com 904beb3a1d change 2020-06-24 15:29:31 +08:00
sylor_huang@126.com a760a7f384 修改文件显示的bug 2020-06-24 15:25:19 +08:00
sylor_huang@126.com 218f164c42 修改文件显示的bug 2020-06-24 14:59:19 +08:00
sylor_huang@126.com 7af799f778 自动获取文件的后缀 2020-06-24 14:30:02 +08:00
caishi b2b86c9922 组织 2020-06-24 10:11:50 +08:00
caishi eb72359511 组织设置部分页面 2020-06-24 10:10:47 +08:00
sylor_huang@126.com 7ba94ee094 change header 2020-06-22 17:49:11 +08:00
sylor_huang@126.com b70c993b21 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-22 17:32:45 +08:00
sylor_huang@126.com c4eacd7552 change 2020-06-22 17:32:43 +08:00
caishi 2e158e6f2d 个人中心隐藏组织入口 2020-06-22 14:07:06 +08:00
caishi cb6608ec6b 新建分支保护规则 2020-06-19 14:09:35 +08:00
caishi 277341e889 新建分支保护规则 2020-06-19 14:08:05 +08:00
caishi 1384946620 个人中心 2020-06-18 17:32:17 +08:00
caishi 6570985b68 个人中心 2020-06-18 16:05:22 +08:00
caishi 9d957af422 user 2020-06-18 14:35:36 +08:00
caishi 9f5fdd4f60 错误 2020-06-18 14:05:13 +08:00
caishi d6d22d8a79 word 2020-06-18 11:47:45 +08:00
caishi c93aad2536 update 2020-06-18 11:36:05 +08:00
caishi e4e2086221 分支设置、镜像管理 2020-06-17 09:43:08 +08:00
caishi 3fe9e97ae5 /默认进入页面 2020-06-15 15:31:21 +08:00
caishi 2c25b817c0 /默认进入 2020-06-15 10:58:43 +08:00
caishi 83496803c1 /默认进入 2020-06-15 10:58:16 +08:00
sylor_huang@126.com 870aec21fe change css 2020-06-12 18:46:55 +08:00
sylor_huang@126.com 2dfeaa8aaa change 2020-06-12 18:18:09 +08:00
sylor_huang@126.com f8cd1fa0fe Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-12 18:12:54 +08:00
sylor_huang@126.com 837cff831c change 2020-06-12 18:12:43 +08:00
caishi a730072663 change 2020-06-12 18:12:29 +08:00
caishi ad4a4e1f0a change 2020-06-12 18:11:58 +08:00
sylor_huang@126.com c9cfd7925c conflict 2020-06-12 18:00:13 +08:00
sylor_huang@126.com 5a235763db 修改合并请求 2020-06-12 17:58:58 +08:00
caishi d0828c3c7b test 2020-06-12 16:14:11 +08:00
caishi 6f301024b4 cookie 2020-06-12 14:21:56 +08:00
caishi efe3410c6e bug 2020-06-12 11:31:08 +08:00
caishi ba2044b459 跳转个人中心 2020-06-12 11:13:45 +08:00
caishi 29fca686b6 跳转 2020-06-11 18:25:56 +08:00
caishi 68e664cc25 issue 2020-06-11 18:00:32 +08:00
caishi 080b1f0e39 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-11 15:40:30 +08:00
caishi 49dd7dcde0 组织模块-部分前端页面 2020-06-11 15:40:22 +08:00
sylor_huang@126.com 2b8c9937d3 remove token 2020-06-10 18:05:18 +08:00
sylor_huang@126.com ce0dde0d90 add token 2020-06-10 17:56:35 +08:00
sylor_huang@126.com 5a5ffe3366 change css 2020-06-10 17:43:42 +08:00
sylor_huang@126.com d6b1da7971 修改个人中心的样式问题 2020-06-10 17:19:11 +08:00
sylor_huang@126.com 656bb38a0b repair edit file with brach error 2020-06-09 15:28:35 +08:00
sylor_huang@126.com b6c2f405e9 修改样式 2020-06-09 14:47:48 +08:00
sylor_huang@126.com 95414986f7 change user avatar 2020-06-09 14:36:53 +08:00
sylor_huang@126.com 7f30b665e4 修改评论 2020-06-09 14:16:40 +08:00
sylor_huang@126.com 029d882b53 修改了评论 2020-06-09 14:13:53 +08:00
sylor_huang@126.com 75768cf8b0 修改button样式及其他的问题 2020-06-08 11:37:15 +08:00
sylor_huang@126.com 994f3e9716 部分修改 2020-06-08 09:55:16 +08:00
caishi 6f08cf4a73 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-05 20:17:50 +08:00
caishi 4f75a1f541 取消新建任务 2020-06-05 20:17:43 +08:00
sylor_huang@126.com cf8c4edaa1 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-05 18:27:17 +08:00
sylor_huang@126.com 803836e708 修改 2020-06-05 18:27:06 +08:00
caishi 3001848da9 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-05 18:18:12 +08:00
caishi effa231c7b 里程碑 2020-06-05 18:18:05 +08:00
sylor_huang@126.com 32c17c39d3 change 2020-06-05 18:08:14 +08:00
caishi 3b22926f41 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-05 18:07:39 +08:00
caishi 3401ace6f9 branch spin 2020-06-05 18:07:34 +08:00
sylor_huang@126.com 7ffbec5d2f 修改评论 2020-06-05 17:52:53 +08:00
caishi cebc85436e bug 2020-06-05 17:51:36 +08:00
caishi 2551e4f18e Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-05 17:21:28 +08:00
caishi 6f58979c3b 镜像项目tip 2020-06-05 17:21:23 +08:00
sylor_huang@126.com acd7d42eb5 修改登录的弹框问题 2020-06-05 16:40:59 +08:00
sylor_huang@126.com cbe7775c81 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-05 16:24:50 +08:00
sylor_huang@126.com 20e75b1606 修改pr的详情页 2020-06-05 16:24:37 +08:00
caishi cea1287773 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-05 15:05:39 +08:00
caishi 83dae8a97c 合并请求列表-编辑按钮 2020-06-05 15:05:33 +08:00
sylor_huang@126.com cc280f1597 change branch error 2020-06-05 14:46:26 +08:00
sylor_huang@126.com 1594f4fa93 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-05 12:02:43 +08:00
sylor_huang@126.com 4266216ee1 修改工单详情的样式问题 2020-06-05 12:02:26 +08:00
caishi 0d8012c73c 目录选择img 2020-06-05 11:46:56 +08:00
sylor_huang@126.com 585d2e886c Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-05 11:29:23 +08:00
sylor_huang@126.com 9fd2621c59 隐藏上链 2020-06-05 11:29:11 +08:00
caishi cdff82f74b Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-05 09:35:22 +08:00
caishi 0d5e292c13 tip 2020-06-05 09:35:16 +08:00
sylor_huang@126.com 76c5e7e8de 测试登录跳转 2020-06-05 09:13:23 +08:00
sylor_huang@126.com 8e8ab27daa 部分修改 2020-06-04 18:47:55 +08:00
sylor_huang@126.com 463013f378 confilct 2020-06-04 18:31:33 +08:00
sylor_huang@126.com c353f7322a 上传文件 2020-06-04 18:28:26 +08:00
caishi 2007033db6 获取分支和标签接口 2020-06-04 18:27:19 +08:00
sylor_huang@126.com 52f559a384 部分修改 2020-06-03 18:20:20 +08:00
sylor_huang@126.com 5f360812c4 个人信息页面 2020-06-03 18:18:56 +08:00
sylor_huang@126.com 10c0aa0327 个人中心页面 2020-06-03 18:10:53 +08:00
caishi af497b6f18 我的组织 2020-06-03 18:08:04 +08:00
caishi 47244beef8 return 2020-06-03 14:45:56 +08:00
caishi f45f205b93 代码库：最新提交信息整改 2020-06-03 14:42:13 +08:00
caishi 4920fed97f Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-06-03 09:56:18 +08:00
caishi 7bdd2820ea 切换标签 2020-06-03 09:56:07 +08:00
sylor_huang@126.com 0bfcd40fb3 users 2020-06-03 09:40:16 +08:00
sylor_huang@126.com cf088c30ad 个人主页左侧 2020-06-02 18:54:46 +08:00
sylor_huang@126.com 201516f29f 修改复制的工单 2020-06-02 09:46:41 +08:00
sylor_huang@126.com 570aa9cfbb 修改tag 2020-06-01 18:37:35 +08:00
sylor_huang@126.com 7bd87013bc 修改任务的新建和编辑 2020-06-01 18:28:42 +08:00
sylor_huang@126.com 4eb2c407c3 样式调整 2020-05-29 18:23:39 +08:00
sylor_huang@126.com 5a5287b314 some change 2020-05-29 18:08:25 +08:00
sylor_huang@126.com d1a05f5d71 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-05-29 17:45:49 +08:00
sylor_huang@126.com c365868ebb 修改登录弹框的bug 2020-05-29 17:45:46 +08:00
caishi d8b2244b9c 任务多选权限-必须登录 2020-05-29 17:07:48 +08:00
caishi a5363d098a 任务列表-筛选 2020-05-29 17:00:42 +08:00
sylor_huang@126.com db401b2f5d Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-05-29 15:50:16 +08:00
sylor_huang@126.com b4b26eeb37 children comment 2020-05-29 15:50:09 +08:00
caishi ed26a17809 标签 2020-05-28 15:30:48 +08:00
caishi 8b80d60996 选择标签 2020-05-28 15:18:57 +08:00
caishi bedb5448a6 编辑里程碑 2020-05-28 11:52:59 +08:00
sylor_huang@126.com 417fc53c90 修改issue详情页 2020-05-28 11:37:17 +08:00
caishi 5c1bd9118c Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 
# Conflicts:
#	src/forge/Order/order.js
 2020-05-28 11:36:29 +08:00
caishi 28f92a5f82 改版 2020-05-28 11:35:57 +08:00
sylor_huang@126.com 4b2cfb21fd 修改文件的新建和编辑 2020-05-27 17:07:36 +08:00
sylor_huang@126.com d3ba91983d 修改了新建页面和编辑文件页面的内容 2020-05-26 18:50:17 +08:00
sylor_huang@126.com a912c996c5 修改添加协作者的加载bug 2020-05-25 09:49:36 +08:00
sylor_huang@126.com 4a62968096 chagne 2020-05-22 18:57:30 +08:00
caishi 9f012dff55 Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-05-22 18:13:17 +08:00
caishi c3dd72c4af 省略 2020-05-22 18:13:12 +08:00
sylor_huang@126.com f2bbacbf04 修改了设置页面的样式 2020-05-22 17:52:41 +08:00
sylor_huang@126.com 62cc9a9066 设置页面的修改 2020-05-22 17:12:44 +08:00
caishi 982db1460b Merge branch 'newVersion_forge' of http://gitea.trustie.net/jasder/forgeplus-react into newVersion_forge 2020-05-22 17:09:26 +08:00
caishi c833cb684d 文件夹icon 2020-05-22 17:09:11 +08:00
sylor_huang@126.com 50e0d0750d Merge branch 'test_forge' into newVersion_forge 2020-05-22 17:01:42 +08:00
caishi faef6a2638 time 2020-05-22 16:58:48 +08:00
caishi d30f245d01 created_at 2020-05-22 15:28:39 +08:00
caishi 94feedf62e 代码库目录增加time 2020-05-22 15:20:36 +08:00
caishi 786702815f 代码库根目录增加commit信息的提示 2020-05-22 13:54:12 +08:00
caishi c7aae77629 data problem 2020-05-21 17:13:08 +08:00