Commit Graph

991 Commits

Author SHA1 Message Date
caishi 78aba67917 项目详情右侧增加实践课程链接的显示 2021-04-08 15:37:01 +08:00
caishi 43223c7787 为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能 2021-04-08 14:21:35 +08:00
caishi 961587921a projectDetail.type:0是托管项目,1是镜像项目,2是同步镜像项目(为2时不能上传新建文件、下载zip等) 2021-04-08 10:07:55 +08:00
caishi 2f595d750a entries接口传的branch值为undefined 2021-04-07 18:44:20 +08:00
caishi bcaec7a2db 新增组织账号,组织名称增加新的check条件 2021-04-06 18:40:01 +08:00
caishi 70ea6259ae 仓库设置页面增加资源库配置项 2021-04-06 17:34:37 +08:00
caishi 5d6953f2b3 资源库模块测试版第一次上线 2021-04-06 17:17:01 +08:00
caishi c8eda704e5 列表的type字段为头像跳转到个人中心或者组织的判断依据 2021-04-06 11:45:03 +08:00
caishi 5d6b95ab8f 资源库部分接口调试 2021-04-06 11:36:38 +08:00
caishi 426ea3fece 合并请求分页 2021-04-02 18:55:26 +08:00
caishi ab052ebace 第三方登录-修改邮箱和密码 2021-04-02 18:40:59 +08:00
caishi 648c6e235b 第三方账号密码重置 2021-04-02 17:39:13 +08:00
caishi 96253f3f58 列表接口、上传资源 2021-04-02 17:31:15 +08:00
caishi 101478d924 协作者管理删除按钮没显示 2021-04-02 14:08:59 +08:00
caishi dccbd6735d 构建列表里的提交信息,作者头像错误 2021-04-02 11:57:48 +08:00
caishi a0ebba839e tips 2021-04-01 19:03:56 +08:00
caishi 171f14bd2a noticeurl 2021-04-01 16:25:53 +08:00
caishi c3e09f2672 第三方登录-educoder 2021-04-01 15:35:45 +08:00
caishi 6296434527 清理appconfig文件
资源库所有页面排版、数据未绑
2021-04-01 14:41:13 +08:00
caishi e2dbda3083 工作流author 2021-03-31 17:12:31 +08:00
caishi 02f382e6fb 登录框中的找回密码、注册的url 2021-03-31 11:15:41 +08:00
caishi b568aef34e issue 2021-03-30 15:01:25 +08:00
caishi 2c83221376 按钮 2021-03-30 11:50:25 +08:00
caishi 6a4fe4d277 左侧抽屉 2021-03-30 10:26:02 +08:00
caishi 99f7aea290 资源 2021-03-29 16:48:23 +08:00
caishi 50f39afffa style 2021-03-25 22:06:04 +08:00
caishi d0ccc92cc6 新建项目路由 2021-03-25 22:00:01 +08:00
caishi 2add7911dc readme 2021-03-25 14:38:52 +08:00
caishi ec1ff5d479 简介修改 2021-03-24 14:08:10 +08:00
caishi 55f23dea0d style 2021-03-23 17:58:12 +08:00
caishi 26e74e7ed4 condition 2021-03-23 17:40:23 +08:00
caishi 3384cd2703 style+banner 2021-03-23 09:20:16 +08:00
caishi 0290822ebf 代码库-默认显示 2021-03-22 11:24:07 +08:00
caishi 31edf6ff45 分页 2021-03-22 09:45:30 +08:00
caishi 8a1feed72b 未登录判断 2021-03-19 17:22:02 +08:00
caishi 0c0203a8ef name 2021-03-19 16:34:41 +08:00
caishi 45e69cb14a update 2021-03-19 16:29:43 +08:00
caishi d7f3c766b4 导航栏设置 2021-03-19 15:46:37 +08:00
caishi a3226dca4e banner 2021-03-19 12:11:55 +08:00
caishi d16ee801ec 背景色 2021-03-19 11:35:03 +08:00
caishi c3eb6edddc 项目详情新版 2021-03-18 17:28:53 +08:00
caishi ad8a127170 remove 2021-03-11 18:07:19 +08:00
caishi cbaf72b341 appconfig 2021-03-10 17:32:39 +08:00
caishi a4b5b67da6 diff-查看文件 2021-03-10 10:41:16 +08:00
caishi da31875a5a filedetail 2021-03-09 11:46:41 +08:00
caishi b7a92b17e7 active 2021-03-08 10:26:39 +08:00
caishi f4332db4ad style 2021-03-05 18:35:54 +08:00
caishi 99174c2782 取消上一个commit的修改 2021-03-05 15:59:30 +08:00
caishi f33f1f3ce5 参数管理-权限(仅创建者) 2021-03-05 14:39:59 +08:00
caishi 5d99d63267 style 2021-03-05 10:47:13 +08:00
caishi 9137b666ea style 2021-03-05 09:56:07 +08:00
caishi 1250a9b10b 删除 2021-03-04 17:05:27 +08:00
caishi 6ea82be73a 工作流-参数管理 2021-03-04 15:08:58 +08:00
caishi 964427b8fc 工作流-参数 2021-03-03 16:43:02 +08:00
caishi afd6904349 loading 2021-03-02 15:43:40 +08:00
caishi 72fcbcd4dd root 2021-03-02 11:40:55 +08:00
caishi 80f1e4d448 查看文件-url 2021-03-02 10:51:50 +08:00
caishi 3071c785bc sync mirror 2021-03-01 16:02:02 +08:00
caishi d01e8e32d4 设置 2021-02-26 15:40:44 +08:00
caishi e469ddae24 删除协作者 2021-02-26 11:57:35 +08:00
caishi f8b9003e15 我关注的-接口错误 2021-02-25 17:06:25 +08:00
caishi 19f66b0bcc 关注和取消关注 2021-02-25 14:08:35 +08:00
caishi 2ceaead909 fork列表 2021-02-24 15:45:48 +08:00
caishi 8d386ff70b tips 2021-02-24 15:27:58 +08:00
caishi d11cb7fc40 small problem 2021-02-24 10:53:17 +08:00
caishi 696fb22a58 class name 2021-02-23 17:26:52 +08:00
caishi 67b510923b 发行版 -loading 2021-02-23 14:45:18 +08:00
caishi ad3c9f837f 新建标签 2021-02-23 11:00:05 +08:00
caishi b8476cec1a nodata tip 2021-02-22 17:50:47 +08:00
caishi fcd859638e spining 2021-02-22 15:27:51 +08:00
caishi 518d341ed5 issues 2021-02-22 10:17:52 +08:00
caishi b4a608bcc3 img-siaze 2021-02-07 16:50:14 +08:00
caishi 658fd1b4f9 权限 2021-02-06 15:30:56 +08:00
caishi 58228e90c7 project 镜像、fork 2021-02-06 10:42:32 +08:00
caishi 10466ac4a2 标签长度 2021-02-06 10:18:05 +08:00
caishi 98d40482f3 issue 2021-02-05 16:19:35 +08:00
caishi 03cd10f599 新建团队 2021-02-04 18:31:27 +08:00
caishi 59836f69d0 f 2021-02-04 18:18:15 +08:00
caishi 591974aa6d 权限 2021-02-04 18:02:37 +08:00
caishi eaa46dbcee 项目-团队管理 2021-02-04 17:47:30 +08:00
caishi 0c5dd61fdc new 2021-02-04 14:54:26 +08:00
caishi 26d2e0f541 fix 2021-02-03 18:41:01 +08:00
caishi daa5cc212c 用户 url 2021-02-03 17:00:46 +08:00
caishi 7a8cbac912 Merge branch 'develop' into dev_orgnize 2021-02-03 15:53:24 +08:00
caishi 3b208ba751 组织 all over 2021-02-03 15:53:15 +08:00
caishi 9380c0172c meg 2021-02-02 18:26:55 +08:00
caishi 34ba476011 bug 2021-02-02 14:20:31 +08:00
caishi 185228d4b6 dispose 2021-02-02 13:46:22 +08:00
caishi cae10cec2a new 2021-02-02 12:22:47 +08:00
caishi 006ceff8fc bug 2021-02-02 10:05:16 +08:00
caishi c71d8512df issue 2021-02-02 09:49:03 +08:00
caishi 3b85567a1a new page 2021-02-02 09:31:15 +08:00
caishi ea77a13b6f url 2021-02-01 16:53:33 +08:00
caishi fcf03f2631 团队设置 2021-02-01 16:43:25 +08:00
caishi e65a1debc5 参数 2021-02-01 15:28:24 +08:00
caishi a2406bbf4b 组织团队 2021-02-01 15:20:38 +08:00
caishi eee8d4659c bug 2021-02-01 11:10:51 +08:00
Sylor-huang 7eef81b91a add team codes 2021-01-31 22:24:46 +08:00
Sylor-huang bd85703412 add group setting pages 2021-01-30 22:06:52 +08:00
Sylor-huang 7a2d1b7db1 add group setting 2021-01-30 21:12:26 +08:00
caishi 828cc2470d 个人中心-我的组织 2021-01-29 17:26:08 +08:00
caishi 7b7b206741 Merge branch 'develop' into dev_orgnize 2021-01-29 14:45:34 +08:00
caishi 5181d636d9 工作流配置-模板管理 2021-01-29 14:17:49 +08:00
caishi f68842beff 组织-基本管理 2021-01-28 11:48:21 +08:00
caishi 6deb8db08f Merge branch 'develop' into dev_orgnize 2021-01-25 16:01:49 +08:00
caishi 3a2d93c3a6 version 2021-01-25 16:01:18 +08:00
caishi b71980f6dc issue 2021-01-25 15:22:45 +08:00
caishi 586d9e0c05 新建组织 2021-01-25 10:49:39 +08:00
caishi 029bb89b11 新建 2021-01-21 18:01:59 +08:00
caishi 2278d03c47 iconfnt 2021-01-20 20:14:39 +08:00
caishi a22b5b3701 合并develop 2021-01-20 15:22:37 +08:00
caishi df438212c1 Merge branch 'develop' into dev_devopsDispose 2021-01-20 15:21:12 +08:00
caishi e1164875b0 update bug 2021-01-20 11:39:00 +08:00
caishi c53de4ad15 stage 2021-01-20 10:47:59 +08:00
caishi ef22be7e96 remove debug 2021-01-20 10:13:18 +08:00
caishi a235879dd0 update 2021-01-20 10:12:35 +08:00
caishi 0b007b35d9 new 2021-01-19 18:11:38 +08:00
caishi 68935245f0 pulls 权限 2021-01-13 15:46:45 +08:00
caishi f7fe479859 new 2021-01-13 15:46:17 +08:00
caishi 9d0adc0747 pulls 2021-01-13 14:16:18 +08:00
caishi 0e0eee8aaf pulls 2021-01-13 09:49:54 +08:00
caishi 7e47cad744 pullrequest 2021-01-12 17:36:30 +08:00
caishi 5e7fedb471 dispose 2021-01-12 17:25:22 +08:00
caishi 4ef05163d7 about page 2021-01-11 17:18:12 +08:00
caishi 4d9567bb94 Merge branch 'master' into dev_devopsDispose 2021-01-06 16:34:43 +08:00
caishi 246782f961 link 2021-01-06 16:23:59 +08:00
caishi dd8856f7ac forge-工作流配置页改版-分支 2021-01-06 16:03:50 +08:00
caishi 502dfde9a2 详情顶部-为0时不显示 2021-01-05 15:31:26 +08:00
caishi 05ded94662 save 2021-01-05 14:27:35 +08:00
caishi bbe3766a40 工作流已开启和未开启两种状态链接跳转 2021-01-05 10:32:50 +08:00
caishi 05080e7948 工作流 2020-12-31 13:58:44 +08:00
caishi 2b063bb8f7 动态-user_login 2020-12-24 10:20:29 +08:00
caishi 2905bb41a7 md编辑器的高度 2020-12-24 09:36:02 +08:00
caishi d66b0580b7 issue 2020-12-23 17:39:50 +08:00
caishi d7e0d5b246 name 2020-12-22 10:31:10 +08:00
caishi fac62fc99e remove 2020-12-21 17:59:40 +08:00
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 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 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 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