admin0
/
forgeplus
forked from Gitlink/forgeplus
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,107 Commits 3 Branches 0 Tags 557 MiB
Commit Graph

92 Commits

Author SHA1 Message Date
xiaoxiaoqiong 26bfc2c0bf fixed 增加自动登录 2022-05-24 10:33:21 +08:00
xiaoxiaoqiong 2959414d56 fixed 增加自动登录 2022-05-24 10:25:58 +08:00
xiaoxiaoqiong 0ae3544235 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 
# Conflicts:
#	app/controllers/users_controller.rb
#	app/helpers/application_helper.rb
 2022-05-23 18:06:24 +08:00
xiaoxiaoqiong 05b3f2a2fb fixed timego时间差 2022-05-23 18:05:13 +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 246b484ad8 fix merge from develop 2022-04-18 14:14:48 +08:00
yystopf fc3cf01d3f add: get user image action 2022-04-18 13:49:08 +08:00
xiaoxiaoqiong 1f6ac05bad 允许非登录搜索用户 2022-04-06 14:33:47 +08:00
yystopf f76dad680a Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop 2022-01-07 18:03:57 +08:00
yystopf 499734ebf9 fix: upload user image allow base64 2022-01-04 22:44:39 +08:00
yystopf f339df699e add: user upload image 2022-01-03 22:32:09 +08:00
xxq250 7c765817c9 Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop 2021-11-26 14:21:53 +08:00
yystopf 8011dabaac fix: undo events 2021-11-18 17:02:09 +08:00
jasder 7ad3789fe2 FIX 解决develop分支代码冲突 2021-11-08 14:59:06 +08:00
yystopf 46405e704a add: rank not include deleted project 2021-11-02 09:59:21 +08:00
jasder c0df55c20f Merge pull request 'ADD 合并项目首页改版功能' (#227) from feature_project_detail into develop 2021-10-29 11:21:27 +08:00
jasder 9cd54b0ccb FIX 解决老版本trustie项目链接错误的问题 2021-10-25 17:24:28 +08:00
yystopf fa476732e5 add: user common info cache service 2021-10-25 17:23:17 +08:00
jasder 14949c0bfd ADD 通知系统模块代码 2021-09-28 15:59:06 +08:00
yystopf dbcbc01251 fix and add some message feature 2021-09-16 16:54:49 +08:00
yystopf a0b6041394 add: get user info unread total 2021-09-13 18:17:09 +08:00
jasder 143e88593f Merge pull request 'FIX 路由优化' (#138) from develop into dev_trustie_server 2021-09-03 17:55:43 +08:00
yystopf e93873c3d4 fix 2021-09-02 14:48:33 +08:00
yystopf a422aa638d fix: update user profile completed rule 2021-09-02 11:48:53 +08:00
yystopf c52458a7e3 add: require profile completed 2021-09-02 10:55:31 +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 9d07181733 fix: undo_events 2021-06-10 10:57:06 +08:00
vilet.yy 77c1b1e188 add: undo_join_projects 2021-06-10 10:49:26 +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
vilet.yy e8f4b3f17c fix 2021-06-04 18:43:12 +08:00
vilet.yy 12c252ea10 fix: merge from hh_develop 2021-06-04 18:36:33 +08:00
viletyy 93169f8c96 fix: user update return info 2021-06-03 15:43:36 +08:00
vilet.yy 7dc21ff388 add: update user more info 2021-06-03 11:27:13 +08:00
vilet.yy 21d4751327 add: update user image 2021-06-03 11:27:12 +08:00
vilet.yy 86f0f2051d add: update user_info 2021-06-03 11:27:12 +08:00
vilet.yy 496867cac7 add: update user more info 2021-06-03 10:19:33 +08:00
vilet.yy 2ad963cdf1 add: update user image 2021-06-01 10:07:01 +08:00
vilet.yy 0b450c0c5f add: update user_info 2021-05-31 18:39:49 +08:00
jasder 246b6b52ec Merge branch 'develop' into dev_trustie_server 2021-04-29 19:27:36 +08:00
vilet.yy 1a7b323120 fix: user info projects count 2021-04-29 18:09:39 +08:00
vilet.yy fffe57a211 fix: mirror project permission error 2021-04-29 18:09:39 +08:00
jasder ba9848ebe7 Merge branch 'develop' into dev_trustie_server 2021-04-27 18:24:41 +08:00
vilet.yy 120a33bc8a add: undo count 2021-04-27 15:43:37 +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