merge old version #260

Merged

baladiwei merged 167 commits from feature_noti_v2 into feature_notification_v2 2021-11-12 14:07:07 +08:00

Conversation 0 Commits 167 Files Changed 59 +1436 -537

baladiwei commented 2021-11-12 14:07:01 +08:00

Contributor

Copy Link

No description provided.

baladiwei added 167 commits 2021-11-12 14:07:01 +08:00

da7ff8c749 refactor: 合并请求路由改造以及评论数量bug修复

8a8f8693fe Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_pull_routers

5a88a1a4e6 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_pull_routers

d7ab95eccc 提交详情页体验优化

1684e5c04f Merge pull request '提交详情页体验优化' (#128) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

1b9602df77 issue

860f52e7e1 Merge pull request '代码库二级页面改版-修改issue' (#129) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

f6c5fd7550 代码库二级页面标签样式优化

26d1b2edc8 Merge pull request '代码库二级页面标签列表样式更改' (#130) from hc1913847458/forgeplus-react:testdev into pre_develop_dev

08b5f7edc0 开发语言左侧圆点位置

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

756e3f0416 提交详情页面-提交md渲染

dc6bad6b3e Merge pull request '代码库二级页面改版-修改issue' (#131) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

dcb597ea37 代码库二级页面标签加载优化

825cee4eac 代码库二级页面md文件定位处理

8e1fb80f96 代码库二级页面md文件定位处理

92fb98e303 Merge pull request '1.标签加载方式优化 2.预览md文件定位' (#132) from hc1913847458/forgeplus-react:testdev into pre_develop_dev

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

b0d1379281 去掉二级页面改版后不需要的接口top_count.json

4e3215c6f9 Merge pull request '细节问题以及去掉不必要的接口' (#133) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

873ab992bc 提交列表页提交信息md渲染

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

07049cbbc6 标签无数据提示

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

8a6ed077d1 Merge pull request '提交列表页提交信息md渲染' (#134) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

7a8540045b Merge pull request 'issue-标签列表数据提示' (#135) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

cd30082956 styel

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

66c5662d01 代码库一级页面提交描述信息md渲染

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

e04496f662 Merge pull request '代码库一级页面提交描述信息md渲染' (#136) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

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

8bdd619dde 代码库一级页面提交信息css样式问题

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

1ed49e7221 Merge pull request '代码库一级页面提交信息css样式问题' (#137) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

bcbd915bd1 提交详情Tooltip渲染出false

898e3f3256 Merge pull request '提交详情Tooltip渲染出false' (#138) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

1c5b5a66d8 代码库二级页面标签页优化

63a74cc076 代码库二级页面标签页优化

539fa64358 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev

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

8cb0e32afa Merge pull request '标签无数据提示问题' (#141) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

fd58c70c54 issue标签页样式

1406b30a54 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev

0a81bc6e6e Merge pull request 'issue标签页样式修改' (#142) from hc1913847458/forgeplus-react:testdev into pre_develop_dev

112aacb6a1 代码库二级页面标签加载优化

c282a1e034 标签列表头像

4902a26646 Merge pull request '标签列表显示头像、样式修改' (#143) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

8b186467a4 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev

a54f1b6e1a Merge pull request 'FIX 完善代码库二级页面存在的相关问题' (#144) from pre_develop_dev into pre_develop

19b7381120 issue

c037712b3e Merge pull request '代码库二级页面改版' (#146) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

9812761b47 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev

a09d330a7e refactor: 新建合并请求路由改造

50f785bf42 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_pull_routers

279d358be9 Merge pull request '合并请求路由改造' (#147) from yuzhantian/forgeplus-react:feature_pull_routers into feature_router_v2

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

d05829ac80 Merge pull request 'FIX some bug' (#148) from pre_develop_dev into pre_develop

b578383e8d 设置项目标识暂时隐藏

4c25aed9a0 Merge pull request '贡献者样式修改+细节样式+仓库设置项目标识（接口还在测试，暂时隐藏）' (#149) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

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

1fbe6671b1 代码库一级页面样式

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

8ae34b8f32 Merge pull request '代码库一级页面样式' (#150) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

e5787e3e66 Merge pull request 'FIX WIP' (#151) from pre_develop_dev into pre_develop

94ceec26e9 标签列表内容

2060e28ca2 Merge pull request '标签列表数据少时内容居中了' (#152) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

2fc59748b4 Merge pull request 'FIx css bug' (#153) from pre_develop_dev into pre_develop

fd21cc6d00 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_pull_routers

fe4c5a79d2 仓库设置-可修改项目标识

8dcc6c6d59 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev

a7c2120cf3 动态配置通知模块

de79518e0d Merge pull request '动态配置是否开启通知模块' (#155) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

38c553d87c 未登录状态隐藏消息铃铛

baba177244 Merge pull request '未登录状态隐藏消息铃铛' (#156) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

8e3bd741cb fix: pr路由bugfix

5c819070bb 处理未登录状态下地址栏输入跳转消息页面情况

095e27fcc3 Merge pull request '处理未登录状态下地址栏输入跳转消息页面情况' (#157) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

fc305ae952 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router_v2

bfcf714822 Merge branch 'feature_router_v2' of https://git.trustie.net/Gitlink/forgeplus-react into feature_pull_routers

a4902739f2 Merge pull request 'pr路由改造bugfix' (#159) from yuzhantian/forgeplus-react:feature_pull_routers into feature_router_v2

5d19f6c06b 未登录状态进入消息页面跳转首页

4afb131aef Merge pull request '未登录状态进入消息页面跳转首页' (#160) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

5223a84dac 域名更换通知

68b34ab418 Merge pull request 'fix wip' (#162) from pre_develop into featrue_system_popup_notification

0d7805fc9d Merge branch 'featrue_system_popup_notification' of https://git.trustie.net/Gitlink/forgeplus-react into featrue_system_popup_notification

82d8a0d198 Merge pull request '域名更换增加提示弹框' (#163) from caishi/forgeplus-react:featrue_system_popup_notification into featrue_system_popup_notification

f65781b49b Merge pull request '仓库设置-增加仓库标识的修改' (#164) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

17cf0412cd Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev ...

# Conflicts:
#	src/forge/Main/tag/Index.jsx

7b180560a6 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into testdev

3ca38e76a1 弹框的样式

05eb0367ba 项目复刻按钮显示优化

a7283b5567 Merge pull request '域名更换增加提示弹框样式' (#165) from caishi/forgeplus-react:featrue_system_popup_notification into featrue_system_popup_notification

bb6fe08c54 file

f6b59e0a3a save

47b6c3d948 save

2f06288507 Merge pull request '项目复刻按钮显示优化' (#167) from hc1913847458/forgeplus-react:testdev into pre_develop_dev

fbbb3c3aa6 markdown文件样式影响内容

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

1826c1923f 项目复刻按钮显示优化

c0afc7a052 Merge pull request 'markdown编辑器' (#168) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

0b4baa1d03 Merge pull request '项目复刻按钮显示优化' (#169) from hc1913847458/forgeplus-react:testdev into pre_develop_dev

c386bcf5e7 动态也数据显示、样式修改

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

c45a6ffe1a Merge pull request '动态页面数据显示、以及样式更改' (#172) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

bb1175de01 setting修改报错时要隐藏加载效果

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

90cfac4436 Merge pull request '动态配置开启通知模块' (#171) from durian/forgeplus-react:pre_develop_dev into pre_develop

94fd500423 Merge pull request '合并请求相关路由改造' (#170) from durian/forgeplus-react:feature_router_v2 into pre_develop

1aa6c05869 动态比例数据

0903edfd2c 设置cookie为24小时的限制，超过后重新弹出弹框

afd2cec4f2 保存cookie时先删除cookie

f97c90f20e Merge pull request '弹框弹出时间用cookie保存' (#173) from caishi/forgeplus-react:featrue_system_popup_notification into featrue_system_popup_notification

95050bb3bd 非.git结尾的也需要自动填充

35110b7db4 动态页面数据传参

8ace7da3a7 同上-数据传参

b30f2169e4 数据state

f78eecd775 Merge pull request 'FIX 合并生产版本分支代码' (#175) from pre_develop into pre_develop_dev

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

66108083fd 修改新建合并请求页面目标分支存在但显示不存在bug以及提交详情页面的浏览文件按钮上移样式问题

4b9cc26d9c Merge pull request 'issue上线' (#178) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

4b2651339b Merge pull request '修改新建合并请求页面目标分支存在但显示不存在bug以及提交详情页面的浏览文件按钮上移样式问题' (#177) from durian/forgeplus-react:router_v2_issue into pre_develop_dev

3e3e9f3681 Merge pull request '202110151541 release' (#179) from pre_develop_dev into pre_develop

9de7ac7c90 易修、合并请求标题：字符长度、详情的显示、列表的显示长度等

e9546951c9 非汉字需要强制换行

14df994cd6 Merge pull request 'issue - 易修、合并请求标题长度和显示样式' (#181) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

e744714da0 Merge pull request 'FIX 合并测试分支代码' (#182) from pre_develop_dev into featrue_system_popup_notification

dfa9b3d835 issue

a2c5c1ea6f 通知管理模块

e7a322e038 弹框样式-markdown渲染有影响

644e3c3f73 cookie失效时间改为一天

edbd47ea0f Merge pull request '域名更换弹框样式' (#186) from caishi/forgeplus-react:featrue_system_popup_notification into featrue_system_popup_notification

b6b19eabe9 仓库不同时调用compare接口

0c52ea22a7 Merge pull request 'ADD平台通知公告' (#187) from featrue_system_popup_notification into pre_develop_dev

e992849723 Merge pull request 'FIx 合并测试分支功能代码' (#188) from pre_develop_dev into pre_develop

11b92ac52b 通知管理

573ec813a6 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into router_v2_issue

fe1bacb984 通知管理+删除基本资料页面的consolo语句

6ff27a559f Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification_v2_noticeSettings

31af77e704 通知管理

eadec88e0c Merge pull request '合并请求' (#190) from durian/forgeplus-react:router_v2_issue into pre_develop_dev

b31503ee0d Merge pull request 'ÅDD compare api on create pr action' (#191) from pre_develop_dev into pre_develop

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

2c867f9856 cookie设置path

76c2d205eb cookie设置时间

be3e2b6936 Merge pull request '通知公告弹框bug以及pr页面下拉弹框的宽度' (#192) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

d47c725b96 pr分支过长，显示时应固定宽度

057881097d pr 分支长度

a542ed3dcd Merge pull request 'pr新建、编辑、列表等页面，分支过长时需处理' (#193) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

a0081bf3b1 Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification_v2_noticeSettings

6435b09982 Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification_v2_noticeSettings

13c58faad8 项目详情接口-根据接口使用对应的数据字段

5ef02c698d Merge pull request 'detail.json接口数据精简，前端做对应的修改' (#194) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

cc62bde5b4 修改提交列表页 提交信息多行样式问题

035296732a Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification_v2_noticeSettings

2f90ccab3c Merge pull request '通知管理' (#195) from durian/forgeplus-react:feature_notification_v2_noticeSettings into pre_develop_dev

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

ae12618c0c 导入链接显示优化

0e6cb3954a 项目页icon更改

aeff357660 项目页icon更改

60da6bd110 导入链接优化

7872d5ecab 导入链接优化

746f552a21 issue

7b77c46915 Merge pull request '导入仓库链接和项目issue优化更改' (#228) from hc1913847458/forgeplus-react:testdev into pre_develop_dev

61ee3fe36f 注册页面相关信息修改

56946f94e8 更改域名相关信息

d5b4c5425f Merge pull request 'wip' (#235) from pre_develop_dev into pre_develop

baladiwei merged commit ed3bf55f90 into feature_notification_v2 2021-11-12 14:07:07 +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

Subscribe

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

No description provided.