Commit Graph

47 Commits

Author SHA1 Message Date
unknown a2a2847010 打包项目失败 2022-02-14 09:55:24 +08:00
何童崇 ad27cfb042 合并代码 2022-02-09 16:58:30 +08:00
caishi e7b6f6fc35 merge codes 2022-01-17 16:47:34 +08:00
caishi 2f3d914fdf Merge branch 'gitlink_server' into JKDevelop
# Conflicts:
#	package-lock.json
#	package.json
#	public/css/edu-purge.css
#	public/css/iconfont.css
#	public/css/iconfont.js
#	public/css/iconfont.json
#	public/css/iconfont.ttf
#	public/css/iconfont.woff
#	public/css/iconfont.woff2
#	public/favicon.ico
#	src/App.js
#	src/AppConfig.js
#	src/common/DateUtil.js
#	src/common/TextUtil.js
#	src/common/UrlTool.js
#	src/common/educoder.js
#	src/forge/Branch/CloneAddress.js
#	src/forge/Main/CoderRootCommit.js
#	src/forge/Main/CoderRootDirectory.js
#	src/forge/Main/Detail.js
#	src/forge/Main/Index.js
#	src/forge/Main/Index.scss
#	src/forge/Main/IndexItem.js
#	src/forge/Main/list.scss
#	src/forge/Merge/Files.jsx
#	src/forge/New/Index.js
#	src/forge/Settings/CollaboratorMember.jsx
#	src/forge/Settings/Setting.js
#	src/forge/Upload/Index.js
#	src/forge/css/index.scss
#	src/forge/users/Index.jsx
#	src/forge/users/Infos.js
#	src/modules/404/Shixunnopage.js
#	src/modules/login/LoginDialog.js
#	src/modules/tpm/NewHeader.js
#	src/modules/tpm/TPMIndex.css
#	src/modules/tpm/TPMIndexHOC.js
2022-01-17 16:13:15 +08:00
何童崇 d13f90f45e 修改配置主题色,需要install新的less包 2022-01-08 15:41:13 +08:00
caishi 0a334abede 修改头像组件 2022-01-05 11:48:31 +08:00
何童崇 2910282d77 修改配置文件及样式 2021-12-24 09:29:41 +08:00
谢思 c9cd52221e 专家列表页顶部 2021-12-20 08:59:34 +08:00
谢思 ce3b460717 Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into gitlink_server 2021-11-29 09:03:29 +08:00
谢思 121b1aaab1 关于我们0.8版 2021-11-24 17:16:59 +08:00
谢思 4b1bccd1cd 处理页面刷新之后创建合并请求报错问题 2021-11-22 15:25:24 +08:00
何童崇 54bffb41da 增加2个动画 2021-11-16 17:16:51 +08:00
何童崇 6e7da0ef5b Merge branch 'pre_dev_military' of https://git.trustie.net/Gitlink/forgeplus-react into feature_jk_homepage 2021-11-10 15:16:08 +08:00
何童崇 a59a8c3693 修改指向路径 2021-11-10 09:33:12 +08:00
何童崇 14e4dc7d9e 修改首页 2021-11-09 16:53:59 +08:00
谢思 50627aba6b 代码库二级页面改版-测试-提交,发行版 2021-09-28 15:50:20 +08:00
谢思 5d83c85b2d 提交页面优化-未完 2021-09-26 11:36:30 +08:00
谢思 ab351fd8f8 提交详情页面改版 2021-09-24 11:27:32 +08:00
caishi 6e849aa800 install babel-polyfill 2021-09-06 18:02:45 +08:00
谢思 4ccab2ed4f issues非按钮复杂判断修改 2021-08-31 15:51:58 +08:00
caishi f7698334ab webhook上线测试版-1 2021-07-30 15:06:32 +08:00
何童崇 fa80b5d1df 解决因为热更新导致的table警告问题 2021-07-27 09:22:10 +08:00
何童崇 6156d98af2 新增创客空间 2021-07-16 10:54:47 +08:00
caishi 1432afebfd 个人中心整体上线 2021-05-31 17:44:30 +08:00
caishi 1378ba5c93 代码库-无默认分支时调用entries接口未传ref参数,+个人主页的三个echart 2021-05-26 15:25:21 +08:00
caishi a1bd41795a 分享功能(仅微信)+ 合并请求增加状态的显示,合并请求详情增加(冲突情况下的提示) 2021-05-21 16:44:40 +08:00
caishi 303e06586e 新增icon+添加右侧的返回顶部等按钮(接口没有,先隐藏、需要合并到其它分支,上一个提交也一样) 2021-05-14 09:32:23 +08:00
caishi 7ccc1221ef style 2021-05-11 14:22:01 +08:00
caishi b70dd5928e details 2021-05-10 11:34:30 +08:00
caishi a27c74b9aa ssh-2 2021-04-08 18:14:19 +08:00
caishi d66b0580b7 issue 2020-12-23 17:39:50 +08:00
caishi e95ef11058 style 2020-12-11 18:14:25 +08:00
caishi a38b74041e babelrc-runtime 2020-11-26 15:45:54 +08:00
caishi ef65594004 babel 2020-11-25 17:25:59 +08:00
sylor_huang@126.com d228d7bcbf Add Attachment3 2020-09-25 10:53:30 +08:00
sylor_huang@126.com 615a4debe5 Add Attachment Video 2020-09-24 14:55:44 +08:00
caishi 537c9ae40a route 2020-08-12 18:13:18 +08:00
caishi 2bd7a24f98 fault 2020-07-13 15:17:28 +08:00
caishi 2f8fd57349 new page + fix bug 2020-07-10 15:42:57 +08:00
Jasder 7d4f7e9f1f ADD actioncable package 2020-07-02 14:13:01 +08:00
sylor_huang@126.com 4b2cfb21fd 修改文件的新建和编辑 2020-05-27 17:07:36 +08:00
caishi e5927913f8 antd 影响的样式 2020-05-09 13:59:24 +08:00
caishi 1eba2fa5f2 marked package,去掉实践课程的相关文件 2020-05-09 11:00:03 +08:00
sylor_huang@126.com e381461d47 修改package-lock 2020-04-28 18:39:32 +08:00
caishi 4bfd4234b5 优化版 2020-04-28 17:23:34 +08:00
sylor_huang@126.com 1f687dd369 前端修改build 2020-03-23 15:59:50 +08:00
Jasder 4875f2c944 first commit 2020-03-16 14:12:11 +08:00