Commit Graph

5149 Commits

Author SHA1 Message Date
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
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 55170c7693 新增:更改邮箱相关接口文档 2022-09-29 13:58:14 +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” e33448db4d fixed nps统计 2022-09-26 16:53:55 +08:00
“xxq250” bf95b6bca1 fixed 用户活跃数 2022-09-26 16:13:33 +08:00
“xxq250” 3ba7114d08 fixed 用户活跃数 2022-09-26 16:12:52 +08:00
“xxq250” 628d815a5c Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-09-26 16:12:25 +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 a030a01050 Merge branch 'develop' into standalone_develop 2022-09-23 17:56:58 +08:00
yystopf d7f3a21add 修复:周统计数据需加入年份 2022-09-23 17:56:39 +08:00
“xxq250” aa8a08e272 rake更新用户邮箱和手机号 2022-09-23 10:33:00 +08:00
“xxq250” 72b753d11d rake更新用户邮箱和手机号 2022-09-23 10:32:37 +08:00
“xxq250” 665df16c25 rake更新用户邮箱和手机号 2022-09-23 10:29:00 +08:00
“xxq250” e03071a23d 头歌接口更换密钥 2022-09-23 10:28:59 +08:00
yystopf d9eb335b2a Merge branch 'develop' into standalone_develop 2022-09-23 10:28:19 +08:00
yystopf ef9592ef30 更改:活跃度算法更新 2022-09-23 10:28:12 +08:00
“xxq250” 95ee28b710 Merge branch 'standalone_develop' into pre_trustie_server 2022-09-23 10:26: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 cf1f78b493 Update README.md 2022-09-22 16:51:56 +08:00
xxq250 88ff9abe49 Update README.md 2022-09-22 16:47:28 +08:00
“xxq250” 28656ad6cd rake更新用户邮箱和手机号 2022-09-21 17:50:05 +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 7ad9b921d5 Merge branch 'pre_trustie_server' into trustie_server 2022-09-21 10:09:20 +08:00