 yystopf
|
93ab86e363
|
Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop
|
2023-12-20 09:52:02 +08:00 |
|
yystopf
|
3f621bd5b5
|
更改：项目活跃度排行默认统计一周内的数据
|
2023-12-20 09:51:51 +08:00 |
|
yystopf
|
ae8b86ef02
|
更改：后台管理模块文案
|
2023-12-20 09:43:57 +08:00 |
KingChan
|
1195a7a339
|
Merge pull request '调整建站服务功能' (#240) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-12-20 09:38:40 +08:00 |
呱呱呱
|
d590e1165e
|
website update
|
2023-12-20 09:22:10 +08:00 |
|
yystopf
|
6b8749589e
|
更改：文案为截止日期
|
2023-12-19 15:45:35 +08:00 |
|
yystopf
|
883542dfe8
|
Merge pull request '项目名称显示不全' (#239) from gitlink_admin_feature into standalone_develop
|
2023-12-19 15:39:48 +08:00 |
|
yystopf
|
3b5b78faed
|
更改：删除数据处理以及昵称获取规则处理
|
2023-12-19 15:36:57 +08:00 |
|
yystopf
|
1d48af015e
|
Merge pull request '后台管理更新' (#238) from gitlink_admin_feature into standalone_develop
|
2023-12-19 15:26:05 +08:00 |
|
yystopf
|
26461f3a44
|
更改：防止sql注入
|
2023-12-19 15:05:00 +08:00 |
|
yystopf
|
21f559f254
|
更改：项目排行榜使用数据存储以及数据导出的功能
|
2023-12-19 14:57:54 +08:00 |
|
yystopf
|
016a2f8cf5
|
更改：后台管理sidebar
|
2023-12-18 16:04:14 +08:00 |
|
yystopf
|
75fff13550
|
更改：项目排行榜查询丰富
|
2023-12-18 15:49:41 +08:00 |
 xxq250
|
d4b46dbf97
|
Merge branch 'standalone_develop' into pre_trustie_server
# Conflicts:
# app/controllers/api/v1/issues_controller.rb
# app/models/identity_verification.rb
# app/models/issue.rb
# app/models/journal.rb
# app/services/api/v1/issues/list_service.rb
|
2023-12-15 10:40:58 +08:00 |
|
yystopf
|
d98ad8a3f4
|
Merge branch 'develop' into standalone_develop
|
2023-12-15 09:42:30 +08:00 |
|
yystopf
|
ad96991730
|
更改：提示语逗号为中文逗号
|
2023-12-15 09:01:11 +08:00 |
|
xxq250
|
4b57e96914
|
fixed 用户搜索按昵称和登录时间倒排序
|
2023-12-14 16:49:44 +08:00 |
|
yystopf
|
e78f7ab9dd
|
Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop
|
2023-12-14 16:45:49 +08:00 |
|
xxq250
|
835f2db759
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2023-12-14 16:45:36 +08:00 |
|
yystopf
|
ac601b4b22
|
Merge branch 'develop' into standalone_develop
|
2023-12-14 16:45:32 +08:00 |
|
xxq250
|
c972d538ee
|
fixed 用户搜索按昵称和登录时间倒排序
|
2023-12-14 16:45:29 +08:00 |
|
yystopf
|
c75953d343
|
新增：创建分支已存在分支提示
|
2023-12-14 16:45:02 +08:00 |
|
yystopf
|
a2ca6bd91b
|
Merge branch 'develop' into standalone_develop
|
2023-12-14 11:47:48 +08:00 |
|
yystopf
|
129970a525
|
更改：提示语
|
2023-12-14 11:47:32 +08:00 |
|
yystopf
|
8be254710e
|
Merge branch 'develop' into standalone_develop
|
2023-12-14 11:44:18 +08:00 |
|
yystopf
|
062e654d45
|
新增：更改密码须验证两次密码
|
2023-12-14 11:43:42 +08:00 |
|
xxq250
|
b29e500645
|
fixed 解决安全问题访问附件，id改为uuid,id查询修改
|
2023-12-13 09:26:49 +08:00 |
|
xxq250
|
60c8b25075
|
fixed 解决安全问题访问附件，id改为uuid,查看附件
|
2023-12-12 16:57:39 +08:00 |
|
xxq250
|
247c5a60b1
|
fixed 解决安全问题访问附件，id改为uuid，关联pages功能修改
|
2023-12-12 16:47:48 +08:00 |
|
xxq250
|
de1266ba6c
|
fixed 解决安全问题访问附件，id改为uuid，关联功能修改
|
2023-12-12 16:41:02 +08:00 |
|
xxq250
|
9a0809e45b
|
fixed 发行版附件关联
|
2023-12-12 15:33:48 +08:00 |
|
yystopf
|
a423576ffc
|
Merge branch 'develop' into standalone_develop
|
2023-12-12 15:03:47 +08:00 |
|
yystopf
|
852d430178
|
更改：获取标签详情特殊符号处理
|
2023-12-12 15:02:03 +08:00 |
|
xxq250
|
d74901cffa
|
fixed 解决安全问题访问附件，id改为uuid
|
2023-12-12 14:31:21 +08:00 |
|
yystopf
|
0cb38bce4f
|
新增：根据id查询疑修
|
2023-12-11 16:07:24 +08:00 |
|
yystopf
|
60359333f8
|
Merge branch 'develop' into standalone_develop
|
2023-12-11 09:15:29 +08:00 |
|
yystopf
|
b2250db79a
|
新增：查看标签详情api
|
2023-12-11 09:14:47 +08:00 |
|
yystopf
|
98770ca47e
|
新增：代码溯源注册后须重新调用登录接口
|
2023-12-01 17:04:34 +08:00 |
|
yystopf
|
c63c0cc636
|
更改：issue status查询不使用where.not方式
|
2023-12-01 14:59:13 +08:00 |
|
xxq250
|
32f03abe84
|
合并开发分支代码
|
2023-12-01 14:57:01 +08:00 |
|
xxq250
|
24b5c4e672
|
合并开发分支代码
|
2023-12-01 14:53:48 +08:00 |
|
kingchan
|
d797676639
|
change created on to updated_on for issue list service
|
2023-12-01 09:52:32 +08:00 |
|
yystopf
|
21640fe5e6
|
更改：issue status和priority初始化数据
|
2023-12-01 09:48:08 +08:00 |
|
呱呱呱
|
3833816a0a
|
update issue order by
|
2023-11-29 15:11:41 +08:00 |
|
yystopf
|
9e4e30a495
|
更改：url转义函数
|
2023-11-16 13:50:49 +08:00 |
|
xxq250
|
228209b52c
|
fixed 容错处理
|
2023-11-15 08:44:35 +08:00 |
|
yystopf
|
9ee2c8dde3
|
修复：issue子评论关联查询错误
|
2023-11-15 08:44:35 +08:00 |
|
xxq250
|
783a2e39ae
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2023-11-15 08:43:06 +08:00 |
|
xxq250
|
9e91427de0
|
fixed 容错处理
|
2023-11-15 08:43:00 +08:00 |
|
yystopf
|
9c02b8ba31
|
修复：issue子评论关联查询错误
|
2023-11-14 16:53:29 +08:00 |
|
xxq250
|
2e2f7b2bd5
|
fixed issue和评论里的附件解析关联，增强附件访问权限控制,切换到 项目保护
|
2023-10-24 20:43:19 +08:00 |
|
xxq250
|
cf190632a1
|
fixed issue评论里的附件解析关联，增强附件访问权限控制
|
2023-10-24 20:43:19 +08:00 |
|
xxq250
|
d4d96759ac
|
fixed issue描述里的附件解析关联，增强附件访问权限控制
|
2023-10-24 20:43:18 +08:00 |
|
xxq250
|
25df7c02d5
|
fixed issue和评论里的附件解析关联，增强附件访问权限控制,切换到 项目保护
|
2023-10-24 20:41:02 +08:00 |
|
xxq250
|
e8b36f33ed
|
fixed issue评论里的附件解析关联，增强附件访问权限控制
|
2023-10-18 15:34:16 +08:00 |
|
xxq250
|
467a4f0b94
|
fixed issue描述里的附件解析关联，增强附件访问权限控制
|
2023-10-18 15:34:16 +08:00 |
|
xxq250
|
28b8e15fea
|
fixed 设置非公开图片权限
|
2023-10-18 13:59:54 +08:00 |
|
呱呱呱
|
624e5b150e
|
设置非public图片查看权限
|
2023-10-18 13:57:54 +08:00 |
|
KingChan
|
6a057dedd0
|
Merge pull request '修复问题' (#164) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-10-18 13:39:45 +08:00 |
|
呱呱呱
|
93dc10b6a5
|
fix attachment_candown
|
2023-10-18 13:38:09 +08:00 |
|
KingChan
|
fffe776cd5
|
Merge pull request '图片查看权限调整' (#163) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-10-18 13:36:13 +08:00 |
|
呱呱呱
|
2c4253b04b
|
设置非public图片查看权限
|
2023-10-18 13:27:09 +08:00 |
|
呱呱呱
|
526dac1230
|
change mp to pm
|
2023-10-18 13:21:41 +08:00 |
|
KingChan
|
ce1d6707b8
|
Merge pull request 'issue_priorities issue_tags issue_statues 新增 mp_index' (#162) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-10-17 11:27:20 +08:00 |
|
呱呱呱
|
472499e278
|
mp_index for issue_priorities issue_tags issue_statues
|
2023-10-17 11:25:25 +08:00 |
|
KingChan
|
2fde0da442
|
Merge pull request '通过仓库id拿用户标识和仓库标识' (#161) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-10-16 10:59:21 +08:00 |
|
呱呱呱
|
d19c94666a
|
通过仓库id拿用户标识和仓库标识
|
2023-10-16 10:57:37 +08:00 |
|
KingChan
|
a27a352dfb
|
Merge pull request '判定用户是否在组织下' (#160) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-10-12 11:26:57 +08:00 |
|
呱呱呱
|
d60ba95444
|
OrganizationUsers add pm_check_user
|
2023-10-12 11:25:23 +08:00 |
|
KingChan
|
f5bf0c7a87
|
Merge pull request '检测用户是否在团队下' (#159) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-10-12 11:14:41 +08:00 |
|
呱呱呱
|
19d36af37f
|
update
|
2023-10-12 11:12:53 +08:00 |
|
xxq250
|
5a28204b12
|
fixed 文件增加是否文本判断，可显示多种文本文件
|
2023-10-10 14:17:08 +08:00 |
|
呱呱呱
|
6cb7af0401
|
add data_bank to user action
|
2023-10-10 13:49:52 +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 |
|
呱呱呱
|
f9f99fea7e
|
fix bug
|
2023-10-07 17:29:26 +08:00 |
|
呱呱呱
|
cef99e90b3
|
Revert "add issue search project_issues_index"
This reverts commit b7d6be8b9f.
|
2023-09-28 09:25:51 +08:00 |
|
呱呱呱
|
b7d6be8b9f
|
add issue search project_issues_index
|
2023-09-27 16:59:33 +08:00 |
|
呱呱呱
|
e1808e0689
|
add topic from
|
2023-09-27 15:53:56 +08:00 |
|
呱呱呱
|
5592855996
|
fix topic data
|
2023-09-27 15:11:09 +08:00 |
|
呱呱呱
|
272b73fa0a
|
update
|
2023-09-27 14:16:13 +08:00 |
|
呱呱呱
|
9d5c5acfbf
|
getway lib
|
2023-09-27 14:12:03 +08:00 |
|
呱呱呱
|
b080b8fca5
|
增加导航条index的输入限制
|
2023-09-27 10:28:33 +08:00 |
|
呱呱呱
|
19c8587723
|
add setting navbar index for new
|
2023-09-27 09:43:35 +08:00 |
|
呱呱呱
|
3367d748b6
|
add setting navbar index
|
2023-09-27 09:29:50 +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 |
|
呱呱呱
|
fab25436a0
|
调整glcc 白名单处理逻辑
|
2023-09-26 10:03:01 +08:00 |
chenjing
|
7664e2e4d3
|
update response for checkkeyword
|
2023-09-25 13:01:13 +08:00 |
|
chenjing
|
6bd1eef14a
|
update check keyword response
|
2023-09-25 12:49:14 +08:00 |
|
chenjing
|
8d7c114b40
|
update check keywords
|
2023-09-25 11:40:11 +08:00 |
|
chenjing
|
892aa31ea9
|
check keywords
|
2023-09-25 11:29:44 +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 |
|
KingChan
|
747f58d4d0
|
Merge pull request '调整部署逻辑，新增部署状态和部署说明' (#135) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-09-01 13:29:31 +08:00 |
|
chenjing
|
477b21e633
|
build service change
|
2023-09-01 13:27:40 +08:00 |
|
KingChan
|
e177e059dc
|
Merge pull request '调整部署域名默认值，从全局参数中获取' (#134) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-31 09:24:40 +08:00 |
|
呱呱呱
|
71fd9969cb
|
调整部署域名来源，可从全局设置进行调整
|
2023-08-31 09:22:41 +08:00 |
|
xxq250
|
cdf62b4626
|
fixed 分支删除时有开启的pr需要一同关闭
|
2023-08-30 17:42:24 +08:00 |
|
xxq250
|
53b66f6145
|
fixed 文件增加编辑删除操作无权限提示修改
|
2023-08-30 16:34:23 +08:00 |
|
xxq250
|
03ce084916
|
fixed 文件无权限提示修改
|
2023-08-30 16:09:28 +08:00 |
|
xxq250
|
075f525783
|
fixed 册除失败提示
|
2023-08-30 15:56:48 +08:00 |
|
xxq250
|
6248040f8c
|
fixed 分支删除时有开启的pr需要一同关闭,整理fix
|
2023-08-30 15:43:51 +08:00 |
|
xxq250
|
a9f4292586
|
fixed 分支删除时有开启的pr需要一同关闭,整理
|
2023-08-30 15:39:32 +08:00 |
|
xxq250
|
9946b85205
|
fixed 分支删除时有开启的pr需要一同关闭,合并请求下issue关闭
|
2023-08-30 13:55:57 +08:00 |
|
xxq250
|
810e8b9887
|
fixed 分支删除时有开启的pr需要一同关闭
|
2023-08-30 13:51:56 +08:00 |
|
xxq250
|
a2fb12ffd6
|
404状态码测试页面xml
|
2023-08-30 09:23:56 +08:00 |
|
xxq250
|
1d20f8e5fb
|
404状态码测试页面
|
2023-08-30 09:13:05 +08:00 |
|
xxq250
|
092a890577
|
gitea api error log show
|
2023-08-29 14:53:44 +08:00 |
|
xxq250
|
46430fc0f0
|
Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop
|
2023-08-29 14:43:36 +08:00 |
|
xxq250
|
d3bf9f66d6
|
gitea api error show
|
2023-08-29 14:43:15 +08:00 |
|
KingChan
|
1b3a825c81
|
Merge pull request 'admins用户列表新增修改提示与二次确认' (#133) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-29 11:04:44 +08:00 |
|
呱呱呱
|
798488e689
|
用户列表新增修改提示与二次确认
|
2023-08-29 11:03:11 +08:00 |
|
KingChan
|
df94f815ba
|
Merge pull request '主题列表强制换行' (#132) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-29 10:52:32 +08:00 |
|
呱呱呱
|
463c87e68a
|
主题列表强制换行
|
2023-08-29 10:51:09 +08:00 |
|
KingChan
|
e2334f9604
|
Merge pull request '增加建站主题管理输入限制' (#131) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-29 10:48:01 +08:00 |
|
呱呱呱
|
9fc5324319
|
增加主题管理输入限制
|
2023-08-29 10:46:27 +08:00 |
|
KingChan
|
75e3c4f121
|
Merge pull request '调整身份审核显示效果' (#130) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-29 10:17:10 +08:00 |
|
呱呱呱
|
0a5f575315
|
update
|
2023-08-29 10:15:38 +08:00 |
|
KingChan
|
a1f7414e3e
|
Merge pull request '调整用户获取站点排序' (#129) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-29 09:36:41 +08:00 |
|
呱呱呱
|
497c1d827f
|
调整用户获取站点排序
|
2023-08-29 09:35:03 +08:00 |
|
KingChan
|
913552a2c4
|
Merge pull request '修复排序' (#128) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-29 09:32:57 +08:00 |
|
呱呱呱
|
77d72e8e1a
|
主题列表调整，去掉图片限制
|
2023-08-29 09:31:29 +08:00 |
|
呱呱呱
|
06bd275b95
|
修复审核列表排序异常
|
2023-08-28 17:28:49 +08:00 |
|
KingChan
|
a574216c18
|
Merge pull request '根据issue调整后端展示界面' (#127) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-28 13:54:52 +08:00 |
|
呱呱呱
|
d4d6751dc0
|
用户审核详情调整
|
2023-08-28 11:36:00 +08:00 |
|
呱呱呱
|
d22a18a8fe
|
调整站点详情的url展示长度
|
2023-08-28 10:51:18 +08:00 |
|
呱呱呱
|
484d769f1b
|
为主题配置增加字段验证
|
2023-08-28 10:19:20 +08:00 |
|
KingChan
|
23ac219a94
|
Merge pull request '为建站主题配置增加删除限制' (#126) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-25 11:48:33 +08:00 |
|
chenjing
|
94d0862868
|
add page theme destroy limitation
|
2023-08-25 11:46:30 +08:00 |
|
KingChan
|
5bcc963530
|
Merge pull request '新建站点增加限制' (#125) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 17:25:13 +08:00 |
|
呱呱呱
|
4f5f7639f9
|
add page exit for page_migrate
|
2023-08-24 17:21:26 +08:00 |
|
KingChan
|
5a69e604b9
|
Merge pull request '调整返回值' (#124) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 17:09:30 +08:00 |
|
呱呱呱
|
1d220a6f13
|
fix bug
|
2023-08-24 17:08:04 +08:00 |
|
KingChan
|
cded93715d
|
Merge pull request '调整返回值' (#123) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 17:04:37 +08:00 |
|
呱呱呱
|
eb449f9937
|
update
|
2023-08-24 17:03:22 +08:00 |
|
KingChan
|
0ceda653e8
|
Merge pull request 'page themes' (#122) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 16:05:11 +08:00 |
|
呱呱呱
|
31bb2502b8
|
themes image fix
|
2023-08-24 16:03:40 +08:00 |
|
KingChan
|
8624ae4f22
|
Merge pull request '移除binding.pry' (#121) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 15:07:03 +08:00 |
|
呱呱呱
|
3dacc83e4a
|
fix
|
2023-08-24 15:05:47 +08:00 |
|
KingChan
|
2a0322bae9
|
Merge pull request '前端动态获取主题' (#120) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 15:03:42 +08:00 |
|
呱呱呱
|
c3a949906a
|
update theme
|
2023-08-24 14:50:43 +08:00 |
|
KingChan
|
a4d8193484
|
Merge pull request '新增关闭信息返回' (#119) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 11:52:07 +08:00 |
|
呱呱呱
|
7139ae0613
|
add state_description
|
2023-08-24 11:50:44 +08:00 |
|
KingChan
|
766e190b2a
|
Merge pull request '修复图片' (#118) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 11:42:03 +08:00 |
|
呱呱呱
|
35062aa87d
|
card_front_attachment fix
|
2023-08-24 11:40:33 +08:00 |
|
KingChan
|
6cb0fd44f1
|
Merge pull request '修复审核详情报错' (#117) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 11:37:51 +08:00 |
|
呱呱呱
|
e8c1933778
|
fix bug
|
2023-08-24 11:36:28 +08:00 |
|
KingChan
|
4220788b1f
|
Merge pull request '修复bug' (#116) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 11:33:01 +08:00 |