Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

合并GitLink代码 #353

Merged
xxq250 merged 1281 commits from tongChong/forgeplus-react:JKDevelop into pre_dev_military 2022-04-01 10:38:11 +08:00
Conversation 0 Commits 1281 Files Changed 534 +30058 -9379
tongChong commented 2022-04-01 10:25:19 +08:00
Contributor
Copy Link

合并GitLink代码

合并GitLink代码
tongChong added 1281 commits 2022-04-01 10:25:20 +08:00
6296434527 清理appconfig文件 
资源库所有页面排版、数据未绑
3a3a0251aa Merge branch 'undo' into develop 
# Conflicts:
#	src/forge/Component/SearchUser.jsx
51925542b8 Merge branch 'develop' 
# Conflicts:
#	public/css/edu-purge.css
513255428c Merge branch 'develop' 
# Conflicts:
#	package-lock.json
5eaebd4e42 上传文件显示: ADD file via upload 
创建新文件显示： Add 文件名
修改文件： Update 文件名
00402ef13d Merge branch 'master' of https://git.trustie.net/jasder/forgeplus-react 
# Conflicts:
#	src/forge/Main/sub/UpdateDescModal.jsx
6beb4c2c8a 修复镜像项目时的展示问题 
修复镜像项目时的展示问题
8adc662e9b wiki功能分支合并 
wiki功能分支合并
313f1edc71 镜像问题websocket传值 
镜像问题websocket传值
466ed1fe1b Merge branch 'pre_develop' into develop 
# Conflicts:
#	public/css/iconfont.css
#	public/css/iconfont.js
#	public/css/iconfont.ttf
#	public/css/iconfont.woff
#	public/css/iconfont.woff2
bcde15cec1 需求更改 
同步镜像调用websockt，成功后刷新页面；
合并请求可选标签，仓库设置类别、语言可选
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
e084b015cf Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into gitlink_server 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
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
xxq250 merged commit 58947d071e into pre_dev_military 2022-04-01 10:38:11 +08:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Gitlink/forgeplus-react#353
No description provided.
Delete Branch "tongChong/forgeplus-react:JKDevelop"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?