 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 |
呱呱呱
|
6cb7af0401
|
add data_bank to user action
|
2023-10-10 13:49:52 +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 |
|
呱呱呱
|
0e7ccdf58f
|
setting add site_page_deploy_domain
|
2023-09-26 14:42:58 +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 |
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
|
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
|
8909ad2ba8
|
404状态码测试页面xml
|
2023-08-30 09:31:21 +08:00 |
|
xxq250
|
6bc0587168
|
404状态码测试页面
|
2023-08-30 09:31:20 +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 |
|
呱呱呱
|
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
|
2ed7ce3e6f
|
Merge pull request '调整admins界面展示' (#115) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-24 11:16:19 +08:00 |
|
呱呱呱
|
c4222f1d65
|
update admins identity_verifications site_pages
|
2023-08-24 11:14:56 +08:00 |
|
KingChan
|
36b482e6ed
|
Merge pull request 'admins 删除站点' (#114) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-23 17:26:36 +08:00 |
|
呱呱呱
|
890c826685
|
add site destroy for admin
|
2023-08-23 17:25:24 +08:00 |
|
KingChan
|
8a2d927e8d
|
Merge pull request '新增管理员端的站点主题管理' (#113) from KingChan/forgeplus:chenjing into standalone_develop
|
2023-08-23 17:17:43 +08:00 |
|
呱呱呱
|
beeb12c336
|
add page themes for admins
|
2023-08-23 17:16:03 +08:00 |
|
xxq250
|
6f01ce170e
|
fixed 注册时支持中划线的邮箱地址
|
2023-08-22 13:59:02 +08:00 |
|
xxq250
|
235ecf6ce2
|
fixed fork后重命名项目标识再forked失败
|
2023-08-22 13:47:34 +08:00 |
|
呱呱呱
|
471fbcace4
|
fix fork create bug
|
2023-08-22 09:36:12 +08:00 |
|
呱呱呱
|
f7e1487c10
|
add page_migrate response
|
2023-08-17 14:13:38 +08:00 |
|
呱呱呱
|
a286d97fca
|
change sitepage theme
|
2023-08-17 11:47:14 +08:00 |