 xxq250
|
d5b2acfe63
|
Merge pull request '20231011版本' (#341) from Trustie/forgeplus:dev_local_v1 into dev_local_v1
|
2023-10-11 16:09:24 +08:00 |
|
xxq250
|
29ea3dda26
|
merge dev_local
|
2023-10-11 16:06:27 +08:00 |
|
xxq250
|
111b91584d
|
Merge branch 'standalone_develop' into dev_local_v1
# Conflicts:
# app/controllers/projects_controller.rb
# app/jobs/migrate_remote_repository_job.rb
# public/assets/.sprockets-manifest-dd73942813e820b803d35c9915c0bb25.json
# public/assets/admin-5a48f49881bac9e22c837c20db22ea3b51b424751ddb12208a3b422b752e60fd.js
# public/assets/admin-5a48f49881bac9e22c837c20db22ea3b51b424751ddb12208a3b422b752e60fd.js.gz
# public/assets/admin-a7edfa013f5e822c43ac1a1f813c1929ff7aa9e12cd1313f9e1b7292fa406470.css.gz
|
2023-10-11 15:57:09 +08:00 |
|
xxq250
|
5a28204b12
|
fixed 文件增加是否文本判断，可显示多种文本文件
|
2023-10-10 14:17:08 +08:00 |
KingChan
|
0357f963ff
|
Merge pull request '新增admins后端删除 用户，组织，项目的日志记录' (#157) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-10-10 13:52:07 +08:00 |
呱呱呱
|
6cb7af0401
|
add data_bank to user action
|
2023-10-10 13:49:52 +08:00 |
|
KingChan
|
b1736e7aaa
|
Merge pull request '修复：用#引用issue时，输入对应issue的编号无法查询到该issue' (#156) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-10-08 09:56:34 +08:00 |
|
呱呱呱
|
b92fdb8388
|
修复输入issue编号无法查询到该issue问题
|
2023-10-08 09:54:26 +08:00 |
|
xxq250
|
3ccac9192d
|
fixed 组织pr识别
|
2023-10-07 21:15:20 +08:00 |
|
KingChan
|
b4723a0488
|
Merge pull request '新增Pr检测的用户范围判定' (#155) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-10-07 17:31:14 +08:00 |
|
呱呱呱
|
f9f99fea7e
|
fix bug
|
2023-10-07 17:29:26 +08:00 |
|
KingChan
|
cf2625b12c
|
Merge pull request '回滚代码' (#152) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-28 09:27:31 +08:00 |
|
呱呱呱
|
cef99e90b3
|
Revert "add issue search project_issues_index"
This reverts commit b7d6be8b9f.
|
2023-09-28 09:25:51 +08:00 |
|
KingChan
|
f655a7b469
|
Merge pull request '新增 issue project_issues_index搜索' (#151) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-27 17:01:53 +08:00 |
|
呱呱呱
|
b7d6be8b9f
|
add issue search project_issues_index
|
2023-09-27 16:59:33 +08:00 |
|
KingChan
|
3cfcd1a671
|
Merge pull request 'top新增from' (#150) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-27 15:56:53 +08:00 |
|
呱呱呱
|
e1808e0689
|
add topic from
|
2023-09-27 15:53:56 +08:00 |
|
KingChan
|
f4d6bfc210
|
Merge pull request 'topic data' (#149) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-27 15:12:34 +08:00 |
|
呱呱呱
|
5592855996
|
fix topic data
|
2023-09-27 15:11:09 +08:00 |
|
KingChan
|
d663e6b2bc
|
Merge pull request 'fix' (#148) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-27 14:17:34 +08:00 |
|
KingChan
|
0be711e6f0
|
Merge pull request 'getway对接' (#147) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-27 14:16:20 +08:00 |
|
呱呱呱
|
272b73fa0a
|
update
|
2023-09-27 14:16:13 +08:00 |
|
呱呱呱
|
9d5c5acfbf
|
getway lib
|
2023-09-27 14:12:03 +08:00 |
|
KingChan
|
73391911d8
|
Merge pull request '增加导航条index的输入限制' (#146) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-27 10:30:11 +08:00 |
|
呱呱呱
|
b080b8fca5
|
增加导航条index的输入限制
|
2023-09-27 10:28:33 +08:00 |
|
KingChan
|
915481468f
|
Merge pull request '调整导航条排序' (#145) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-27 09:45:11 +08:00 |
|
呱呱呱
|
19c8587723
|
add setting navbar index for new
|
2023-09-27 09:43:35 +08:00 |
|
KingChan
|
206b8d25cb
|
Merge pull request '新增设置navbar index' (#144) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-27 09:31:27 +08:00 |
|
呱呱呱
|
3367d748b6
|
add setting navbar index
|
2023-09-27 09:29:50 +08:00 |
|
KingChan
|
29b6c1a4d2
|
Merge pull request '调整glcc pj检测和setting接口新增个人建站域名返回' (#143) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-26 14:48:54 +08:00 |
|
呱呱呱
|
412ac22998
|
check_pr_url add trustie
|
2023-09-26 14:46:50 +08:00 |
|
呱呱呱
|
0e7ccdf58f
|
setting add site_page_deploy_domain
|
2023-09-26 14:42:58 +08:00 |
|
KingChan
|
9e650c5f59
|
Merge pull request '调整glcc白名单逻辑' (#142) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-26 10:05:24 +08:00 |
|
呱呱呱
|
fab25436a0
|
调整glcc 白名单处理逻辑
|
2023-09-26 10:03:01 +08:00 |
|
KingChan
|
4d1be6134c
|
Merge pull request '返回逻辑调整' (#141) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-25 13:02:44 +08:00 |
chenjing
|
7664e2e4d3
|
update response for checkkeyword
|
2023-09-25 13:01:13 +08:00 |
|
KingChan
|
35ca53c202
|
Merge pull request '根据前端要求调整检测敏感词接口返回内容' (#140) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-25 12:51:32 +08:00 |
|
chenjing
|
6bd1eef14a
|
update check keyword response
|
2023-09-25 12:49:14 +08:00 |
|
KingChan
|
eccdc572c4
|
Merge pull request '调整关键词判定，去掉emoj干扰' (#139) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-25 11:42:02 +08:00 |
|
chenjing
|
8d7c114b40
|
update check keywords
|
2023-09-25 11:40:11 +08:00 |
|
KingChan
|
7b3dbfd9ab
|
Merge pull request '关键词检测接口' (#138) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-25 11:31:33 +08:00 |
|
chenjing
|
892aa31ea9
|
check keywords
|
2023-09-25 11:29:44 +08:00 |
|
xxq250
|
13ebcca249
|
整理sql
|
2023-09-06 16:05:12 +08:00 |
|
xxq250
|
a37191350d
|
fixed 表检测
|
2023-09-06 11:27:46 +08:00 |
|
xxq250
|
b7cea34760
|
utf8mb4
|
2023-09-06 11:17:09 +08:00 |
|
xxq250
|
7844f65466
|
ssl_mode取消
|
2023-09-06 11:16:48 +08:00 |
|
KingChan
|
3235a60a34
|
Merge pull request '参数调整' (#137) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-01 14:17:26 +08:00 |
|
chenjing
|
192f48f26c
|
update enum for oage
|
2023-09-01 14:15:39 +08:00 |
|
KingChan
|
b48c65c3ff
|
Merge pull request '修复部署bug' (#136) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-01 13:37:33 +08:00 |
|
chenjing
|
bd441d024b
|
update
|
2023-09-01 13:36:07 +08:00 |