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

219 Commits

Author SHA1 Message Date
yystopf 0411f8e468 Merge branch 'standalone_develop' into dev_osredm_server 2025-09-26 14:33:34 +08:00
yystopf 02e836d730 fix: 去除name流水线验证 2025-09-26 14:33:16 +08:00
yystopf dd6dd02d9a Merge branch 'standalone_develop' into dev_osredm_server 2025-09-24 16:04:31 +08:00
yystopf 22dedcc5ff fix：移除on验证 2025-09-24 16:04:03 +08:00
yystopf 7c9b5d689e Merge branch 'standalone_develop' into dev_osredm_server 2025-09-19 14:13:04 +08:00
yystopf 11b2ca48cf 新增：action文件验证器 2025-09-19 11:41:59 +08:00
xxq250 1baea3f5b4 add 在线用户记录 2025-07-18 14:24:18 +08:00
xxq250 9d8600eb1c add 在线用户记录 2025-07-18 11:52:24 +08:00
yystopf f304b9d890 Merge remote-tracking branch 'origin/standalone_develop' into dev_osredm_server 2025-05-28 09:28:02 +08:00
xxq250 5c916bc4e8 fixed settings 去掉多余配置 2025-05-09 09:38:57 +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 ccb9b5f881 修复: pr查询缩小范围 2024-11-18 16:03:31 +08:00
yystopf e8112212bb 新增：commit message关联issue操作状态 2024-10-18 16:32:21 +08:00
xxq250 2148d5a0ce fixed 检测用户不存在时清除cookie log 2024-09-24 17:17:03 +08:00
xxq250 30ec8ef1ce fixed 检测用户不存在时清除cookie 2024-09-24 17:13:01 +08:00
xxq250 5c3a988336 fixed 检测用户不存在时清除cookie 2024-09-24 17:10:45 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
xxq250 fce38e3fb7 register入口 2023-06-13 17:01:05 +08:00
yystopf b9998ecf4b 修复：提示使用tip_exception 2023-04-04 16:13:31 +08:00
yystopf 1e75c8c079 修复：自动更改项目语言触发回调 2023-03-28 14:22:39 +08:00
yystopf 3a14aa10ce Merge branch 'develop' into standalone_develop 2023-02-10 13:44:43 +08:00
yystopf bef1350933 新增：load_project新增repository 2023-02-03 18:20:00 +08:00
yystopf ccec8e9819 Merge branch 'develop' into dev_jk_server 2022-12-12 16:17:22 +08:00
xxq250 6b846b10bb fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:51:54 +08:00
xxq250 feb8c66e4b Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/controllers/concerns/register_helper.rb
#	app/controllers/oauth/base_controller.rb
 2022-12-01 17:48:11 +08:00
xxq250 763d7b499e fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:22:22 +08:00
“xxq250” 5ce3b4cea4 fixed 第三方登录 2022-10-21 16:09:17 +08:00
yystopf 89f57fa4fc fix: merge from develop 2022-10-10 19:10:55 +08:00
viletyy 3d475fdedd Merge branch 'develop' into standalone_develop 2022-09-29 13:59:04 +08:00
yystopf 2cde13eabb 新增：接口测试以及功能测试 2022-09-29 12:05:57 +08:00
yystopf 649d9c4ea6 新增：更改邮箱控制器方法 2022-09-28 16:09:10 +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
“xxq250” ae0efc1115 Merge remote-tracking branch 'origin/develop' into develop 2022-09-26 10:38:32 +08:00
“xxq250” dfc2edd62d fixed注册gitea错误信息 2022-09-26 10:38:28 +08:00
yystopf b7193aa768 Merge branch 'develop' into standalone_develop 2022-09-21 10:06:39 +08:00
yystopf 70f1e6827f 更改：项目已设置语言，则不重新设置语言 2022-09-21 10:06:29 +08:00
yystopf b4e0cc6dc1 Merge branch 'develop' into standalone_develop 2022-09-21 09:55:05 +08:00
yystopf ff881732d2 更改：项目已设置语言，则不重新设置语言 2022-09-21 09:54:49 +08:00
“xxq250” 63c40a2025 fixed 返回状态码 2022-09-08 14:22:22 +08:00
yystopf b06e29260a 修复: return error status默认为-1 2022-08-01 14:28:44 +08:00
“xxq250” 809cce9085 fixed 组织语言 2022-07-28 14:38:03 +08:00
“xxq250” 6f9db6b314 Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/models/pull_request.rb
 2022-07-26 10:49:49 +08:00
yystopf 5db43bf768 新增：新合并请求列表接口 2022-07-25 16:21:03 +08:00
yystopf 63cd6bb0a4 merge from develop 2022-07-15 14:04:02 +08:00
yystopf 24d83133e7 新增: 创建分支接口 2022-07-15 14:02:48 +08:00
yystopf f8b63ff02e merge from develop 2022-07-07 13:47:47 +08:00
yystopf 3b62f09669 新增: 项目语言匹配并设置 2022-07-07 10:05:12 +08:00
xiaoxiaoqiong 8781720f31 fixed 同步gitea密码状态is_sync_pwd更新 2022-07-06 15:27:20 +08:00
xiaoxiaoqiong 484c91a581 fixed 同步gitea密码状态is_sync_pwd更新 2022-07-06 15:26:49 +08:00
xiaoxiaoqiong aabb7518c0 fixed 同步gitea密码状态is_sync_pwd 2022-07-06 14:50:28 +08:00