Commit Graph

1674 Commits

Author SHA1 Message Date
viletyy 77ec7e5a69 Merge branch 'develop' into standalone_develop 2022-10-17 10:25:47 +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 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” 8b1f06f010 cloudIDE saas定制api 2022-10-12 15:58: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
viletyy a516363763 Merge branch 'develop' into standalone_develop 2022-10-08 18:44:28 +08:00
yystopf a7384bc1c3 修复:代码详情页报错 2022-10-08 18:44:04 +08:00
viletyy 3d475fdedd Merge branch 'develop' into standalone_develop 2022-09-29 13:59:04 +08:00
yystopf 2cde13eabb 新增:接口测试以及功能测试 2022-09-29 12:05:57 +08:00
yystopf d68e7f38a3 新增:更改邮箱service逻辑 2022-09-29 09:30:33 +08:00
yystopf 649d9c4ea6 新增:更改邮箱控制器方法 2022-09-28 16:09:10 +08:00
“xxq250” c08868b26a fixed 用户活跃数 2022-09-26 16:12:12 +08:00
“xxq250” fce8166ba7 fixed 用户活跃数 2022-09-26 16:11:34 +08:00
“xxq250” ae0efc1115 Merge remote-tracking branch 'origin/develop' into develop 2022-09-26 10:38:32 +08:00
“xxq250” dfc2edd62d fixed注册gitea错误信息 2022-09-26 10:38:28 +08:00
yystopf af7a779af6 merge from develop 2022-09-23 10:09:51 +08:00
yystopf cc42683316 新增:活跃度计算访问量限制 2022-09-23 10:07:52 +08:00
“xxq250” b832a8ecc6 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-09-21 16:00:19 +08:00
“xxq250” 5c123fba17 头歌接口更换密钥 2022-09-21 16:00:13 +08:00
yystopf b7193aa768 Merge branch 'develop' into standalone_develop 2022-09-21 10:06:39 +08:00
yystopf 70f1e6827f 更改:项目已设置语言,则不重新设置语言 2022-09-21 10:06:29 +08:00
yystopf b4e0cc6dc1 Merge branch 'develop' into standalone_develop 2022-09-21 09:55:05 +08:00
yystopf b5188e3272 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-09-21 09:54:53 +08:00
yystopf ff881732d2 更改:项目已设置语言,则不重新设置语言 2022-09-21 09:54:49 +08:00
“xxq250” b07e5d6993 Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-09-20 09:43:20 +08:00
“xxq250” bb8e6aeaf8 nps数据统计 2022-09-20 09:41:27 +08:00
“xxq250” ac8959f36f fixed 修改密码接口 2022-09-19 15:51:59 +08:00
“xxq250” 6d7b7dd058 fixed 修改密码接口 2022-09-19 10:06:49 +08:00
yystopf 4994179a33 Merge branch 'develop' into standalone_develop 2022-09-15 09:57:34 +08:00
yystopf 481d1b7db0 修复:commit log统计触发规则 2022-09-15 09:57:28 +08:00
yystopf a1b2bdd048 Merge branch 'develop' into standalone_develop 2022-09-15 09:49:51 +08:00
yystopf 383660c778 更改:组织缓存信息方式改在控制器里面 2022-09-15 09:38:28 +08:00
yystopf ecd43dbd12 Merge branch 'develop' into standalone_develop 2022-09-08 14:19:16 +08:00
yystopf 4bd77a870b 更改:webhook创建数量限制为50个 2022-09-08 14:19:08 +08:00
yystopf 9022fdcb80 Merge branch 'develop' into standalone_develop 2022-09-08 10:41:02 +08:00
yystopf b1f460d760 更改:webhook创建数量限制为50个 2022-09-08 10:40:52 +08:00
“xxq250” 925b05e004 nps已打分区分 2022-09-06 10:29:49 +08:00
“xxq250” fd66a3149d nps已打分区分 2022-09-05 13:44:23 +08:00
“xxq250” eb1a3f8e23 调整nps用户调研接口,需要登录 2022-08-31 10:40:25 +08:00
“xxq250” a7c24dea64 调整nps用户调研接口 2022-08-31 10:40:24 +08:00
“xxq250” 32a9d762d8 调整nps用户调研接口,需要登录 2022-08-31 10:39:52 +08:00
“xxq250” 0a79950046 调整nps用户调研接口 2022-08-31 10:38:21 +08:00
“xxq250” d51bb7030f Merge remote-tracking branch 'origin/develop' into standalone_develop
# Conflicts:
#	app/views/users/get_user_info.json.jbuilder
2022-08-30 18:14:17 +08:00
“xxq250” 4b7c58b13f Merge remote-tracking branch 'origin/develop' into develop 2022-08-30 18:10:33 +08:00
“xxq250” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
yystopf 1613cf7376 Merge branch 'develop' into standalone_develop 2022-08-30 10:40:37 +08:00