Commit Graph

130 Commits

Author SHA1 Message Date
xxq250 5ad338d9c5 创新大赛-基础能力提升赛打榜,测试3分钟 2025-08-22 11:23:01 +08:00
xxq250 92c2f8e04a 创新大赛-基础能力提升赛打榜 2025-08-22 10:30:01 +08:00
xxq250 f1f307e1d0 创新大赛-基础能力提升赛打榜 2025-08-22 09:59:15 +08:00
xxq250 1baea3f5b4 add 在线用户记录 2025-07-18 14:24:18 +08:00
yystopf a7ea0436e4 Merge branch 'standalone_develop' into dev_osredm_server 2025-06-24 16:56:29 +08:00
呱呱呱 a2ab42f392 update 2025-06-07 16:42:38 +08:00
呱呱呱 3e859e4469 fix sonar exec error 2025-06-07 16:27:06 +08:00
呱呱呱 8fa20c7f6b java sonar 2025-06-07 16:00:14 +08:00
呱呱呱 fa26098426 update sonar 2025-06-07 14:27:20 +08:00
呱呱呱 ef06a808a9 fix sonar 2025-06-07 11:54:45 +08:00
呱呱呱 4eaf5aada2 update sonar 2025-06-07 11:12:48 +08:00
呱呱呱 1a755048bb update 2025-06-07 10:32:02 +08:00
呱呱呱 b6401930e9 sonar 2025-06-05 17:24:12 +08:00
呱呱呱 843d109b36 fix sonar bug 2025-06-04 09:26:28 +08:00
呱呱呱 1acac5d39a change sonar content 2025-06-04 09:18:26 +08:00
xxq250 0664ad6995 fixed topic 扩展无限增加类型 2025-05-16 17:21:37 +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
xxq250 513cf10a09 fixed 竞赛增加字段,打分限制,导出保密文件,搜索队长信息 2024-11-07 10:58:35 +08:00
xxq250 45f597ab47 fixed ci4s oauth2接入 log 2024-10-23 11:41:58 +08:00
xxq250 d038f30994 fixed ci4s oauth2接入 2024-10-23 11:19:02 +08:00
xxq250 c0da80139a fixed ci4s oauth2接入 2024-10-23 11:13:26 +08:00
xxq250 dd3c14e50e fixed ci4s oauth2接入 2024-10-23 11:11:14 +08:00
xxq250 f922625e21 fixed 竞赛打榜 2024-07-25 14:30:33 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
xxq250 81e916889e 克隆地址不需要限制ip 2024-03-28 09:45:10 +08:00
呱呱呱 9d5c5acfbf getway lib 2023-09-27 14:12:03 +08:00
xxq250 bc76324290 fixed 项目标识校验规则 2023-05-08 15:36:19 +08:00
yystopf ddf829eb8e Merge branch 'develop' into standalone_develop 2023-04-13 11:12:35 +08:00
yystopf 64f34cc868 更改:项目标识提示语 2023-04-13 11:12:27 +08:00
yystopf f89a585616 Merge branch 'develop' into standalone_develop 2023-04-13 11:07:07 +08:00
yystopf e7598642fd 更改:项目标识不能以.结尾 2023-04-13 11:06:58 +08:00
yystopf af964ee154 Merge branch 'develop' into standalone_develop 2023-04-06 16:47:36 +08:00
yystopf 63196e018a 更改:创建项目标识正则规则以及带.仓库无法正常显示的问题 2023-04-06 16:47:23 +08:00
yystopf 90773483b8 修复:配置文件缺失 2023-03-10 14:48:53 +08:00
xxq250 1fc79535ad fixed 错误对象 2022-12-02 15:17:57 +08:00
“xxq250” dbafeb5cee fixed 第三方Gitlink登录 2022-10-21 17:02:18 +08:00
“xxq250” 5ce3b4cea4 fixed 第三方登录 2022-10-21 16:09:17 +08:00
“xxq250” 803c468a80 增加gitlink授权登录service 2022-10-10 14:46:30 +08:00
“xxq250” 46c57186b4 增加gitlink授权登录service 2022-10-10 14:40:21 +08:00
“xxq250” 2e116548db 增加gitlink授权登录 2022-10-10 14:33:15 +08:00
“xxq250” 65b12bb93a 注册增加领域配置 2022-10-10 13:56:15 +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 e8b8dc682a fix: import user login length required 2022-08-18 16:42:03 +08:00
“xxq250” bcea5bc669 fixed 邮箱验证正则优化 2022-07-26 17:11:46 +08:00
“xxq250” df5efa0dc6 fixed 邮箱验证正则优化 2022-07-26 17:08:05 +08:00
xiaoxiaoqiong 73b5c0f63f fixed 打分次数可配置 2022-07-08 15:22:07 +08:00
xiaoxiaoqiong 5ab66e0c40 fixed 提交作品次数1 2022-07-01 16:53:44 +08:00
xiaoxiaoqiong b1b7b6a1e0 fixed 提交作品次数 2022-07-01 15:41:47 +08:00
xiaoxiaoqiong 16f2aecb6d fixed 提交作品次数 2022-07-01 15:31:33 +08:00
yystopf fb2e2d9534 merge from develop 2022-06-24 14:18:53 +08:00