Null369
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,135 Commits 73 Branches 2 Tags 688 MiB
Commit Graph

182 Commits

Author SHA1 Message Date
caishi 422b916be1 route 2022-04-18 10:13:50 +08:00
caishi 3e98988f83 merge后稍微修改样式 2022-04-12 17:06:28 +08:00
caishi 5e64ce0d40 merge to bd7e1b 2022-04-12 14:19:51 +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
何童崇 4a4d767710 登录后如果打开首页，第一次默认进入个人详情页 2022-04-06 14:28:55 +08:00
caishi c3cc105468 易修改为疑修 2021-12-17 15:49:52 +08:00
谢思 f6c84e4fad 复制issue 2021-11-30 16:52:12 +08:00
谢思 c331dbb445 优化复制issue@列表 2021-11-30 15:05:40 +08:00
谢思 684f9dbfe1 Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into gitlink_server 2021-11-30 11:20:20 +08:00
谢思 9577478e97 issue 2021-11-30 11:19:55 +08:00
caishi 131d8fa81c 加入项目错误提示 2021-11-29 14:01:23 +08:00
谢思 f463b20de7 Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into gitlink_server 2021-11-19 11:13:57 +08:00
谢思 7934f07cea 代码库、易修页面未登录状态创建修改跳登录框代码层面优化，之后可实现复用 2021-11-19 11:11:14 +08:00
jasder 8c66d817b5 Merge pull request 'fix 合并主干开发分支' (#267) from develop into gitlink_server 2021-11-18 10:53:15 +08:00
jasder 7579dc8a59 Merge pull request 'ADD @功能' (#266) from feature_notification_v2 into develop 2021-11-18 10:51:43 +08:00
谢思 12ce0aa4f5 意见反馈功能 2021-11-16 13:18:03 +08:00
caishi f2a660d595 ico + 移除滚动事件 2021-11-11 16:35:37 +08:00
谢思 a94d02bb8a atwo markdown渲染 2021-11-11 11:31:42 +08:00
谢思 f003a99779 @我功能。 2021-11-10 16:47:22 +08:00
谢思 55a6f93fe3 atwho 2021-11-08 16:04:19 +08:00
谢思 ac4488a907 atwho 2021-11-08 15:14:04 +08:00
谢思 2078a044b6 at我列表 2021-11-01 09:31:08 +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 d37709b1a5 首页文件夹 2021-10-25 11:24:21 +08:00
谢思 1c46617144 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification_v2 2021-10-23 19:52:58 +08:00
谢思 ec133a6880 添加todo 2021-10-23 19:50:17 +08:00
谢思 8021d96cd8 atwho列表 2021-10-23 19:39:54 +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 254b3173d1 merge 2021-10-22 11:25:44 +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
谢思 3498390974 at 2021-10-21 14:12:15 +08:00
谢思 4f3e385f78 at谁列表（缺弹框的上下，enter键监听） 2021-10-21 10:51:40 +08:00
谢思 18b289b84c @who（缺优化） 2021-10-21 09:41:17 +08:00
谢思 e3f49db5c0 at谁列表 2021-10-18 14:19:32 +08:00
谢思 4add266047 at谁列表 2021-10-15 11:36:51 +08:00
caishi 0903edfd2c 设置cookie为24小时的限制，超过后重新弹出弹框 2021-10-15 10:27:16 +08:00
谢思 4a6012bfa9 at谁列表 2021-10-14 15:04:17 +08:00
谢思 7fe88aa4d9 at列表 2021-10-14 09:11:37 +08:00
caishi 5223a84dac 域名更换通知 2021-10-13 17:58:45 +08:00
谢思 bc6ef583fb atwho 2021-10-13 16:01:38 +08:00
谢思 b268b540d8 @我列表 2021-10-13 14:53:13 +08:00
谢思 7e69c64c9c @who列表 2021-10-13 11:52:54 +08:00
谢思 85ef26f70e @who 2021-10-13 10:07:38 +08:00
谢思 999a15761d md@谁列表 2021-10-12 14:24:18 +08:00
caishi 0c816805fb gitlink 首页：合作单位的image以及需求更新 2021-09-28 16:08:25 +08:00