Commit Graph

610 Commits

Author SHA1 Message Date
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
sylor_huang@126.com f21ad1199f 修改仓库设置的协作者页面 2020-05-22 17:00:18 +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
sylor_huang@126.com ac39faceca 修改后的上线 2020-05-21 16:47:59 +08:00
caishi 6ce2ab8ecb 新-创建、编辑发行版 2020-05-21 16:36:15 +08:00
caishi 62be5c0388 new version 2020-05-20 18:11:32 +08:00
sylor_huang@126.com 4168db36d1 change order.js getOption methods 2020-05-20 09:33:58 +08:00
sylor_huang@126.com 8c7cb56c9a change issues sort by user and compare user with current_user 2020-05-20 09:22:12 +08:00
sylor_huang@126.com 037d85b6b7 change issues order menthod 2020-05-19 18:37:28 +08:00
sylor_huang@126.com b6b8215d5b change issues order by author and assigned_user 2020-05-19 18:24:15 +08:00
sylor_huang@126.com 98a685f37a change issues/merges sort methods 2020-05-19 18:14:21 +08:00
sylor_huang@126.com 2d89a6ef8e change project detail fork_numbers color 2020-05-19 09:28:38 +08:00
sylor_huang@126.com c59ccc6f95 change user_lists background 2020-05-18 17:12:28 +08:00
sylor_huang@126.com b5dca5a1aa add project watch/praise/fork users list 2020-05-18 16:46:51 +08:00
caishi ed778853ca 项目详情banner 2020-05-11 14:38:34 +08:00
caishi 3b9e24a9f8 新版首页和头部 2020-05-11 14:18:32 +08:00
caishi e557182a48 clear 2020-05-09 16:08:30 +08:00
caishi 74d021b097 删除视频直播部分代码 2020-05-09 15:15:05 +08:00
caishi 6932fe697c 删除试卷、问卷模块代码 2020-05-09 15:04:41 +08:00
caishi e5927913f8 antd 影响的样式 2020-05-09 13:59:24 +08:00
caishi d4957c8c9c md更新 2020-05-09 11:54:17 +08:00
caishi 72cff809e5 删除毕设部分 2020-05-09 11:35:00 +08:00
caishi c9719b72ec 移除教学案例、论坛交流的代码 2020-05-09 11:15:19 +08:00
caishi 1eba2fa5f2 marked package,去掉实践课程的相关文件 2020-05-09 11:00:03 +08:00
caishi f2f9f27086 markded 2020-05-09 09:43:44 +08:00
caishi 5d7344fb1c 代码去重 2020-05-08 14:30:04 +08:00
caishi cd3dc222e2 Merge branch 'version_forge' of http://gitea.trustie.net/jasder/forgeplus-react into version_forge 2020-05-08 10:36:34 +08:00
caishi 73bacb789d 个人主页 2020-05-08 10:36:31 +08:00
sylor_huang@126.com bc83aa45a4 修改创建的spin 2020-05-08 10:28:21 +08:00
caishi 326847f697 md的默认高度,以及编辑时change md的背景色 2020-05-08 10:15:41 +08:00
caishi 6055d62914 md height 2020-05-08 09:52:32 +08:00
sylor_huang@126.com 37f40c8db4 修改进入老版本的链接 2020-05-07 18:37:55 +08:00
caishi ef382ac9cb Merge branch 'version_forge' of http://gitea.trustie.net/jasder/forgeplus-react into version_forge 2020-05-07 18:27:11 +08:00
caishi b8daab01e6 进入老版本 2020-05-07 18:27:03 +08:00
sylor_huang@126.com 24c11f370c 修改合并请求的筛选的样式 2020-05-07 15:11:09 +08:00
sylor_huang@126.com 520f035afc 修改合并请求和里程碑的样式问题 2020-05-07 14:42:23 +08:00
sylor_huang@126.com 2b570f811e 恢复个人主页的内容 2020-05-07 11:55:45 +08:00
caishi 847f8ad45d code 2020-05-07 10:10:13 +08:00
caishi 116b2bf023 parseInt 2020-05-07 09:22:35 +08:00
caishi 2dc7710a5b 代码清理 2020-05-07 09:05:43 +08:00
caishi 3e96e210f3 清理 2020-05-06 17:52:08 +08:00
caishi 5f35b8dc91 style 代码清理 2020-05-06 16:52:00 +08:00
sylor_huang@126.com 040ab7b5e2 修改md的样式 2020-04-30 11:55:15 +08:00
sylor_huang@126.com d7fd631396 修改评论的样式问题 2020-04-30 11:22:11 +08:00
sylor_huang@126.com f5be97bb89 修改提交时的loading效果 2020-04-30 10:34:06 +08:00
caishi ff8ec66414 md style 2020-04-29 16:59:48 +08:00
caishi 0606cb4267 remove some thing 2020-04-29 16:43:56 +08:00
sylor_huang@126.com dda52a80c5 Merge branch 'version_forge' of http://gitea.trustie.net/jasder/forgeplus-react into version_forge 2020-04-29 16:03:04 +08:00
sylor_huang@126.com cd2fefb131 修改appconfig.js 2020-04-29 16:02:48 +08:00
caishi 5cdebe0220 Merge branch 'version_forge' of http://gitea.trustie.net/jasder/forgeplus-react into version_forge 2020-04-29 15:27:59 +08:00
caishi 9427a3500f update 2020-04-29 15:27:55 +08:00
sylor_huang@126.com d7b579f682 修改publicPath 2020-04-29 15:19:19 +08:00
caishi 59edb107ee 请求 2020-04-29 11:55:40 +08:00
caishi a38ba5c7e2 update 2020-04-29 10:42:53 +08:00
Jasder 5e157952b4 FIX build bug 2020-04-28 18:39:05 +08:00
caishi 4bfd4234b5 优化版 2020-04-28 17:23:34 +08:00
sylor_huang@126.com 6d14b0280a 修改协作者页面的链接及搜索方式 2020-04-28 14:52:53 +08:00
sylor_huang@126.com 14ff9e24b4 修改从里程碑新建工单 2020-04-27 18:49:50 +08:00
sylor_huang@126.com 5ab66792c6 修改前端的部分样式 2020-04-27 17:05:27 +08:00
sylor_huang@126.com 3d63c16131 change merge style 2020-04-26 17:21:02 +08:00
sylor_huang@126.com 560e7051a6 Merge branch 'develop' of http://gitea.trustie.net/jasder/forgeplus-react into develop 2020-04-26 16:55:36 +08:00
sylor_huang@126.com 4ca3237ab8 修改冲突 2020-04-26 16:55:10 +08:00
caishi dc352b298c test 2020-04-26 16:24:33 +08:00
sylor_huang@126.com 673165c049 修改部分前端 2020-04-26 16:23:32 +08:00
caicai8 3530352c8f Merge branch 'develop' of http://gitea.trustie.net/jasder/forgeplus-react into develop 2020-04-26 16:07:56 +08:00
caicai8 1b55988fc5 quill点击放大图片 2020-04-26 16:07:51 +08:00
sylor_huang@126.com f5b42a8751 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-04-26 09:19:12 +08:00
sylor_huang@126.com c0a7e18df9 修改工单的新建/编辑的样式 2020-04-26 09:18:51 +08:00
caicai8 2e3a91b57b fork link 2020-04-26 09:17:21 +08:00
caicai8 630e32e1e0 style 2020-04-24 18:22:45 +08:00
caicai8 d8d3208e97 style 2020-04-24 18:04:21 +08:00
caicai8 18bb630e7d Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-04-24 18:01:14 +08:00
caicai8 d8d4c133b3 fork 2020-04-24 18:01:09 +08:00
sylor_huang@126.com bbf36127d6 修改合并请去的show页面样式 2020-04-24 16:38:49 +08:00
caicai8 0f884343d6 fork 2020-04-24 14:59:25 +08:00
caicai8 cbc0c611ed Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-04-24 14:18:53 +08:00
caicai8 71c8f3da84 branch 2020-04-24 14:18:49 +08:00
sylor_huang@126.com e3f0df25d3 修改合并请求的列表样式 2020-04-24 12:12:33 +08:00
sylor_huang@126.com 3e54838175 修复冲突 2020-04-24 11:33:21 +08:00
sylor_huang@126.com 07ceddecc8 修改前端的问题 2020-04-24 11:30:28 +08:00
caicai8 76c7ec84d9 issue分割线 2020-04-24 10:43:22 +08:00
caicai8 cd5f5ed04f changeBranch 2020-04-24 10:38:19 +08:00
caicai8 d1214b8b6b Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Branch/CloneAddress.js
2020-04-24 09:22:07 +08:00
caicai8 9369bdc1fc bug 2020-04-24 09:15:52 +08:00
sylor_huang@126.com 35b8f31b1c 修改clone_address 2020-04-23 18:08:01 +08:00
sylor_huang@126.com 8276f11c87 修改用户的链接 2020-04-23 16:26:42 +08:00
caicai8 0b4c83d640 上传图片地址 2020-04-23 14:53:03 +08:00
caicai8 0502fb1317 切换分支 2020-04-23 14:11:43 +08:00
sylor_huang@126.com 38709b1cab 修改前端创建问题 2020-04-23 12:06:31 +08:00
caicai8 1dcbd8fed2 必填 2020-04-23 11:50:56 +08:00
caicai8 9081805bad 新建文件的相关问题 2020-04-23 11:13:52 +08:00
sylor_huang@126.com e03dc3e90f 修改创建文件的权限 2020-04-22 19:05:03 +08:00
sylor_huang@126.com e7175d74ec 修改前端问题 2020-04-22 18:51:20 +08:00
caicai8 d3ce0ed9c3 新建文件 2020-04-22 18:45:03 +08:00
caicai8 351d69f77e style 2020-04-22 17:42:00 +08:00
caicai8 be11cd0164 snackbarhoc 2020-04-22 17:05:17 +08:00
caicai8 4319067c1c dropdown 2020-04-22 14:31:10 +08:00
caicai8 ec1dbe0f9b style 2020-04-22 10:27:24 +08:00
caicai8 5c66758a6e Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-04-21 17:23:19 +08:00
caicai8 7cca2d3e02 style 2020-04-21 17:23:16 +08:00
sylor_huang@126.com 16f7c45da9 前端样式的修改 2020-04-21 16:30:51 +08:00
sylor_huang@126.com 330ac9aabb 修改个人主页的内容 2020-04-21 14:48:00 +08:00
sylor_huang@126.com 0172b5da48 修改增加项目的链接 2020-04-21 14:01:23 +08:00
sylor_huang@126.com dc82e9b2f4 增加我的项目 2020-04-21 13:38:01 +08:00
caicai8 7165b99ef3 remove 2020-04-20 17:26:33 +08:00
caicai8 09fe5c16ef style 2020-04-20 15:37:01 +08:00
caicai8 e1b5834b4b style 2020-04-20 11:43:15 +08:00
caicai8 67b681f027 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-04-20 10:52:01 +08:00
caicai8 d62ce9a10a style 2020-04-20 10:51:56 +08:00
sylor_huang@126.com 3ae009255e Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-04-17 17:58:13 +08:00
sylor_huang@126.com bfaf37c8d1 修改我的项目的链接 2020-04-17 17:58:01 +08:00
caicai8 969863f5a1 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/modules/tpm/NewHeader.js
2020-04-17 17:37:45 +08:00
caicai8 4f597bd257 代码库模块-选择子目录的路由以及接口调用等问题 2020-04-17 17:35:47 +08:00
sylor_huang@126.com af323daa16 修改注册按钮的样式 2020-04-17 17:00:11 +08:00
sylor_huang@126.com 0f659d7ffe 修改注册的按钮 2020-04-17 16:47:54 +08:00
sylor_huang@126.com 30f1a396f3 修改主域名的跳转 2020-04-17 00:02:03 +08:00
sylor_huang@126.com 14c94ce3c6 修改首页为projects 2020-04-16 22:54:15 +08:00
sylor_huang@126.com ec48f4be0c 修改版本发布的样式 2020-04-16 17:04:18 +08:00
sylor_huang@126.com 269a0142c3 修改tidding_url 2020-04-16 15:12:44 +08:00
sylor_huang@126.com e80a9686e8 修改顶部导航和底部导航 2020-04-16 14:58:14 +08:00
sylor_huang@126.com ef795e9caf 修改部分代码 2020-04-14 15:06:02 +08:00
sylor_huang@126.com b9a233af17 修改message的提交问题 2020-04-13 18:12:18 +08:00
sylor_huang@126.com fa2b68e58b 修改merge的样式问题 2020-04-13 18:01:32 +08:00
sylor_huang@126.com dce5404850 修改部分问题 2020-04-13 17:45:36 +08:00
sylor_huang@126.com e4313d30eb 修改项目列表页的搜索的 2020-04-10 19:30:00 +08:00
sylor_huang@126.com 59ac6f5c17 修改列表页 2020-04-10 19:20:33 +08:00
caicai8 4ea6c345e6 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Order/New.js
2020-04-10 16:34:33 +08:00
caicai8 83f2c28ae0 issue 2020-04-10 16:33:02 +08:00
sylor_huang@126.com e6b8dd6c6b 修改forge的问题 2020-04-09 18:34:07 +08:00
sylor_huang@126.com ee3aa25ddc 修改问题 2020-04-09 18:13:26 +08:00
caicai8 c1d3d5fb8b Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-04-09 17:23:44 +08:00
caicai8 8f6048f840 issue 2020-04-09 17:23:40 +08:00
sylor_huang@126.com 902b078172 修改新建页面的样式 2020-04-07 18:24:58 +08:00
caicai8 a1da04a405 F 2020-04-07 16:00:25 +08:00
caicai8 57976b5646 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Main/Detail.js
2020-04-07 15:59:54 +08:00
caicai8 1549072286 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Main/Detail.js
2020-04-07 15:58:45 +08:00
sylor_huang@126.com a8563e9e44 bug 2020-04-07 15:57:41 +08:00
caicai8 1090f473ea issue 2020-04-07 15:54:55 +08:00
sylor_huang@126.com 401c3ef3dc 修改样式 2020-04-07 15:12:27 +08:00
sylor_huang@126.com b04649dc7c 修改样式 2020-04-07 15:08:48 +08:00
sylor_huang@126.com 0123b7810f 修改fork显示的样式 2020-04-07 14:54:30 +08:00
sylor_huang@126.com 4c11feb276 修改部分bug 2020-04-07 14:03:16 +08:00
sylor_huang@126.com c62b99eb61 修改样式问题 2020-04-07 09:52:08 +08:00
sylor_huang@126.com b3cd5459e5 增加私有 2020-04-03 17:00:08 +08:00
dinglink 993f662f45 新增权限 2020-04-03 16:45:59 +08:00
dinglink e991f821a5 资源 2020-04-03 10:46:59 +08:00
dinglink 683710fed8 资源 2020-04-03 10:45:40 +08:00
caicai8 cc35070e7b Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-04-02 18:21:50 +08:00
caicai8 748ab612d2 修改工单信息 2020-04-02 18:21:43 +08:00
sylor_huang@126.com f6dba27d8a 修改commit的链接地址 2020-04-02 17:54:23 +08:00
caicai8 f511e85d38 清理 2020-04-02 17:14:04 +08:00
caicai8 ac5cf6bde7 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Main/Detail.js
2020-04-02 15:51:27 +08:00
caicai8 1d64957e5a 修改 2020-04-02 15:48:19 +08:00
sylor_huang@126.com dc01557c59 修改pr提交为textarea 2020-04-02 11:38:51 +08:00
sylor_huang@126.com bc496c6d8b 修改pr的描述 2020-04-02 11:27:46 +08:00
sylor_huang@126.com 65df8b0146 修改合并请求的描述为textarea 2020-04-02 11:00:53 +08:00
sylor_huang@126.com aae855bda5 修改部分样式问题 2020-04-02 10:09:38 +08:00
sylor_huang@126.com 3cfb5a0370 修改bug 2020-04-01 19:08:52 +08:00
sylor_huang@126.com 630e2536ec 修复bug 2020-04-01 18:57:58 +08:00
sylor_huang@126.com d65f771b6b 修改bug 2020-04-01 18:23:57 +08:00
dinglink edc4bb4c40 issue修改 2020-03-31 21:40:53 +08:00
dinglink 364827b63f issue问题修改 2020-03-31 21:36:27 +08:00
caicai8 bdf61d7bbb issue 2020-03-31 15:07:27 +08:00
caicai8 0ec824d0cb Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/New/Index.js
2020-03-30 19:29:09 +08:00
caicai8 bf7afa9087 新建+issue 2020-03-30 19:26:39 +08:00
dinglink c76723ece0 点击提示及样式修改 2020-03-30 18:51:30 +08:00
sylor_huang@126.com d54bdcf7a7 修改读写权限 2020-03-30 15:06:30 +08:00
sylor_huang@126.com a90a068885 修改新建的样式 2020-03-30 14:29:05 +08:00
sylor_huang@126.com 4706ee05bf 修改前端bug 2020-03-30 11:29:26 +08:00
Jasder 8d9946bad6 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-30 10:21:28 +08:00
Jasder adde24ccaf ADD truncate commit id 2020-03-30 10:21:22 +08:00
sylor_huang@126.com 2a1f64705d 修改placeholder 2020-03-30 10:20:20 +08:00
Jasder 2b658e59fa FIX 完善fork功能提示语 2020-03-29 18:17:47 +08:00
Jasder a017c6f84d FIX react-codeMirror bug 2020-03-29 18:16:58 +08:00
caicai8 636d2ee36b Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Activity/Activity.js
2020-03-27 18:30:17 +08:00
caicai8 97a9734bf7 issue 2020-03-27 18:29:00 +08:00
sylor_huang@126.com b23e8c7e53 修改合并请求的显示权限 2020-03-27 18:03:38 +08:00
Jasder 00d866e6e2 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-27 17:30:23 +08:00
Jasder b29c80fb64 FIX 优化点赞、关注等功能 2020-03-27 17:30:16 +08:00
sylor_huang@126.com 2299e7cefb 修改评论 2020-03-27 17:18:17 +08:00
sylor_huang@126.com 424fe4980e 修改版本发布的样式错误 2020-03-27 17:06:23 +08:00
sylor_huang@126.com ce0a97e0ad 修改bug 2020-03-27 16:48:33 +08:00
sylor_huang@126.com 94a0a84303 前端部分bug修改 2020-03-27 15:01:28 +08:00
sylor_huang@126.com cc49b02ab5 修改前端bug 2020-03-27 10:05:43 +08:00
dinglink f651e7d80c Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-27 10:04:31 +08:00
dinglink ef229a635d 样式修改 2020-03-27 10:04:21 +08:00
sylor_huang@126.com 8cd33ee65d 修改删除报错 2020-03-26 18:42:04 +08:00
caicai8 2da3c827b2 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-26 18:13:04 +08:00
caicai8 f9ce3de759 issue 2020-03-26 18:12:53 +08:00
sylor_huang@126.com f619b949f4 修改setting的参数 2020-03-26 16:28:06 +08:00
sylor_huang@126.com e3bb09b530 修改ignore 2020-03-26 14:44:06 +08:00
sylor_huang@126.com 22fbdcf57a 修改设置的删除功能 2020-03-26 14:13:52 +08:00
Jasder 55008a1dec FIX 修改项目权限名称 2020-03-25 22:33:24 +08:00
Jasder dcb01851b5 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-25 17:52:44 +08:00
caicai8 7a8b028aeb 新建文件接口 2020-03-25 17:52:13 +08:00
caicai8 9e4254e01f 协作者 2020-03-25 17:08:27 +08:00
Jasder 5b5ac99be9 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-25 15:38:17 +08:00
Jasder ed4bd23946 FIX 去掉登录时debug模式 2020-03-25 15:38:10 +08:00
caicai8 538c681d34 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Merge/MessageCount.js
2020-03-25 15:16:14 +08:00
caicai8 99792045bc 合并请求 2020-03-25 15:14:20 +08:00
sylor_huang@126.com ff7d20a684 修改权限 2020-03-25 10:43:45 +08:00
dinglink 56ea97b8b2 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-24 18:06:03 +08:00
dinglink de722c7164 逻辑修改 2020-03-24 18:05:54 +08:00
sylor_huang@126.com 2a3708289a 修改pull-request 2020-03-24 17:57:01 +08:00
caicai8 0a5991a93a Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-24 16:51:38 +08:00
caicai8 e7d8a4f0cc issue 2020-03-24 16:51:34 +08:00
sylor_huang@126.com 843c1d14be 修改quill及其他问题 2020-03-24 16:00:57 +08:00
caicai8 34312abc24 admin 2020-03-24 15:42:56 +08:00
caicai8 20e32871d7 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-24 15:40:27 +08:00
caicai8 17d0e3c1a2 get user 2020-03-24 15:40:22 +08:00
sylor_huang@126.com 090db8e9b0 修改quill编辑时的内容 2020-03-24 15:08:57 +08:00
sylor_huang@126.com e11fd89286 修改部分前端问题 2020-03-24 14:22:16 +08:00
sylor_huang@126.com 4aa819a109 修改新建项目 2020-03-24 13:26:25 +08:00
sylor_huang@126.com 78212429e5 修改前端bug 2020-03-24 12:01:12 +08:00
sylor_huang@126.com b09afec016 修改删除和增加新建项目 2020-03-24 11:14:12 +08:00
sylor_huang@126.com c3f08312db deletefile增加参数 2020-03-24 10:30:25 +08:00
caicai8 f87c60d2ef Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-23 20:34:01 +08:00
caicai8 e35c8e4cdf issue 2020-03-23 20:33:47 +08:00
sylor_huang@126.com 03b058cae1 修改前端bug 2020-03-23 17:19:44 +08:00
sylor_huang@126.com 1f687dd369 前端修改build 2020-03-23 15:59:50 +08:00
dinglink 1b89e542ff Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-20 23:48:20 +08:00
dinglink 559f5da65e 限制项目名字长度 2020-03-20 23:48:13 +08:00
caicai8 21e27bdef1 弹框提示 2020-03-20 22:43:25 +08:00
caicai8 acd97d0ba0 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-20 22:27:14 +08:00
caicai8 5d2758b7b7 name 2020-03-20 22:27:09 +08:00
dinglink de0c381197 描述为空的bug 2020-03-20 22:08:29 +08:00
dinglink 22c00f5ce3 描述为空是undfind的问题 2020-03-20 22:07:34 +08:00
caicai8 b88e41f609 401 2020-03-20 21:49:43 +08:00
caicai8 a16d9871a3 路由 2020-03-20 21:40:43 +08:00
caicai8 1621380ba8 issue 2020-03-20 21:20:35 +08:00
caicai8 8bb298f062 issue 2020-03-20 20:50:30 +08:00
caicai8 1457bc1adc issue 2020-03-20 18:54:02 +08:00
caicai8 44366b8a26 路由、分支 2020-03-20 16:49:41 +08:00
caicai8 7dbcdd7b77 issue 2020-03-19 16:10:42 +08:00
caicai8 78ba918514 attachment 2020-03-18 18:40:58 +08:00
caicai8 bb72b3b826 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-18 16:12:08 +08:00
caicai8 a83b6a1013 工单列表 2020-03-18 16:07:13 +08:00
Jasder 84bffef253 FIX 更改build profuction的配置文件 2020-03-17 21:58:04 +08:00
caicai8 637ce0fc9a 工单部分相关的都改成quill编辑器 2020-03-17 17:23:47 +08:00
Jasder 4875f2c944 first commit 2020-03-16 14:12:11 +08:00