 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
|
c3703a7f69
|
merge from develop
|
2022-11-09 14:42:40 +08:00 |
|
yystopf
|
6d9cf8aad2
|
修复
|
2022-11-09 14:41:17 +08:00 |
|
yystopf
|
7e5d5e31e5
|
merge from develop
|
2022-06-20 10:21:10 +08:00 |
xiaoxiaoqiong
|
1f9caeece5
|
auth2接入
|
2022-06-17 17:02:24 +08:00 |
|
yystopf
|
7a0dbaaefb
|
Merge branch 'develop' into standalone_develop
|
2022-06-08 10:47:08 +08:00 |
|
yystopf
|
3e4dd90e17
|
修复: 用户名称展示时只去掉首末的空格
|
2022-06-08 10:46:55 +08:00 |
|
yystopf
|
8a7dc75907
|
fix merge from develop
|
2022-06-08 10:38:10 +08:00 |
|
yystopf
|
8ae5587516
|
fix: search name use strip
|
2022-06-08 10:37:31 +08:00 |
|
yystopf
|
94881dd72a
|
add: user trace tasks record
|
2022-05-13 14:31:59 +08:00 |
|
yystopf
|
1d7c7eba24
|
Merge branch 'develop' into standalone_develop
|
2022-04-28 10:54:02 +08:00 |
|
yystopf
|
396ac55429
|
add: user super description
|
2022-04-28 10:42:55 +08:00 |
|
yystopf
|
7fd41e13e4
|
Merge branch 'develop' into standalone_develop
|
2022-03-31 13:04:02 +08:00 |
|
yystopf
|
9ced678f91
|
fix: user trace token
|
2022-03-31 13:03:54 +08:00 |
|
yystopf
|
b25db9d37f
|
fix: merge from develop
|
2022-03-31 13:00:36 +08:00 |
|
yystopf
|
4bbb843edf
|
add: trace users and get trace token
|
2022-03-31 12:54:39 +08:00 |
|
yystopf
|
96b0f2d167
|
Merge branch 'develop' into standalone_develop
|
2021-12-28 16:10:16 +08:00 |
|
yystopf
|
12edc620df
|
fix: complete profile condition
|
2021-12-24 16:15:59 +08:00 |
jasder
|
651bf34cfc
|
FIX code review and conflict
|
2021-11-14 20:50:22 +08:00 |
|
jasder
|
03beee6cae
|
FIX code review
|
2021-11-11 18:03:30 +08:00 |
|
jasder
|
9d05973700
|
FIX 解决featrue_homepage分支代码冲突
|
2021-11-08 15:07:35 +08:00 |
|
jasder
|
7ad3789fe2
|
FIX 解决develop分支代码冲突
|
2021-11-08 14:59:06 +08:00 |
|
jasder
|
c19c83d505
|
Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop
|
2021-11-05 11:36:51 +08:00 |
|
jasder
|
9f31dc02f4
|
FIX 后台管理修改用户信息时同步git用户
|
2021-11-04 17:58:45 +08:00 |
|
yystopf
|
46405e704a
|
add: rank not include deleted project
|
2021-11-02 09:59:21 +08:00 |
|
jasder
|
6c67b92bb1
|
FIX revert system_notification_histories
|
2021-11-01 11:06:18 +08:00 |
|
yystopf
|
01f99a2f12
|
fix
|
2021-10-27 11:03:34 +08:00 |
|
yystopf
|
69c87fd5a4
|
add: callback cache
|
2021-10-26 15:22:42 +08:00 |
|
jasder
|
5b19a333ef
|
Merge branch 'develop' into dev_trustie_server
|
2021-10-21 14:41:43 +08:00 |
|
yystopf
|
dbdd2e2dd3
|
add: user template message setting
|
2021-10-19 14:40:45 +08:00 |
|
jasder
|
33a5b7f4f9
|
FIX 合并主干分支代码并解决代码冲突
|
2021-10-18 18:16:12 +08:00 |
|
yystopf
|
1dcc38f617
|
fix: remove system_notification_history
|
2021-10-18 13:51:32 +08:00 |
|
yystopf
|
d176508010
|
add: system notification management
|
2021-10-18 13:49:58 +08:00 |
|
jasder
|
14949c0bfd
|
ADD 通知系统模块代码
|
2021-09-28 15:59:06 +08:00 |
|
yystopf
|
a2ae8f1630
|
fix: profile completed
|
2021-09-18 10:24:16 +08:00 |
jasder
|
143e88593f
|
Merge pull request 'FIX 路由优化' (#138) from develop into dev_trustie_server
|
2021-09-03 17:55:43 +08:00 |
|
yystopf
|
a422aa638d
|
fix: update user profile completed rule
|
2021-09-02 11:48:53 +08:00 |
|
jasder
|
deebfc3292
|
fix merge develop branch
|
2021-07-23 14:16:29 +08:00 |
|
viletyy
|
998381585a
|
add: user public keys controller
|
2021-07-14 15:38:14 +08:00 |
|
jasder
|
2d648e516e
|
FIX merge develop branch
|
2021-07-12 16:19:03 +08:00 |
|
jasder
|
71e039efb8
|
FIX merge develop branch
|
2021-07-12 16:14:51 +08:00 |
|
vilet.yy
|
0e7f3a8905
|
fix: project permission and update user lastname
|
2021-06-29 10:36:58 +08:00 |
|
jasder
|
c298ff02b8
|
ADD pr冲突文件展示
|
2021-06-25 18:03:07 +08:00 |
|
jasder
|
62d1a2378c
|
FIX [更改字段名称]conflicts file for pull api
|
2021-06-25 17:31:23 +08:00 |
|
jasder
|
e24269c2a7
|
Merge branch 'develop' into dev_trustie_server
|
2021-06-17 18:14:19 +08:00 |
|
vilet.yy
|
7fccd2aed2
|
fix: nickname search alone
|
2021-06-15 16:14:15 +08:00 |