Commit Graph

3829 Commits

Author SHA1 Message Date
yystopf c2ef23b746 修复 2022-10-21 14:42:51 +08:00
viletyy 292167b47e Merge branch 'develop' into standalone_develop 2022-10-21 14:41:09 +08:00
yystopf 8a33ea6707 修复 2022-10-21 14:40:43 +08:00
viletyy 2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
yystopf 9ee4c85b7c 更改:验证返回status以及万能验证码 2022-10-21 14:31:32 +08:00
“xxq250” 4cc4ed5864 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-10-21 09:42:27 +08:00
“xxq250” 0a5dd2f1ee ssh公钥允许token请求 2022-10-21 09:42:21 +08:00
yystopf e9b23d6577 更改:合并请求代码冲突提示语更改 2022-10-19 16:17:44 +08:00
yystopf 64d9c334ce 修复:项目语言验证信息统一 2022-10-19 15:18:15 +08:00
yystopf cad7e24299 修复:项目列表表头样式 2022-10-18 15:53:37 +08:00
yystopf 3b15dd84fc 新增:标签列表返回总数 2022-10-18 14:52:15 +08:00
yystopf 58a43a8b80 更改:合并请求和issue仅加载开启中的里程碑 2022-10-18 13:43:16 +08:00
yystopf e25231738a 新增:标签名字列表 2022-10-18 13:32:57 +08:00
yystopf 35965f542a 新增:标签名字列表 2022-10-18 13:31:12 +08:00
yystopf fa48e3f5ca 修复:许可证和忽略文件内容为空表单提示 2022-10-18 11:14:35 +08:00
yystopf 13e2738fb5 新增:列表页新增only_watched参数 2022-10-17 17:37:03 +08:00
viletyy a494a905fa Merge branch 'develop' into standalone_develop 2022-10-17 13:16:49 +08:00
yystopf 30437d828c 新增:项目git忽略文件新增验证 2022-10-17 13:16:22 +08:00
yystopf dcc7ab6738 更改:项目分类去掉图片上传 2022-10-17 13:01:08 +08:00
yystopf 57a7a17f73 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-10-17 12:57:32 +08:00
yystopf 5196f33f24 新增:项目许可证新增验证 2022-10-17 12:57:24 +08:00
“xxq250” b3cbed2963 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	app/controllers/members_controller.rb
2022-10-17 11:09:48 +08:00
“xxq250” dd1af6712c fixed 项目成员提示修改 2022-10-17 11:08:54 +08:00
yystopf 8807be6e4d 新增:项目语言新增唯一性验证 2022-10-17 10:52:57 +08:00
yystopf 8d41c27044 更改:项目成员添加提示 2022-10-17 10:42:40 +08:00
viletyy 77ec7e5a69 Merge branch 'develop' into standalone_develop 2022-10-17 10:25:47 +08:00
yystopf 53fe554d1e 更改:后台管理表头样式 2022-10-17 10:25:17 +08:00
“xxq250” 4e02dbe06b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	app/controllers/attachments_controller.rb
2022-10-17 10:14:13 +08:00
“xxq250” 620ddff9bb fixed issue评论附件权限 2022-10-17 10:13:30 +08:00
viletyy 732d1a1adb Merge branch 'develop' into standalone_develop 2022-10-15 11:29:58 +08:00
yystopf 630a7aadeb 新增:组织数据修复任务 2022-10-15 11:29:23 +08:00
viletyy 2cdcd5f117 Merge branch 'develop' into standalone_develop 2022-10-14 15:31:39 +08:00
yystopf 6383384287 更改:后台管理用户真实姓名改为昵称 2022-10-14 15:31:20 +08:00
viletyy 6b6c0791cd Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-10-14 15:02:59 +08:00
viletyy 2df259c927 Merge branch 'develop' into standalone_develop 2022-10-14 15:02:53 +08:00
yystopf 83f1263f85 修复:更改查询项目判断条件 2022-10-14 14:52:25 +08:00
“xxq250” cc74d53070 Merge branch 'pre_trustie_server' into trustie_server
# Conflicts:
#	lib/tasks/update_educoder_user.rake
2022-10-14 12:03:32 +08:00
“xxq250” 7304e87a11 Merge branch 'standalone_develop' into pre_trustie_server 2022-10-14 12:01:46 +08:00
“xxq250” 4b0609931a 更换发送邮箱 2022-10-14 11:59:48 +08:00
“xxq250” c2742f0ae7 cloudIDE saas定制api 2022-10-12 16:46:15 +08:00
“xxq250” 483c8d5410 cloudIDE saas定制api 2022-10-12 16:42:45 +08:00
“xxq250” c2673bd48d cloudIDE saas定制api 2022-10-12 16:37:54 +08:00
“xxq250” f031cd4720 cloudIDE saas定制api 2022-10-12 16:34:44 +08:00
“xxq250” bf1e722084 cloudIDE saas定制api 2022-10-12 16:04:27 +08:00
“xxq250” 8b1f06f010 cloudIDE saas定制api 2022-10-12 15:58:46 +08:00
“xxq250” 6d2a6e0331 cloudIDE saas定制api 2022-10-12 15:44:46 +08:00
“xxq250” c668fd3530 cloudIDE saas定制api 2022-10-12 15:38:40 +08:00
“xxq250” e7bbe252de cloudIDE saas定制api 2022-10-12 15:37:22 +08:00
yystopf 9c11cd79e8 修复:消息模版无法查询子类的问题 2022-10-10 19:06:47 +08:00
viletyy a516363763 Merge branch 'develop' into standalone_develop 2022-10-08 18:44:28 +08:00