KingChan
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,997 Commits 67 Branches 0 Tags 728 MiB
Commit Graph

166 Commits

Author SHA1 Message Date
yystopf a25db1afbf Merge branch 'standalone_develop' into dev_osredm_server 2025-11-04 11:32:39 +08:00
yystopf 3357e56a84 新增：用户参与项目数量 2025-10-28 10:29:33 +08:00
xxq250 5cd1733a82 fixed 用户账号接口增加手机号 2025-10-27 14:50:19 +08:00
yystopf e683867939 更改：get_user_info 回退 2025-04-30 14:20:07 +08:00
yystopf e5899a5351 新增：后台管理首页创客/竞赛管理 2025-04-29 17:04:06 +08:00
xxq250 b760d17988 Merge branch 'standalone_develop' into dev_osredm_server 
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/admins/users_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/owners_controller.rb
#	app/helpers/application_helper.rb
#	app/helpers/avatar_helper.rb
#	app/models/edu_setting.rb
#	app/models/user.rb
#	app/models/user_action.rb
#	app/views/layouts/admin.html.erb
#	app/views/projects/index.json.jbuilder
#	config/harmonious_dictionary/chinese_dictionary.txt
#	config/harmonious_dictionary/harmonious.hash
#	config/harmonious_dictionary/harmonious_english.yml
#	config/routes/api.rb
 2025-03-20 14:32:54 +08:00
xxq250 23c0bcbf36 fixed oauth2用户接口用户信息过滤表情 2024-10-22 11:09:11 +08:00
xxq250 098b045315 fixed 删除用户图标 2024-10-11 15:01:32 +08:00
xxq250 c8e9c705f3 fixed 删除用户图标 2024-10-11 14:57:06 +08:00
xxq250 7f93c068b7 fixed 未登录用户默认头像 2024-10-11 09:35:57 +08:00
xxq250 1459e2f626 fixed 删除用户时issue，pr用户显示已注销 2024-10-09 16:09:42 +08:00
xxq250 71bdde79ef fixed 删除用户时issue，pr用户显示已注销 2024-10-09 15:55:42 +08:00
xxq250 382ff3cc1b fixed 用户信息接口增加属性 2024-09-20 16:51:41 +08:00
xxq250 8c05d502a8 fixed 用户信息接口增加属性 2024-09-20 16:50:54 +08:00
xxq250 6f07fb4a7e fixed 用户信息接口增加属性 2024-09-20 16:16:11 +08:00
xxq250 53ee8fbb43 fixed 用户信息接口增加属性 2024-09-20 16:15:24 +08:00
xxq250 e995e1b3a8 fixed 用户信息接口增加属性 2024-09-20 16:13:39 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf 21eb842766 新增：列表返回是否置顶字段 2024-07-16 10:17:09 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
yystopf 68bdf7856e 新增：需求字段 2024-04-12 09:15:28 +08:00
呱呱呱 96936da9ac add site page 2023-08-10 14:29:26 +08:00
chenjing 65816a980b cla fix and add token verify 2023-06-20 15:27:03 +08:00
chenjing 74dcdebe5e add user_cla response 2023-06-16 10:19:38 +08:00
chenjing cfaa5301ea cla init 2023-06-13 15:30:16 +08:00
xxqfamous 677f9c2f4e user list返回脱敏手机号 2023-06-01 18:33:29 +08:00
xxqfamous c8a02bf7b0 Merge branch 'develop' into standalone_develop 2023-05-30 11:13:09 +08:00
xxqfamous 09e674f0c1 竞赛用户关联优化 2023-05-30 11:12:21 +08:00
yystopf 4dbb416143 Merge branch 'develop' into standalone_develop 2023-04-20 11:40:15 +08:00
yystopf c91b986bec 新增：用户签署cla字段 2023-04-20 11:39:42 +08:00
yystopf 02099758fb Merge branch 'develop' into standalone_develop 2023-03-31 11:19:08 +08:00
yystopf 56790f8558 更改：贡献度读取数据规则 2023-03-31 11:18:58 +08:00
yystopf 2d00200036 修复 2023-03-10 14:49:20 +08:00
yystopf 47a8f17073 新增：转账记录使用json builder以及贡献者新增贡献占比 2023-03-10 14:48:53 +08:00
xxq250 db845e7df0 开启确权激励的用户或项目 2023-03-07 09:59:42 +08:00
xxq250 9cd150be88 开启确权激励的用户或项目 2023-03-07 09:49:17 +08:00
yystopf ccec8e9819 Merge branch 'develop' into dev_jk_server 2022-12-12 16:17:22 +08:00
xxq250 29d2ca63ed 取消lastname同步nickname 2022-11-23 18:15:27 +08:00
yystopf a6923bf7ed 新增：get_user_info电话号码展示 2022-11-23 17:44:37 +08:00
“xxq250” 969cbcfe60 fixed users/me返回email,用于三方登录 2022-10-21 17:44:02 +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” 6d2a6e0331 cloudIDE saas定制api 2022-10-12 15:44:46 +08:00
“xxq250” e7bbe252de cloudIDE saas定制api 2022-10-12 15:37:22 +08:00
“xxq250” b416b12914 实名认证状态 2022-10-11 14:24:08 +08:00
“xxq250” cb302b50dd Merge branch 'develop' into dev_jk_server 
# Conflicts:
#	app/assets/javascripts/admin.js
#	app/controllers/accounts_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/attachments_controller.rb
#	app/controllers/concerns/login_helper.rb
#	app/controllers/concerns/register_helper.rb
#	app/controllers/concerns/render_helper.rb
#	app/controllers/concerns/repository/languages_percentagable.rb
#	app/controllers/repositories_controller.rb
#	app/controllers/users/is_pinned_projects_controller.rb
#	app/controllers/users_controller.rb
#	app/docs/slate/source/api.html.md
#	app/docs/slate/source/includes/_projects.md
#	app/docs/slate/source/includes/_pulls.md
#	app/docs/slate/source/includes/_repositories.md
#	app/docs/slate/source/includes/_teams.md
#	app/docs/slate/source/includes/_users.md
#	app/helpers/application_helper.rb
#	app/imports/admins/new_import_user_from_excel.rb
#	app/libs/custom_regexp.rb
#	app/models/journal.rb
#	app/models/project.rb
#	app/models/user.rb
#	app/queries/admins/user_query.rb
#	app/services/admins/import_user_from_excel_service.rb
#	app/views/admins/users/index.html.erb
#	app/views/members/index.json.jbuilder
#	app/views/settings/show.json.jbuilder
#	config/routes.rb
#	public/导入用户模板.xlsx
 2022-09-27 15:32:46 +08:00
“xxq250” 4a6e94a98f 调整nps用户调研接口,30天 2022-09-02 15:50:15 +08:00