Commit Graph

255 Commits

Author SHA1 Message Date
xxq250 55aff27e80 fixed mirror migrate 已在加速器查询到 source_clone_url 2025-04-28 14:32:06 +08:00
xxq250 c29df1e293 fixed migrate log 2025-04-28 11:51:07 +08:00
xxq250 b760d17988 Merge branch 'standalone_develop' into dev_osredm_server
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/admins/users_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/owners_controller.rb
#	app/helpers/application_helper.rb
#	app/helpers/avatar_helper.rb
#	app/models/edu_setting.rb
#	app/models/user.rb
#	app/models/user_action.rb
#	app/views/layouts/admin.html.erb
#	app/views/projects/index.json.jbuilder
#	config/harmonious_dictionary/chinese_dictionary.txt
#	config/harmonious_dictionary/harmonious.hash
#	config/harmonious_dictionary/harmonious_english.yml
#	config/routes/api.rb
2025-03-20 14:32:54 +08:00
yystopf b5d3f69f21 修复:时间nil处理 2024-11-07 11:44:26 +08:00
yystopf 4a12ab2d90 fix: string to number 2024-11-06 11:11:06 +08:00
yystopf 1756c73a3f 新增: 关注列表时间范围查询 2024-11-06 11:10:00 +08:00
yystopf 7d6d95c7eb 新增: 关注列表\点赞列表时间范围查询 2024-11-06 11:01:58 +08:00
yystopf 83dc605c26 修复:项目概览无法正常添加附件 2024-09-27 15:04:10 +08:00
xxq250 d5a2580ae9 项目删除记录日志 2024-09-27 14:27:36 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf eaeb65443e Merge branch 'standalone_develop' into pm_project_develop 2024-09-12 09:21:10 +08:00
yystopf 3760eab73d 修复:The target couldn't be found 2024-09-06 16:36:58 +08:00
yystopf 033c65b46f 修复:The target couldn't be found 2024-09-05 09:18:07 +08:00
xxq250 39f234cc06 fixed 个人项目列表条件增加标签名查询 2024-08-29 16:18:59 +08:00
yystopf 771798220c 新增:导入项目服务参数 2024-08-23 10:02:07 +08:00
yystopf c9df8fa3fe 新增:存储pull_request源仓库信息 2024-07-19 11:17:15 +08:00
yystopf f9e7dafefd 新增:删除fork仓库关闭对应合并请求 2024-07-19 09:46:57 +08:00
yystopf d19253624a 更改:项目语言排序方式 2024-07-11 12:03:29 +08:00
yystopf 7dda079ff3 Merge branch 'standalone_develop' into pm_project_develop 2024-07-11 10:07:20 +08:00
yystopf 1716423892 更改:项目语言排序方式 2024-07-10 08:59:06 +08:00
yystopf 4d4a98c3b7 更改:创建项目错误返回-1以及项目活跃度排行榜排名改为全局排名 2024-06-27 11:28:39 +08:00
yystopf ace64f6071 更改:移除 2024-06-06 10:04:30 +08:00
yystopf 814aa55578 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2024-06-06 10:01:47 +08:00
yystopf 0187851a04 更改:导入失败项目不显示在项目列表 2024-06-06 10:01:41 +08:00
xxq250 9de04dba7e fixed 导入失败的项目标记 project.status=0, 在列表中不显示 2024-06-06 09:45:37 +08:00
yystopf 2d113ff02a 更改:fork项目变更项目私有不参与排名 2024-06-05 17:08:53 +08:00
yystopf e8348194b7 更改:移除-1提示 2024-06-05 15:48:26 +08:00
yystopf ac815ed9a2 更改:导入项目失败不删除项目永远返回-1 2024-06-05 15:08:06 +08:00
yystopf 4d0225e0d9 更改:导入失败提示以及更改消息模板422错误 2024-06-04 16:55:06 +08:00
yystopf aa739a25b6 更改:回滚+debug 2024-06-03 17:45:34 +08:00
yystopf 626fa8a7b3 修复 2024-06-03 17:18:20 +08:00
xxq250 a05ef8d107 导入失败,请重试 2024-06-03 16:27:21 +08:00
yystopf c58ca88edd 修复:导入项目相关问题 2024-06-03 10:36:31 +08:00
xxq250 93f83c7142 Merge branch 'pm_project_develop' into dev_osredm_server
# Conflicts:
#	.gitignore
#	Gemfile.lock
#	app/controllers/application_controller.rb
#	app/controllers/organizations/projects_controller.rb
#	app/models/attachment.rb
#	app/models/issue.rb
#	app/models/token.rb
#	app/views/organizations/projects/index.json.jbuilder
#	config/application.rb
#	config/routes/api.rb
2024-05-29 17:28:58 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
xxq250 9835f4f84f Merge branch 'standalone_develop' into pm_project_develop
# Conflicts:
#	app/models/attachment.rb
#	app/views/api/v1/attachments/_simple_detail.json.jbuilder
2024-04-29 09:11:08 +08:00
yystopf 03f1c59391 修复:错误信息和code共同返回 2024-04-26 17:12:50 +08:00
xxq250 c58880a4d3 项目列表默认查询时count性能问题处理, not_category_count 2024-04-22 08:44:20 +08:00
xxq250 643fb163d9 项目列表默认查询时count性能问题处理 2024-04-19 17:21:01 +08:00
yystopf ad9345badb 更改:项目列表total_count 2024-04-12 16:26:33 +08:00
yystopf ce0f70c836 修复:找不到type 2024-04-08 08:48:07 +08:00
yystopf 8e846b5884 新增:项目访问埋点及查看 2024-04-07 17:28:24 +08:00
yystopf 0a13387c1c 新增:项目数据集模型 2024-04-01 15:24:34 +08:00
yystopf bf7289032a 更改:private传值问题 2024-03-21 11:25:05 +08:00
yystopf d78bd895d1 Merge branch 'develop' into standalone_develop 2024-03-20 10:48:21 +08:00
yystopf b8b5828a7c 更改:更新项目private参数默认为项目is_public的值 2024-03-20 10:47:36 +08:00
xxq250 41e9f00138 Merge branch 'standalone_develop' into pm_project_develop 2024-03-11 09:23:22 +08:00
yystopf 0f546bc316 Merge branch 'develop' into standalone_develop 2024-03-07 11:19:53 +08:00
yystopf 847e501dee 新增:开启流水线模块接口 2024-03-07 11:18:39 +08:00
yystopf c7bdaa8962 Merge branch 'standalone_develop' into pm_project_develop 2024-03-06 16:44:45 +08:00