20240326版本 #344

# Conflicts:
#	app/controllers/api/v1/issues_controller.rb
#	app/models/identity_verification.rb
#	app/models/issue.rb
#	app/models/journal.rb
#	app/services/api/v1/issues/list_service.rb

0b21d4af41 Github issues迁移

1eb18e4036 Github issues迁移,用户名处理

505d873ea6 Github issues迁移,用户名处理, 限流需要请求等待

b7597c3fa7 Github issues迁移,用户名处理, 限流需要请求等待,token

de393148d9 Github issues迁移,用户名处理, 限流需要请求等待,token

b80ed537fc Github issues迁移,用户名处理, 限流需要请求等待,token

9979ae6d3a Github issues迁移,title 长度处理

7b1d0e21ee Github issues迁移,title 长度处理

eaf389ecea Github issues迁移,title 长度处理

c6a38c06d0 Github issues迁移,标记

5fe9719cc9 Github issues迁移,标记

3806ddaa17 Github issues迁移,标记

326dcc56ab Github issues迁移,更新时间固定

761021d191 Github issues迁移,更新时间固定

c8217d8596 Merge branch 'standalone_develop' into pre_trustie_server

75fff13550 更改：项目排行榜查询丰富

016a2f8cf5 更改：后台管理sidebar

21f559f254 更改：项目排行榜使用数据存储以及数据导出的功能

26461f3a44 更改：防止sql注入

