KingChan
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,997 Commits 67 Branches 0 Tags 728 MiB
Commit Graph

116 Commits

Author SHA1 Message Date
yystopf ebf1c1d31b Merge branch 'standalone_develop' into dev_osredm_server 2025-09-04 11:32:49 +08:00
yystopf 6a8ef3ac3b 新增：触发项目行为构建 2025-08-27 16:04:08 +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 ef18ea8cdc 更改: 转移项目精选项目清除 2025-02-13 14:00:00 +08:00
yystopf 8264bb8107 修复：split nil错误 2024-09-19 16:52:46 +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 973e18812c 新增：gitlink、gitea、gitcode的token校验以及请求超时时间的更改 2024-09-04 14:33:47 +08:00
yystopf 771798220c 新增：导入项目服务参数 2024-08-23 10:02:07 +08:00
yystopf c9df8fa3fe 新增：存储pull_request源仓库信息 2024-07-19 11:17:15 +08:00
kingChan 290f5cc161 update TransferService update actions 2024-06-27 15:01:48 +08:00
kingChan 499473c296 add TransferService update actions 2024-06-27 14:43:13 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
xxq250 81b8255a54 fork报错日志跟踪 2024-05-08 17:15:04 +08:00
yystopf 03f1c59391 修复：错误信息和code共同返回 2024-04-26 17:12:50 +08:00
yystopf d95fefe589 Merge branch 'develop' into standalone_develop 2024-03-06 16:28:47 +08:00
yystopf 0e31daf9a8 修复：恢复auto_init 2024-03-06 16:27:43 +08:00
yystopf 59e8ce206f merge from develop 2024-03-01 16:58:29 +08:00
yystopf 447429a663 新增：创建项目auto_init参数 2024-01-31 16:47:00 +08:00
xxq250 482578ced7 转移仓库时取消提示新拥有者资料不完善 2023-09-18 10:40:38 +08:00
呱呱呱 7eb9f0ce2e 重置回正式服fork功能 2023-07-24 09:29:29 +08:00
chenjing 1533e5e737 add fork to orgs 2023-07-04 16:45:06 +08:00
chenjing 1b09c93b5e change verify token response 2023-06-20 15:50:11 +08:00
chenjing 65816a980b cla fix and add token verify 2023-06-20 15:27:03 +08:00
xxqfamous 8f51955bd7 支持用户fork自己的仓库 2023-06-07 10:54:36 +08:00
chenjing e90c79486a add github token for mirror 2023-06-06 10:18:32 +08:00
yystopf 96c32c072a Merge branch 'develop' into standalone_develop 2023-03-30 14:27:55 +08:00
yystopf 718457888d 更新：client调用以及gitea_client日志文件设置 2023-03-14 17:34:58 +08:00
xxq250 b1c10d66f9 区块链确权相关 2023-03-02 13:49:50 +08:00
yystopf ce70378fc3 Merge branch 'develop' into standalone_develop 2023-03-01 16:29:45 +08:00
yystopf 02526878fe 修复：更新无法设置空值 2023-02-20 18:22:14 +08:00
xxq250 2668630f2a 项目fored_count更新时updated_on同时更新 2023-02-01 17:23:48 +08:00
yystopf ccec8e9819 Merge branch 'develop' into dev_jk_server 2022-12-12 16:17:22 +08:00
yystopf 9f74651a2b Merge branch 'develop' into standalone_develop 2022-11-15 14:42:07 +08:00
yystopf 64c6f69f56 新增：统计项目分类下私有项目的数量 2022-11-15 14:25:35 +08:00
viletyy eac812a7bf merge from develop 2022-11-04 11:24:25 +08:00
“xxq250” 2bd723fc64 fixed 项目搜索先es search服务容错 2022-11-01 17:37:25 +08:00
“xxq250” 63ea4808c9 fixed 项目搜索先es search 中文 2022-11-01 17:30:01 +08:00
“xxq250” c7a6d78c15 fixed 项目搜索先es search 2022-11-01 17:27:31 +08:00
“xxq250” 3ff3502bbc fixed 项目搜索先es search 2022-11-01 17:25:28 +08:00
yystopf e15809c186 修复：无法正常转移的问题 2022-10-27 10:48:24 +08:00
yystopf 7d4c0df691 修复 2022-10-27 09:55:55 +08:00
yystopf e72dfa4973 修复：项目迁移设置权限在更改拥有者之后 2022-10-27 09:28:52 +08:00
yystopf 8b14ee3c72 修复：更改组织下项目权限同时更改组织下权限同步至gitea 2022-10-26 14:49:40 +08:00
“xxq250” cb302b50dd Merge branch 'develop' into dev_jk_server 
# Conflicts:
#	app/assets/javascripts/admin.js
#	app/controllers/accounts_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/attachments_controller.rb
#	app/controllers/concerns/login_helper.rb
#	app/controllers/concerns/register_helper.rb
#	app/controllers/concerns/render_helper.rb
#	app/controllers/concerns/repository/languages_percentagable.rb
#	app/controllers/repositories_controller.rb
#	app/controllers/users/is_pinned_projects_controller.rb
#	app/controllers/users_controller.rb
#	app/docs/slate/source/api.html.md
#	app/docs/slate/source/includes/_projects.md
#	app/docs/slate/source/includes/_pulls.md
#	app/docs/slate/source/includes/_repositories.md
#	app/docs/slate/source/includes/_teams.md
#	app/docs/slate/source/includes/_users.md
#	app/helpers/application_helper.rb
#	app/imports/admins/new_import_user_from_excel.rb
#	app/libs/custom_regexp.rb
#	app/models/journal.rb
#	app/models/project.rb
#	app/models/user.rb
#	app/queries/admins/user_query.rb
#	app/services/admins/import_user_from_excel_service.rb
#	app/views/admins/users/index.html.erb
#	app/views/members/index.json.jbuilder
#	app/views/settings/show.json.jbuilder
#	config/routes.rb
#	public/导入用户模板.xlsx
 2022-09-27 15:32:46 +08:00
yystopf 3c2c742121 修复: 项目邀请链接生成多次返回提示 2022-06-21 11:37:41 +08:00
yystopf 9221e55752 修复: 邀请链接跳转用户已加入仓库的提示以及项目申请记录只创建一条 2022-06-21 11:18:14 +08:00
yystopf f6fb50529c 新增: 邀请项目链接接口文档 2022-06-17 14:06:59 +08:00
yystopf c42f3d5928 新增：邀请用户链接生成 2022-06-17 14:06:59 +08:00
yystopf aa18fe0ad4 修复: 转移项目时新接受者需要移除原来的权限角色 2022-05-24 11:44:05 +08:00