Commit Graph

2165 Commits

Author SHA1 Message Date
xxq250 6fb22d3117 Merge branch 'pre_trustie_server' into trustie_server 2023-12-01 14:59:47 +08:00
xxq250 24b5c4e672 合并开发分支代码 2023-12-01 14:53:48 +08:00
xxq250 6a989f972a Merge branch 'pre_trustie_server' into trustie_server
# Conflicts:
#	app/models/issue.rb
#	app/models/journal.rb
2023-10-24 20:46:02 +08:00
xxq250 2e2f7b2bd5 fixed issue和评论里的附件解析关联,增强附件访问权限控制,切换到 项目保护 2023-10-24 20:43:19 +08:00
xxq250 d4d96759ac fixed issue描述里的附件解析关联,增强附件访问权限控制 2023-10-24 20:43:18 +08:00
xxq250 99fe06c788 fixed issue描述里的附件解析关联,增强附件访问权限控制 2023-10-18 15:16:14 +08:00
xxq250 fa1a03e4db Merge branch 'pre_trustie_server' into trustie_server 2023-10-18 14:02:49 +08:00
xxq250 28b8e15fea fixed 设置非公开图片权限 2023-10-18 13:59:54 +08:00
呱呱呱 624e5b150e 设置非public图片查看权限 2023-10-18 13:57:54 +08:00
xxq250 bf232f3518 Merge branch 'pre_trustie_server' into trustie_server 2023-10-13 14:14:46 +08:00
呱呱呱 d60ba95444 OrganizationUsers add pm_check_user 2023-10-12 11:25:23 +08:00
呱呱呱 19d36af37f update 2023-10-12 11:12:53 +08:00
呱呱呱 6cb7af0401 add data_bank to user action 2023-10-10 13:49:52 +08:00
xxq250 4c354f6841 Merge branch 'pre_trustie_server' into trustie_server 2023-09-28 15:33:37 +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
xxq250 e6f2e9a798 Merge branch 'pre_trustie_server' into trustie_server 2023-09-26 15:01:07 +08:00
呱呱呱 0e7ccdf58f setting add site_page_deploy_domain 2023-09-26 14:42:58 +08:00
xxq250 c6461de871 Merge branch 'pre_trustie_server' into trustie_server 2023-09-25 17:58:15 +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
xxq250 02b85859b5 pages 合并 2023-09-25 10:50:35 +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
xxq250 18377dc2e0 Merge branch 'pre_trustie_server' into trustie_server 2023-08-31 16:08:38 +08:00
xxq250 300dffd2a1 fixed 分支删除时有开启的pr需要一同关闭,整理fix 2023-08-31 16:07:47 +08:00
xxq250 9db60413d9 fixed 分支删除时有开启的pr需要一同关闭,整理 2023-08-31 16:07:47 +08:00
xxq250 04c147d80d fixed 分支删除时有开启的pr需要一同关闭,合并请求下issue关闭 2023-08-31 16:07:46 +08:00
xxq250 1da6c582f0 fixed 分支删除时有开启的pr需要一同关闭 2023-08-31 16:07:46 +08:00
xxq250 1d1d6ebda1 fixed 注册时支持中划线的邮箱地址 2023-08-31 16:07:14 +08:00
xxq250 56103a885b fixed fork后重命名项目标识再forked失败 2023-08-31 16:07:14 +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
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 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
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