fix 平台首页并入gitlink服务分支 #240

jasder · 2021-10-28T17:54:55+08:00

jasder commented

2021-10-28 17:54:55 +08:00

No description provided.

jasder added 157 commits 2021-10-28 17:54:56 +08:00

a7c3dee7e3 ；

6630309466 Merge branch 'develop' into dev_local

af48da2eb3 href

e3c926da77 注册

49ebe450be 合并测试版分支

8429effe16 没logo时会将setting重置为空

4947cd8456 浏览器ico要用trustie的logo

6a9f2b31a6 注册页面logo和底部信息

ecb1691b4d Trustie

b69bf5974a remove

c554d2c00d 重置settings为undefined

6c4e1c6665 Merge branch 'standalone' into dev_local

6a588db7f6 清理代码

c256887132 注册成功后跳转到首页

458b56e33b 去掉悬浮手册按钮

4fdd3f6f80 组织-团队列表的头像login为undefined

10d933e037 merge develop

375cbb37df merge

80dace18e9 资源库不需要按引用次数排序

93d48c359e merge

3702d1c1a5 merge

91ac6c2357 组织团队-新增一个团队标识

d870f17b85 readme-文件增加一个目录下拉icon

97ab819bf9 merge

278701f24b 上线后的getImageURL也不用在前面加/ + 一些小样式修改

5c7553d4aa merge

70edb73f6c all-默认头像（首字母加背景颜色）

6ee257231d 切换左侧目录，选择不同的文件时，文件详情没有更新

9b6816e346 团队项目-团队项目管理-显示的name和跳转的login

1e0608aa14 合并请求-提出申请者头像显示问题

3b69c01ead merge

d872ffc606 merge

3b6cc99d49 merge

1a86a75345 发布评论者头像路径错误

3243aeebc6 贡献者-悬浮卡片-测试版1

63da7adcf9 个人中心关注-关注或者取消关注未更新状态

383b3f5d74 imageUrl + /

d22a741bf7 贡献者-悬浮内容增加跳转链接

c554237076 +上贡献者悬浮框里增加的跳转链接不要新开页

5c491071b6 +上关注后不需要提示

8a577fb263 资源库

b2f2df65bb 样式覆盖

7102594444 代码库编辑文件-切换到其它目录后要重新将编辑状态改为显示状态

37668ddcd4 组织团队-无数据显示错误

465c4cc8c7 04-28休假期修改issue --需合并至其它分支（合并请求相关）

63d69a955e 代码库-提交描述未换行

2deb6f8f9d 设置所有标签的marginbottom为0

c33561c212 新建项目-maxlength

ff06efe109 merge develop

0b43fa8952 merge develop

03370e8a07 merge

d49af735f1 merge

4d5430c3ed 统一项目简介、项目概览

4c48b6c77a merge

6a546c79e4 merge

51925542b8 Merge branch 'develop'

# Conflicts:
#	public/css/edu-purge.css

7eea9316dd detail+同步镜像type=2的才不需要合并请求

990c4e22b0 编辑合并请求-url地址错误

d783d998fc 编辑合并请求-url地址错误

705bfb07bd Merge branch 'develop'

ecc6387113 no message

8baf2cb49c install babel-polyfill

3135300fe6 merge d029840874

513255428c Merge branch 'develop'

# Conflicts:
#	package-lock.json

eb58f91dbf Merge branch 'develop'

3e0814344f Merge branch 'develop'

fa169b27cd Merge branch 'develop'

bc64cbb415 Merge branch 'develop'

6b20391c72 merge 个人中心改版

a9e3513706 year

eab68ac270 概览页数据绑定完成，只差数据统计页

a7df6da5f0 merge 个人中心部分冲突

9a62d7806e 同上-修改细节

f86acfebdf merge冲突

03cff6ec2e merge

99947c0c87 merge

0661c6b932 添加成员后要清除选中的成员

ccc6cb5d26 merge

bcdf506e6c 数据统计三个时间筛选参数值必须是时间戳

9a2c3f1754 merge

ff7d191011 merge

a257d832cb issue

fb8ae3fcdf 小修

cacb8c84ae 合并develop分支的个人中心改版-全部

c0f7c489fb Merge branch 'develop'

b808bcee99 Merge branch 'develop'

b44b6530e5 Merge branch 'develop'