1d48af015e Merge pull request '后台管理更新' (#238 ) from gitlink_admin_feature into standalone_develop

3b5b78faed 更改：删除数据处理以及昵称获取规则处理

883542dfe8 Merge pull request '项目名称显示不全' (#239 ) from gitlink_admin_feature into standalone_develop

6b8749589e 更改：文案为截止日期

d590e1165e website update

1195a7a339 Merge pull request '调整建站服务功能' (#240 ) from KingChan/forgeplus:chenjing into standalone_develop

ae8b86ef02 更改：后台管理模块文案

3f621bd5b5 更改：项目活跃度排行默认统计一周内的数据

93ab86e363 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop

3fefc0d7c6 新增：删除项目须同时删除所有的统计数据

69c4d461a4 update reposit detail

f3376594f1 Merge pull request '仓库新增web_site参数 page服务专用' (#241 ) from KingChan/forgeplus:chenjing into standalone_develop

3a0a95a18f update model page url

e25f27e488 Merge pull request '调整page返回值' (#242 ) from KingChan/forgeplus:standalone_develop into standalone_develop

9f60518e3e update page service

3d0fd28c2a Merge pull request '调整删除建站时的部署指令' (#243 ) from KingChan/forgeplus:standalone_develop into standalone_develop

5aff334054 add page destroy callback

2f68da74cb Merge pull request '增加page删除后的回调' (#244 ) from KingChan/forgeplus:standalone_develop into standalone_develop

d79213d14f 新增：issue列表column无值查询

2562329a5e Merge branch 'standalone_develop' into pre_trustie_server

1cd25c188c add page site close description rule

515bf4663d Merge pull request '新增关闭站点时必须填写理由' (#245 ) from KingChan/forgeplus:chenjing into standalone_develop

f2b732b8e7 add log for identity_verifications

3ceefc33f8 Merge pull request '新增身份认证操作日志功能' (#246 ) from KingChan/forgeplus:chenjing into standalone_develop

35e6d945dd 更改：组织标识正则

c89c394374 Merge branch 'develop' into standalone_develop

6756687c07 附件表uuid增加索引

bf3f25972e Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

1e159ec1cf 附件表uuid增加索引

e2374676c3 接入百度统计部分数据，按天存储

6ca883aedd Merge branch 'standalone_develop' into pre_trustie_server

7d813c0ebe 新增：项目缓存加入关闭issue数量

1c8811fda6 新增：项目疑修排行榜

ed81ce5927 更改：活跃度查询时间区间

539bf58e0d update identity_verifications/edit

d6229b62bf Merge pull request '修改文字' (#247 ) from KingChan/forgeplus:chenjing into standalone_develop

afe4a66c2b update identity_verifications_controller update

3c33ef7709 Merge pull request '拒绝实名认证需要实名理由' (#248 ) from KingChan/forgeplus:chenjing into standalone_develop

6d2ae4dcf1 Merge branch 'pre_trustie_server' of https://gitlink.org.cn/Trustie/forgeplus into pre_trustie_server

817b607a54 Merge branch 'standalone_develop' into pre_trustie_server

65abdda8f9 更改：文案修改

4453975b54 Merge branch 'standalone_develop' into pre_trustie_server

f468f0cf67 更改：统计issue数量不应该统计pr关联的issue数量

db0b47c39e Merge branch 'standalone_develop' into pre_trustie_server

354242a290 修复

302e501610 Merge branch 'standalone_develop' into pre_trustie_server

e4faee134a 接入百度统计部分数据，按天存储,refresh_access_token

9ef255f3b6 接入百度统计部分数据，缓存总数据

f98c044715 后台概览增加缓存，增加上周统计数据

24e4020809 Merge branch 'standalone_develop' into pre_trustie_server

90ea1804e9 后台概览增加缓存，增加上周统计数据，百分号

99e0d8b128 Merge branch 'standalone_develop' into pre_trustie_server

299978833d 新增：里程碑过期相关系统通知

604e3eeba1 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop

dbf41c04b3 Merge branch 'develop' into standalone_develop

1f07833de9 Merge pull request '里程碑过期相关系统通知' (#255 ) from yystopf/forgeplus:develop into develop

df0ef313f6 更改：仓库无文件跳转404

f61393f34a Merge branch 'develop' of https://gitlink.org.cn/yystopf/forgeplus into develop

0e8a3ddb79 Merge branch 'develop' into standalone_develop

d2663eb7b7 fixed 组织成员数取组织内成员和组织所有仓库成员组合

6ff89d7929 fixed 取消仓库增加成员时同时加进组织操作

c957617263 fixed 取消仓库增加成员时同时加进组织操作,仅增加

627332e93a fixed 组织成员数取组织内成员和组织所有仓库成员组合,加入时间

036acfc43d fixed 组织成员数取组织内成员和组织所有仓库成员组合,加入时间

8ca9ced360 fixed 组织成员数取组织内成员和组织所有仓库成员组合,排序加入时间

a0265d4808 更改：tree返回结构体适配以及生成token需新增scopes参数

026d58c347 更改：compare接口

096941ea9e 更改：重置gitea token规则

c94bffd844 更改：重置gitea token规则

d8eeb8f1b7 新增：恢复分支接口

新增：删除者信息

a644a65493 更新：gitea client版本

feec49d4bd 新增: 查询删除分支与普通分支

6a4f63d8ea 新增：最新提交列表接口

d0bc8e4378 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop

447429a663 新增：创建项目auto_init参数

8760a8234f 更改：获取专区文章使用简要信息接口

6e41605cbc fixed 删除文件失败，参数sha不匹配提示

5aab575b36 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

59e8ce206f merge from develop

f35dddbbf7 fix

8eefb8ca07 新增：流水线接口代码

5e1c1d8c87 Merge branch 'develop' into standalone_develop

d2b6f4189a Merge pull request '新版gitea升级同步更改' (#265 ) from feature_gitea_upgrade into develop

2d9b97ee78 新增：分页参数

1894f00a2d Merge branch 'develop' into standalone_develop

dd96e1e2da 修复：流水线文件不存在报错

404abe3b2a Merge branch 'develop' into standalone_develop

0e31daf9a8 修复：恢复auto_init

d95fefe589 Merge branch 'develop' into standalone_develop

847e501dee 新增：开启流水线模块接口

0f546bc316 Merge branch 'develop' into standalone_develop

69754d5c11 更改：时间取值

f422350895 Merge branch 'develop' into standalone_develop

a8997ae160 更改：时间取值

a7b6dbc1a0 Merge branch 'develop' into standalone_develop

48c5aa732f 更改：时间取值

c6152aaca8 Merge branch 'develop' into standalone_develop

1e70d93a83 重新计算组织成员数量

780ba6c103 重新计算组织成员数量

f3f63e3dd3 新增：里程碑提醒配置化

597d77ba85 Merge branch 'develop' into standalone_develop

370a565a7c 新增：readme href匹配

ea29f4c673 Merge branch 'develop' into standalone_develop

7d769ad118 更改：readme href替换

28dfce0247 Merge branch 'develop' into standalone_develop

c1fbea8453 修复：删除特殊符号分支、标签失败

b051213278 Merge branch 'develop' into standalone_develop

a0f1679f03 新增：合并请求合并接口冲突文件提示

62ff6dd1d7 Merge branch 'develop' into standalone_develop

c88d0c2712 新增：最近提交列表返回距离现在时间

531611c9df Merge branch 'develop' into standalone_develop

444c57c237 更改：marked.min.js文件替换

fd6f904f7e 新增：最近提交列表message搜索

721116467b Merge branch 'develop' into standalone_develop

b8b5828a7c 更改：更新项目private参数默认为项目is_public的值

d78bd895d1 Merge branch 'develop' into standalone_develop

e891d52c32 新增：acge 第三方登录回调地址

7bdab0bc53 更改：binduser type类型新增acge

d6acce86a7 更改：marked.min.js文件替换

bf7289032a 更改：private传值问题

6e2816af75 新增：同步acge用户并同时创建平台账号

c999d37f7e 新增：同步acge用户记录在册

68348f1fc3 更改：csv写入模式

b91358a7fe 新增：查询用户需传type值

cb125dc85f Merge branch 'develop' into standalone_develop

51266553f8 Merge branch 'standalone_develop' into pre_trustie_server

f4ddc45d6b Merge pull request '20240326版本' (#343 ) from Trustie/forgeplus:pre_trustie_server into develop

xxq250 merged commit 35cc2cb735 into master

2024-03-26 15:18:26 +08:00

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