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

84 Commits

Author SHA1 Message Date
何童崇 768a44f8b3 修改整个系统导航条和管理路由相关代码 2022-03-01 15:52:02 +08:00
unknown f57380b167 合并管理端修改路由及登录 2022-03-01 11:50:46 +08:00
unknown 22b3fe4a25 修改路由 2022-02-28 16:29:17 +08:00
unknown 5d5570b6fc 修改红山开源整体样式以及细节样式 2022-02-10 15:52:07 +08:00
何童崇 ad27cfb042 合并代码 2022-02-09 16:58:30 +08:00
caishi 4f9a03a1af update styles 2022-01-20 11:50: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
caishi ed2c16661a issue-筛选保存 2022-01-14 17:33:25 +08:00
何童崇 c1a9f7f76c 合并首页代码 2021-12-17 13:06:51 +08:00
何童崇 3ecae5ba43 初始化专家评审模块 2021-12-14 13:27:27 +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
何童崇 b6f2eb107c 微调各种配置 2021-12-10 09:31:21 +08:00
caishi 232e09c04f clear 2021-12-08 15:20:55 +08:00
xiaoxiaoqiong cbe427a114 解决merge关于我们冲突 2021-11-26 14:02:47 +08:00
谢思 982536b547 关于我们0.1版 2021-11-23 17:30:05 +08:00
谢思 79331db271 登陆注册bug修复 2021-11-12 12:33:46 +08:00
caishi 6fc441d7c5 issues 2021-11-11 13:41:55 +08:00
何童崇 dc6cfc342e 为首页定制化改造头部 2021-11-10 14:30:48 +08:00
何童崇 14e4dc7d9e 修改首页 2021-11-09 16:53:59 +08:00
jasder 631f8ceeea FIX 合并登陆注册功能分支代码 2021-11-09 09:45:36 +08:00
谢思 12d8f5bf5d 登陆注册功能 2021-11-08 13:29:12 +08:00
caishi 015296e065 merge gitlink首页、项目首页，update 2021-10-29 09:39:59 +08:00
jasder 1c48ffb130 合并平台首页、项目首页功能分支，并处理代码冲突 2021-10-28 18:11:07 +08:00
caishi 1c24baf3b9 数据绑定 2021-10-28 09:31:08 +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 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
yuzhantian a09d330a7e refactor: 新建合并请求路由改造 2021-10-12 16:12:16 +08:00
caishi d4690cc8b5 拉取测试版分支代码，且更新gitlink首页 2021-09-22 09:23:20 +08:00
何童崇 33a669a940 修改路由跳转404的问题 2021-09-06 10:37:06 +08:00
何童崇 a90eeac318 上传PR修改 2021-09-04 11:16:08 +08:00
何童崇 a5bdf26f96 修改路由issue 2021-09-03 11:38:22 +08:00
何童崇 24c4c746cd 修改其他路由及修改issue 2021-09-03 09:23:12 +08:00
何童崇 4f39f03b19 修改路由的issue 2021-09-02 17:20:26 +08:00
何童崇 559b797c2e 修改路由带来的bug 2021-09-02 13:37:24 +08:00
何童崇 80dde2bc97 上传路由修改，上传sourcesource-map配置 2021-09-01 17:34:47 +08:00
何童崇 01b3ee8d49 修改projects路由 2021-09-01 09:33:22 +08:00
何童崇 662a758980 修改user/org路由时的bug 2021-08-30 17:42:13 +08:00
何童崇 eb02b814a9 修改user路由 2021-08-30 10:31:51 +08:00
何童崇 e606147d03 修改组织和首页的路由 2021-08-26 14:18:14 +08:00
何童崇 ff75065a0a 新增wiki模块 2021-08-19 17:21:18 +08:00
caishi 4f9f5649a9 设置模块-测试版第一版 2021-07-22 17:44:12 +08:00
何童崇 6156d98af2 新增创客空间 2021-07-16 10:54:47 +08:00
caishi 0889ee69c5 未登录时：路由/不显示顶部和底部 2021-07-13 10:42:56 +08:00
caishi 1bb339bfb1 新建：拥有者默认选中当前登录用户，默认路由 2021-07-06 11:54:57 +08:00
何童崇 c36925c136 新增公告模块代码 2021-06-24 17:01:05 +08:00
何童崇 dd9c11dbd9 上传搜索的页面 2021-06-03 10:37:03 +08:00
caishi a1bd41795a 分享功能（仅微信）+ 合并请求增加状态的显示，合并请求详情增加（冲突情况下的提示） 2021-05-21 16:44:40 +08:00