Commit Graph

680 Commits

Author SHA1 Message Date
xxq250 2238c8fcbb fixed qq命名调整,方便封装 2022-12-06 10:27:04 +08:00
xxq250 0747fc6849 fixed 用户名称统一nickname 2022-12-02 11:16:13 +08:00
xxq250 feb8c66e4b Merge remote-tracking branch 'origin/develop' into standalone_develop
# Conflicts:
#	app/controllers/concerns/register_helper.rb
#	app/controllers/oauth/base_controller.rb
2022-12-01 17:48:11 +08:00
xxq250 763d7b499e fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:22:22 +08:00
xxq250 f818a3ac91 fixed 用户名称统一用昵称 2022-11-28 16:56:46 +08:00
xxq250 29d2ca63ed 取消lastname同步nickname 2022-11-23 18:15:27 +08:00
xxq250 8f8dab10c3 fixed 增加emoji表情支持 2022-11-23 17:58:51 +08:00
yystopf 9f74651a2b Merge branch 'develop' into standalone_develop 2022-11-15 14:42:07 +08:00
“xxq250” 0cb6f233f3 项目搜索增加组织和用户信息搜索 2022-11-15 14:40:37 +08:00
yystopf 64c6f69f56 新增:统计项目分类下私有项目的数量 2022-11-15 14:25:35 +08:00
yystopf 84bfdf749f Merge branch 'develop' into standalone_develop 2022-11-11 12:25:46 +08:00
yystopf b56930b9ab 修复:反馈意见发送邮件失败错误返回 2022-11-11 12:25:25 +08:00
yystopf 4a7dcf8a91 Merge branch 'develop' into standalone_develop 2022-11-11 11:50:26 +08:00
yystopf f98886b3a0 修复 2022-11-11 11:50:07 +08:00
yystopf c3703a7f69 merge from develop 2022-11-09 14:42:40 +08:00
yystopf 6d9cf8aad2 修复 2022-11-09 14:41:17 +08:00
yystopf 33a3d7f48c merge from develop 2022-11-09 14:37:27 +08:00
yystopf e3179dfd6e 新增:新增反馈意见邮件回复功能 2022-11-09 14:35:11 +08:00
yystopf 83b46fcb50 新增:用户反馈意见后台管理逻辑 2022-11-09 11:37:12 +08:00
yystopf 2b2a44831e Merge branch 'develop' into standalone_develop 2022-11-08 13:41:00 +08:00
yystopf 3e5c1da2c5 新增:反馈意见模型及接口 2022-11-08 13:27:46 +08:00
viletyy 7f91ebb509 Merge branch 'develop' into standalone_develop 2022-11-01 15:29:30 +08:00
yystopf 423d5a9316 修复:同步项目权限到组织时需预先判断是否存在于团队中 2022-11-01 15:29:07 +08:00
viletyy d665d0edb1 Merge branch 'develop' into standalone_develop 2022-10-27 10:49:05 +08:00
yystopf e15809c186 修复:无法正常转移的问题 2022-10-27 10:48:24 +08:00
viletyy 893f6c04a5 Merge branch 'develop' into standalone_develop 2022-10-26 14:58:25 +08:00
yystopf 3d5b2e76d7 修复:update_column无法触发count_cache 2022-10-26 14:58:04 +08:00
viletyy 6e9962e0da Merge branch 'develop' into standalone_develop 2022-10-26 14:50:23 +08:00
yystopf 8b14ee3c72 修复:更改组织下项目权限同时更改组织下权限同步至gitea 2022-10-26 14:49:40 +08:00
viletyy 2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
yystopf 64d9c334ce 修复:项目语言验证信息统一 2022-10-19 15:18:15 +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 5196f33f24 新增:项目许可证新增验证 2022-10-17 12:57:24 +08:00
yystopf 8807be6e4d 新增:项目语言新增唯一性验证 2022-10-17 10:52:57 +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 2df259c927 Merge branch 'develop' into standalone_develop 2022-10-14 15:02:53 +08:00
yystopf 9c11cd79e8 修复:消息模版无法查询子类的问题 2022-10-10 19:06:47 +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
yystopf af7a779af6 merge from develop 2022-09-23 10:09:51 +08:00
yystopf cc42683316 新增:活跃度计算访问量限制 2022-09-23 10:07:52 +08:00
yystopf 6a2cfc5fde Merge branch 'develop' into standalone_develop 2022-09-15 10:00:09 +08:00
yystopf 007b90c284 修复:删除旧的逻辑 2022-09-15 10:00:00 +08:00
yystopf a1b2bdd048 Merge branch 'develop' into standalone_develop 2022-09-15 09:49:51 +08:00
yystopf 733f64eaec 新增:项目排行榜新增提交数算法 2022-09-15 09:44:12 +08:00
yystopf 383660c778 更改:组织缓存信息方式改在控制器里面 2022-09-15 09:38:28 +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” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00