morii
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,443 Commits 65 Branches 2 Tags 458 MiB
Commit Graph

139 Commits

Author SHA1 Message Date
何童崇 ad27cfb042 合并代码 2022-02-09 16:58:30 +08:00
caishi 4f9a03a1af update styles 2022-01-20 11:50:30 +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
何童崇 d98c9df202 修改issue 2022-01-17 13:53:27 +08:00
unknown 11701869a1 发布评审任务 2022-01-07 12:20:13 +08:00
何童崇 63b6c4ee12 去掉额外的iconfont资源 2021-12-29 09:59:54 +08:00
何童崇 02d52c0971 修改校验、新增导出 2021-12-29 09:58:21 +08:00
caishi e096e1aa50 branch 转义 2021-12-28 15:50:25 +08:00
何童崇 c1a9f7f76c 合并首页代码 2021-12-17 13:06:51 +08:00
谢思 bf58961a23 专家评审子系统 2021-12-16 10:54:06 +08:00
谢思 e206de9f1f Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into feature_teaching 2021-12-13 15:09:17 +08:00
谢思 29d74526d1 教学实践页面 2021-12-10 15:42:50 +08:00
caishi 56c8f7fa82 educoder项目添加只读标识 2021-12-09 17:31:34 +08:00
谢思 77fdafd58b 解决css文件冲突 2021-11-22 10:15:41 +08:00
谢思 5fea412ca8 解决css文件冲突 2021-11-22 09:36:54 +08:00
caishi abf9b25651 iconfont 2021-11-19 14:21:39 +08:00
何童崇 bdcc7a4699 修改第五个动画 2021-11-17 14:39:10 +08:00
谢思 12ce0aa4f5 意见反馈功能 2021-11-16 13:18:03 +08:00
谢思 a38b4af8bc 意见反馈功能 2021-11-16 09:21:13 +08:00
caishi f2a660d595 ico + 移除滚动事件 2021-11-11 16:35:37 +08:00
caishi 30c61f0a7d 上线update 2021-10-29 17:01:55 +08:00
caishi 743dabd553 需求+设计+bug修改 2021-10-29 14:18:30 +08:00
jasder 1c48ffb130 合并平台首页、项目首页功能分支，并处理代码冲突 2021-10-28 18:11:07 +08:00
caishi 3d3ef19d4a 项目首页 banner 2021-10-26 09:40:35 +08:00
caishi b000fc11f3 iconfont + style 2021-10-22 16:52:27 +08:00
caishi f89f4b6628 Merge branch 'standalone_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage 2021-10-22 14:33:40 +08:00
caishi f0ffc9a29c iconfont + style 2021-10-22 13:56:34 +08:00
caishi 44f06b7305 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage 
# Conflicts:
#	public/css/iconfont.css
#	public/css/iconfont.js
#	public/css/iconfont.json
#	public/css/iconfont.ttf
#	public/css/iconfont.woff
#	public/css/iconfont.woff2
#	src/App.js
#	src/forge/Head/Footer.jsx
#	src/modules/tpm/TPMIndexHOC.js
 2021-10-22 10:33:18 +08:00
jasder ad1f0e29e7 FIX 合并主干分支代码并解决冲突 2021-10-21 18:24:06 +08:00
caishi fe4c5a79d2 仓库设置-可修改项目标识 2021-10-13 09:57:04 +08:00
caishi b578383e8d 设置项目标识暂时隐藏 2021-10-12 17:15:16 +08:00
caishi 3da9306ed6 style 2021-09-30 15:42:37 +08:00
谢思 5726969431 解决代码冲突 2021-09-30 09:30:28 +08:00
谢思 1750544c0d pull upstream pre_develop_dev 2021-09-29 21:06:25 +08:00
谢思 30512cb4f4 修改代码库二级改版issue 2021-09-29 21:04:40 +08:00
caishi 0c816805fb gitlink 首页：合作单位的image以及需求更新 2021-09-28 16:08:25 +08:00
hucong 89bfb3a986 fix 代码二级页面issue修改 2021-09-28 14:25:03 +08:00
谢思 7d3c6bd4f5 代码库二级页面改版-发行版 2021-09-28 09:29:33 +08:00
谢思 1402029bfe 提交优化-发行版改版 2021-09-27 10:08:52 +08:00
谢思 ab351fd8f8 提交详情页面改版 2021-09-24 11:27:32 +08:00
caishi a5c3cd168e 同上-影响后端接口，暂不上线 2021-09-16 15:48:43 +08:00
caishi 25186132f2 markdown @+字母，会有跳转链接，去掉 2021-09-16 11:10:11 +08:00
caishi 0b2a5a910b 修改代码库二级页面（一部分） 2021-09-16 09:19:25 +08:00
caishi 3a16c4be8a delete .map文件、update style 2021-09-10 11:47:48 +08:00
hc1913847458 9e1ce515a8 issue 2021-09-08 18:09:26 +08:00
hc1913847458 540553199a issue 2021-09-08 17:53:21 +08:00
hc1913847458 b3c9eb3c33 issue 2021-09-08 17:42:04 +08:00
hc1913847458 94fbc972be issue 2021-09-07 11:29:09 +08:00
caishi fbe5da1014 设置所有标签的marginbottom为0 2021-09-06 17:59:45 +08:00
caishi 411b4e9de6 代码库样式整改 2021-09-06 17:47:47 +08:00