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 |
|
jasder
|
bf390c8366
|
Merge branch 'develop' into dev_trustie_server
|
2021-06-11 18:03:35 +08:00 |
|
vilet.yy
|
5489ea9fbc
|
add: applied join project
|
2021-06-09 16:53:09 +08:00 |
|
jasder
|
632a06e575
|
Merge branch 'develop' into dev_trustie_server
|
2021-06-08 18:13:16 +08:00 |
|
vilet.yy
|
a5b98bcad4
|
fix: concat nickname
|
2021-06-07 14:56:23 +08:00 |
|
jasder
|
d75b79670d
|
Merge branch 'develop' into dev_trustie_server
|
2021-06-04 18:51:47 +08:00 |
|
viletyy
|
c58b074173
|
fix: init project
|
2021-06-03 11:27:13 +08:00 |
|
vilet.yy
|
7dc21ff388
|
add: update user more info
|
2021-06-03 11:27:13 +08:00 |
|
vilet.yy
|
86f0f2051d
|
add: update user_info
|
2021-06-03 11:27:12 +08:00 |
|
vilet.yy
|
2410f5bbc0
|
add: user statistics
|
2021-06-03 11:27:12 +08:00 |
|
vilet.yy
|
ea79772bd2
|
add: user pinned projects
|
2021-06-03 11:27:12 +08:00 |
|
jasder
|
83e666a387
|
Merge branch 'develop' into dev_trustie_server
|
2021-05-24 17:06:54 +08:00 |
|
jasder
|
e716dba249
|
FIX query project members api bug
|
2021-05-24 17:05:06 +08:00 |
|
jasder
|
72b89d4b2b
|
Merge branch 'develop' into dev_trustie_server
|
2021-05-21 19:26:47 +08:00 |
|
jasder
|
2f9d583fac
|
FIX add nickname lastname query conditions for list users api
|
2021-05-17 16:57:46 +08:00 |
|
jasder
|
8a4b0ba966
|
Merge branch 'develop' into dev_trustie_server
|
2021-05-14 17:34:36 +08:00 |
|
jasder
|
dac07bcae0
|
ADD 页面置顶功能、帮助文档快速入口
|
2021-05-14 16:23:19 +08:00 |
|
jasder
|
876591100e
|
Merge branch 'develop' into dev_trustie_server
|
2021-04-28 21:17:36 +08:00 |
|
vilet.yy
|
65d51e8578
|
add: project operate add organization team users
|
2021-04-28 15:15:45 +08:00 |
|
jasder
|
ba9848ebe7
|
Merge branch 'develop' into dev_trustie_server
|
2021-04-27 18:24:41 +08:00 |
|
vilet.yy
|
1e081b5a3e
|
add: transfer project
|
2021-04-25 18:41:13 +08:00 |
|
jasder
|
39193324e9
|
Merge branch 'develop' into dev_trustie_server
|
2021-04-22 16:38:58 +08:00 |
|
jasder
|
908cda56f3
|
ADD users/hovercard api
|
2021-04-22 16:36:40 +08:00 |