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

7997 Commits

Author SHA1 Message Date
xxq250 27332da69b Merge remote-tracking branch 'origin/dev_osredm_server' into dev_osredm_server 
# Conflicts:
#	app/services/api/v1/projects/sync_repositories/create_service.rb
 2025-10-31 15:05:07 +08:00
xxq250 a5530a4b90 fixed 同步增加gitlink同步 2025-10-31 15:04:09 +08:00
yystopf 39e7eded22 新增：gitlink双向同步 2025-10-31 09:13:01 +08:00
yystopf 96cde9f76a 新增：用户参与项目数量 2025-10-28 10:29:52 +08:00
yystopf 3357e56a84 新增：用户参与项目数量 2025-10-28 10:29:33 +08:00
yystopf d316669b7f 新增：用户参与项目数量 2025-10-28 10:27:35 +08:00
yystopf bdd9518a4c 新增：用户参与项目数量 2025-10-28 10:24:58 +08:00
xxq250 a3b98ea9ce Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2025-10-27 14:50:26 +08:00
xxq250 5cd1733a82 fixed 用户账号接口增加手机号 2025-10-27 14:50:19 +08:00
xxq250 112d78f620 Merge remote-tracking branch 'origin/dev_osredm_server' into dev_osredm_server 2025-10-27 11:40:12 +08:00
xxq250 ec7b03a4d5 fixed SQL注入处理 2025-10-27 11:40:06 +08:00
yystopf f5065fa51b Merge branch 'dev_osredm_server' of https://gitlink.org.cn/Trustie/forgeplus into dev_osredm_server 2025-10-24 15:48:26 +08:00
yystopf f859f02799 更改：小程序首页配置渲染bug 2025-10-24 15:48:06 +08:00
xxq250 220e65772d Merge remote-tracking branch 'origin/dev_osredm_server' into dev_osredm_server 2025-10-24 14:59:24 +08:00
xxq250 58605fbf96 fixed cron任务去掉挑战怀 2025-10-24 14:59:19 +08:00
yystopf 869c874e21 更改：max_choice_vote_options_count可以为nil 2025-10-22 17:16:01 +08:00
yystopf 362dd1a033 新增：投票后台管理界面 2025-10-22 17:10:05 +08:00
yystopf c50dee7b01 新增：列表是否含投票 2025-10-22 09:51:23 +08:00
yystopf c8c08e143c 修复：移除验证 2025-10-22 09:48:15 +08:00
yystopf 6d112ffdf5 修复：模型冲突 2025-10-22 09:11:54 +08:00
yystopf 343e488903 新增：投票功能接口 2025-10-22 08:59:51 +08:00
yystopf 4ceaa1785d Merge branch 'standalone_develop' into dev_osredm_server 2025-10-17 14:02:19 +08:00
yystopf 2bd58d2ad7 fix: action 数据埋点长信息移除 2025-10-17 14:01:51 +08:00
xxq250 301ff27375 fixed 截止提交作品时间过了不提示 2025-10-16 18:57:28 +08:00
xxq250 56896df081 Merge remote-tracking branch 'origin/dev_osredm_server' into dev_osredm_server 2025-10-16 18:57:08 +08:00
xxq250 25b63e4434 fixed 截止提交作品时间过了不提示 2025-10-16 18:51:36 +08:00
yystopf 07b704ec98 fix: hash to as_json 2025-10-16 16:44:01 +08:00
xxq250 63b60a0bac fixed 日志操作类型 2025-10-16 16:30:21 +08:00
xxq250 2d22bbc9d8 fixed 截止提交作品时间过了不提示 2025-10-16 15:10:50 +08:00
xxq250 4bd585cf7e fixed 代码错误 2025-10-16 14:41:42 +08:00
KingChan 4c5994051d Merge pull request 'update' (#425) from KingChan/forgeplus:sca_service into dev_osredm_server 2025-10-16 12:09:50 +08:00
呱呱呱 48222061fd update sca 2025-10-16 12:11:19 +08:00
呱呱呱 7c40149edd update sca 2025-10-16 11:52:52 +08:00
KingChan 5caa49e527 Merge pull request 'update' (#424) from KingChan/forgeplus:sca_service into dev_osredm_server 2025-10-16 11:51:35 +08:00
呱呱呱 9b450d32e8 update sca 2025-10-16 11:36:06 +08:00
KingChan e6e7aae202 Merge pull request 'update' (#423) from KingChan/forgeplus:sca_service into dev_osredm_server 2025-10-16 11:34:21 +08:00
呱呱呱 54e3070384 update sca 2025-10-16 10:25:37 +08:00
KingChan 015830dcc2 Merge pull request 'fix bug' (#422) from KingChan/forgeplus:sca_service into dev_osredm_server 2025-10-16 10:23:38 +08:00
呱呱呱 ddad50b779 update sca 2025-10-16 10:04:31 +08:00
KingChan 787fed1faa Merge pull request '修复 bug' (#421) from KingChan/forgeplus:sca_service into dev_osredm_server 2025-10-16 10:02:58 +08:00
xxq250 354b8ee8a9 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2025-10-16 09:26:38 +08:00
xxq250 f044ad705d fixed pr流水线触发事件 2025-10-16 09:26:31 +08:00
yystopf d7bb6a9f10 fixed: 自定义搜索删除 2025-10-15 15:30:57 +08:00
yystopf bd24219d56 Merge branch 'dev_osredm_server' of https://gitlink.org.cn/Trustie/forgeplus into dev_osredm_server 2025-10-15 15:28:44 +08:00
yystopf b023ad823c fixed: 使用id作为attachment的标识 2025-10-15 15:28:36 +08:00
xxq250 204acae752 fixed 竞赛日志详情 2025-10-15 15:23:01 +08:00
xxq250 c323246471 Merge remote-tracking branch 'origin/dev_osredm_server' into dev_osredm_server 
# Conflicts:
#	app/models/user_action.rb
 2025-10-15 15:22:19 +08:00
xxq250 aacd8b96b8 fixed 竞赛日志详情 2025-10-15 15:21:40 +08:00
yystopf 1cc4a960eb Merge branch 'standalone_develop' into dev_osredm_server 2025-10-15 15:20:44 +08:00
yystopf 4e48bdb34f fixed: 默认不显示自定义查询 2025-10-15 15:19:19 +08:00