adminWzh
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,193 Commits 78 Branches 2 Tags 702 MiB
Commit Graph

85 Commits

Author SHA1 Message Date
herman94 4e5a851484 代码质量分析 2022-07-11 11:45:44 +08:00
谢思 0206ff6681 项目及课题列表优化 2022-05-25 17:17:43 +08:00
谢思 e9439cf965 glcc优化 2022-05-25 17:13:00 +08:00
谢思 e4f544fe75 merge 开源夏令营报名页+帮助页+首页-组织方、联系我们 2022-05-25 16:44:10 +08:00
何童崇 0355d9c80c 初始化glcc 2022-05-25 16:40:39 +08:00
caishi da58b17ca2 判断是否登录-checkiflogin 2022-04-24 15:39:29 +08:00
caishi ee5bddaa75 update 2022-04-18 09:22:29 +08:00
caishi 1fd7a21e9f update 2022-04-14 17:56:11 +08:00
caishi 3e98988f83 merge后稍微修改样式 2022-04-12 17:06:28 +08:00
caishi 5b8cf2e441 Merge branch 'gitlink_server' into dev_educoder_new 
# Conflicts:
#	package-lock.json
#	src/App.js
#	src/forge/DevOps/ServiceModal.jsx
#	src/forge/Head/Footer.jsx
#	src/forge/Head/Header.js
#	src/forge/Main/Index.js
#	src/forge/Main/sub/DetailBanner.jsx
#	src/forge/Settings/Setting.js
#	src/forge/Wiki/fetch.js
#	src/forge/users/Infos.js
#	src/modules/login/EducoderLogin.js
#	src/modules/login/LoginDialog.js
#	src/modules/tpm/TPMIndex.css
#	src/modules/tpm/TPMIndexHOC.js
 2022-04-12 09:16:58 +08:00
caishi ed2c16661a issue-筛选保存 2022-01-14 17:33:25 +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 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
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 9ae3c0e786 Merge branch 'pre_develop_dev' into dev_educoder 
# Conflicts:
#	public/css/iconfont.js
#	src/AppConfig.js
#	src/forge/Head/Footer.jsx
#	src/forge/Head/Header.js
#	src/forge/Head/header.scss
#	src/forge/Main/CoderDepot.jsx
#	src/forge/Main/CoderRootCommit.js
#	src/forge/Main/sub/DetailBanner.jsx
#	src/forge/New/Index.js
#	src/forge/Source/Index.jsx
#	src/modules/tpm/TPMIndexHOC.js
 2021-10-23 15:41:21 +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
caishi be379d39e3 merge-pre_develop_dev 2021-09-06 14:21:43 +08:00
caishi e7f997d3f6 hide 2021-09-06 11:34:44 +08:00
何童崇 c3b43bb5c7 merge ff75065a0a 2021-09-06 11:32:43 +08:00
caishi f2be69f4e3 新建：拥有者默认选中当前登录用户，默认路由 2021-09-06 11:19:53 +08:00
caishi a14eddda52 git merge 70af7dae5f 2021-09-06 10:54:57 +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
caishi 0889ee69c5 未登录时：路由/不显示顶部和底部 2021-07-13 10:42:56 +08:00
caishi 1bb339bfb1 新建：拥有者默认选中当前登录用户，默认路由 2021-07-06 11:54:57 +08:00
何童崇 dd9c11dbd9 上传搜索的页面 2021-06-03 10:37:03 +08:00