Commit Graph

610 Commits

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