777dbd0f43 Merge branch 'develop'

db682ace86 Merge branch 'develop'

eba6ed0876 搜索的接口改用正式版对应的服务器地址

e31ff9bdf3 Merge branch 'develop'

95091d0e08 Merge branch 'develop'

934ac61b77 Merge branch 'develop'

07852b204c Merge branch 'develop'

d31b932efe Merge branch 'develop'

6679fe8a48 Merge branch 'develop'

810ea37bed Merge branch 'develop'

9408ad7dcb Merge branch 'develop'

44a8f806e0 Merge branch 'develop'

4ec840f252 Merge branch 'develop'

c9802c26a4 Merge branch 'develop'

ad7ab189b1 限制字符

b238bb51ca 限制字符

b7869e5203 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus-react

7530d3f9c4 Merge branch 'develop'

8f2df90555 代码style

00402ef13d Merge branch 'master' of https://git.trustie.net/jasder/forgeplus-react

# Conflicts:
#	src/forge/Main/sub/UpdateDescModal.jsx

d13d94e9cf 代码库样式整改

2347d04710 同上-细节修改

20f64bdf81 md fullscreen

3a1fd14e7c 代码库-样式

e8dadb187b 紧急修复镜像bug

6beb4c2c8a 修复镜像项目时的展示问题

修复镜像项目时的展示问题

9b101403a1 里程碑-切换分页需要带上状态参数

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

ec84ed56b0 reset

0d0b164370 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus-react into develop

8273acd195 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage

4233811ae3 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage

38021c2e4b Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage

d4690cc8b5 拉取测试版分支代码，且更新gitlink首页

beba8975ca Merge pull request 'fix merge pro develop dev' (#73 ) from pre_develop_dev into feature_homepage

7d087ec1f2 gitlink首页-第一版

28f8b6b54c Merge branch 'feature_homepage' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage

0c816805fb gitlink 首页：合作单位的image以及需求更新

21046bbcb7 Merge pull request 'gitlink首页需求更新' (#86 ) from caishi/forgeplus-react:feature_homepage into feature_homepage

5982c0df96 首页需求更改

568a632d65 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage

# Conflicts:
#	src/forge/Head/header.scss

3da9306ed6 style

12f97cce62 Merge pull request '添加一些功能和修复相关问题' (#196 ) from pre_develop_dev into pre_develop

ad1f0e29e7 FIX 合并主干分支代码并解决冲突

925d5ea356 Merge pull request '并入独立版本' (#202 ) from jasder/forgeplus-react:standalone into standalone

42139ef998 settings多次声明

66c495d6b5 Merge pull request '合并代码后，变量重复引发错误' (#203 ) from caishi/forgeplus-react:standalone into standalone

0f0130742e FIX 解决文件冲突

cde55c1b3c Merge pull request 'WIP' (#204 ) from jasder/forgeplus-react:develop into develop

8f9e9b0152 解决代码冲突

fe2318021e Merge pull request '合并最新功能代码' (#206 ) from jasder/forgeplus-react:master into master

b703c27d44 Merge pull request '并入master分支' (#205 ) from develop into master

0c180ace32 ADD MulanPSL-2.0 LICENSE

257519f98b Merge branch 'master' of https://git.trustie.net/Gitlink/forgeplus-react

b6a450a482 FIX 项目路由改造的bug

d81b40969a FIX 项目路由改造的bug

98a7f73c04 Merge branch 'master' into standalone

b16e95923a Merge pull request 'FIX bug' (#211 ) from jasder/forgeplus-react:standalone into standalone

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

254b3173d1 merge

d7bdb35bb7 merge bug

848109afe8 settings

987eb39681 Merge pull request 'standalone merge problem' (#214 ) from caishi/forgeplus-react:standalone into standalone

f0ffc9a29c iconfont + style

7407545d1f Merge pull request '冲突引起iconfont丢失' (#215 ) from caishi/forgeplus-react:standalone into standalone

f89f4b6628 Merge branch 'standalone_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage

914966bd39 detail

a3bbf6b1c1 头部logo

f5817e5150 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_homepage

7ec53a246c Merge pull request 'logo 从接口获取 nav_logo_url' (#226 ) from caishi/forgeplus-react:feature_homepage into feature_homepage

jasder closed this pull request

2021-10-28 18:11:40 +08:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

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#240