Commit Graph

400 Commits

Author SHA1 Message Date
呱呱呱 6c4fc339db add code_check 2025-11-12 17:33:01 +08:00
xxq250 b209ee1250 add 用户增加显示token和携带token请求api 2025-10-31 16:05:00 +08:00
yystopf 6d112ffdf5 修复:模型冲突 2025-10-22 09:11:54 +08:00
yystopf 343e488903 新增:投票功能接口 2025-10-22 08:59:51 +08:00
KingChan d5905e1a50 Merge pull request '增加sca集成' (#408) from KingChan/forgeplus:sca_service into dev_osredm_server 2025-09-09 15:26:28 +08:00
呱呱呱 3492689d9b sca 2025-09-04 17:39:58 +08:00
yystopf ebf1c1d31b Merge branch 'standalone_develop' into dev_osredm_server 2025-09-04 11:32:49 +08:00
yystopf 754ed99959 新增:项目行为构建方法 2025-08-27 15:07:04 +08:00
yystopf 691620c874 Merge branch 'standalone_develop' into dev_osredm_server 2025-07-22 10:42:32 +08:00
xxq250 cf6dc3a9b4 fixed projects gpid 增加索引 2025-06-27 14:39:28 +08:00
yystopf c49a73f6b5 新增:项目访客记录 2025-06-10 15:24:43 +08:00
xxq250 a9782a0ce3 fixed 竞赛增加配置 2025-06-05 15:58:50 +08:00
xxq250 5c6054a72b fixed 竞赛增加配置 2025-06-05 15:52:53 +08:00
yystopf f304b9d890 Merge remote-tracking branch 'origin/standalone_develop' into dev_osredm_server 2025-05-28 09:28:02 +08:00
xxq250 870eacaced fixed issue增加企业标识 2025-05-21 09:33:00 +08:00
yystopf efa9572fee Merge branch 'dev_osredm_server' of https://gitlink.org.cn/Trustie/forgeplus into dev_osredm_server 2025-05-19 10:51:04 +08:00
yystopf f750d14c85 新增:uuid或者url字段 2025-05-19 10:50:54 +08:00
xxq250 79863995d6 fixed issue状态已解决增加信息记录 2025-05-15 14:06:22 +08:00
xxq250 06afe5083c fixed 导入挑战杯用户接口和数据调整 2025-05-13 15:23:35 +08:00
xxq250 28f420ec22 fixed 导入挑战杯用户 2025-05-13 14:18:23 +08:00
yystopf 211cd28ca1 新增:招聘信息后台管理 2025-05-08 15:51:41 +08:00
xxq250 c59a92f00f fixed add users phone index 2025-05-07 08:45:35 +08:00
xxq250 558bcfeefa fixed add users phone index 2025-05-07 08:45:04 +08:00
yystopf 36965e3a52 新增:技术探讨模块后台管理 2025-05-06 10:00:18 +08:00
yystopf e5899a5351 新增:后台管理首页创客/竞赛管理 2025-04-29 17:04:06 +08:00
xxq250 9a752f36a7 fixed 竞赛通知增加字段 2025-04-16 14:08:26 +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 ec13987023 流水线pipeline_type 2025-03-19 12:04:56 +08:00
xxq250 af04527ddb fixed 新版竞赛增加专家评审 2025-02-27 16:04:39 +08:00
xxq250 a1d8e4fa40 流水线节点增加参数默认值 2025-02-18 09:05:56 +08:00
yystopf 34ab6fd25f 新增: competition_users计数字段 2025-01-02 15:54:49 +08:00
yystopf 068d35c977 新增: 竞赛新增简介与主办单位字段 2025-01-02 15:20:24 +08:00
xxq250 117e268306 fixed 节点数据提取后保存数据db 2024-12-17 15:05:51 +08:00
xxq250 1901aca44c fixed action类型修改为node_type 2024-12-03 11:27:52 +08:00
xxq250 0ca548f3a6 fixed action节点增加类型和链接控制 2024-12-03 11:13:54 +08:00
xxq250 513cf10a09 fixed 竞赛增加字段,打分限制,导出保密文件,搜索队长信息 2024-11-07 10:58:35 +08:00
xxq250 86df55d43b fixed 竞赛增加字段 2024-11-06 15:52:28 +08:00
xxq250 8de46699a4 fixed 竞赛增加字段 2024-11-06 15:51:38 +08:00
xxq250 d134e9cd9c fixed 竞赛作品增加打分接口和字段 2024-11-06 15:42:23 +08:00
xxq250 b03c1bb7a2 fixed UserAction in_threads=1 2024-10-28 08:58:14 +08:00
yystopf 151e028d34 新增:记录journal来源 2024-10-21 10:45:30 +08:00
xxq250 29ee61ab1b 操作记录后台查询菜单 2024-09-27 09:55:53 +08:00
xxq250 47f8ce478c 操作记录后台查询 2024-09-27 09:35:40 +08:00
xxq250 6ecf46e88d fixed issue增加pm相关查询索引 2024-09-20 17:20:44 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf f079a812b1 add: pm_links index options 2024-09-14 09:38:32 +08:00
yystopf eaeb65443e Merge branch 'standalone_develop' into pm_project_develop 2024-09-12 09:21:10 +08:00
yystopf fb572af48f 新增:导出工作项关联工作项记录 2024-08-27 13:42:02 +08:00
yystopf e14e67c92a 新增:许可证排序字段 2024-08-09 22:17:40 +08:00
yystopf bd9ca0439c 新增:许可证排序字段 2024-08-09 11:22:45 +08:00