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

151 Commits

Author SHA1 Message Date
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 d5511ad8ee fixed 站内信设置可关闭开关 2025-03-07 09:09:52 +08:00
xxq250 6574aff205 fixed 检测用户不存在时清除cookie 2024-09-27 11:17:59 +08:00
xxq250 f8536531b6 fixed 用户信息接口增加属性 2024-09-20 16:18:58 +08:00
xxq250 41e2bc67d6 fixed 用户信息接口 2024-09-20 16:09:07 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf da6931d790 fix 2024-07-16 10:23:21 +08:00
xxq250 7767f4b262 定制用户查询接口 2024-06-21 15:40:39 +08:00
xxq250 ab62e0a342 fixed 从gitlink竞赛用户自动登录注册平台 2024-06-12 11:34:47 +08:00
xxq250 f9d6b76c7d fixed 从gitlink竞赛用户自动登录注册平台 2024-06-12 11:31:32 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
xxq250 8b8fb883cc 内网509接入登录 2024-01-31 15:48:20 +08:00
xxq250 c972d538ee fixed 用户搜索按昵称和登录时间倒排序 2023-12-14 16:45:29 +08:00
xxq250 a136a0468e fixed 更新时判断是否有昵称 2023-07-17 22:24:21 +08:00
呱呱呱 8b1857a3d8 fix fork error when exit repo and fix emoj for nickname bug 2023-07-13 10:57:20 +08:00
呱呱呱 80321c6ca2 add nickname with reversed_keywords 2023-07-12 15:55:56 +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 22929e54d3 Merge branch 'develop' into standalone_develop 2023-03-24 14:34:51 +08:00
yystopf b37ff07bcf 新增：个人项目分页limit使用9999 2023-03-24 14:34:42 +08:00
yystopf 841126c0fc 新增：token转账列表新增分页参数 2023-03-10 14:49:20 +08:00
yystopf 47a8f17073 新增：转账记录使用json builder以及贡献者新增贡献占比 2023-03-10 14:48:53 +08:00
xxq250 b1c10d66f9 区块链确权相关 2023-03-02 13:49:50 +08:00
“xxq250” babcb16c41 fixed 埋点记录 2022-11-11 14:54:54 +08:00
“xxq250” 8b1f06f010 cloudIDE saas定制api 2022-10-12 15:58:46 +08:00
“xxq250” c668fd3530 cloudIDE saas定制api 2022-10-12 15:38:40 +08:00
“xxq250” e7bbe252de cloudIDE saas定制api 2022-10-12 15:37:22 +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” 5c123fba17 头歌接口更换密钥 2022-09-21 16:00:13 +08:00
“xxq250” ec0358d6b2 修改密码token skip 2022-09-19 09:25:49 +08:00
“xxq250” e8ce1e46d4 fixed 返回状态码修正 2022-09-08 14:28:07 +08:00
xiaoxiaoqiong 0f5fd424fb fixed 同步gitea密码,因为加了base64 2022-07-14 11:01:55 +08:00
xiaoxiaoqiong f727e8f94e 用户头像访问取消权限制 2022-06-11 12:35:21 +08:00
yystopf ad9bb8e542 修复: 合并从develop 2022-05-24 18:10:20 +08:00
yystopf e36c7a4b6a 修复: 邮箱搜索不需要return 404 2022-05-24 18:09:36 +08:00
yystopf 9979c87d0c 修复: 合并从develop 2022-05-24 17:27:24 +08:00
yystopf 8e8ec821f2 新增: 根据邮箱来获取用户 2022-05-24 17:26:10 +08:00
xiaoxiaoqiong 85a36ca2e7 fixed 增加自动登录，gitea注册 2022-05-24 14:14:57 +08:00
xiaoxiaoqiong 75cef14605 fixed 增加自动登录，gitea注册 2022-05-24 14:08:33 +08:00
xiaoxiaoqiong b45ee11239 fixed 增加自动登录，gitea注册 2022-05-24 13:46:58 +08:00
xiaoxiaoqiong 643a99fdf1 fixed 增加自动登录，gitea注册 2022-05-24 11:48:56 +08:00
xiaoxiaoqiong b673909f9e fixed 增加自动登录，手机号先记录，后续用 2022-05-24 10:47:17 +08:00
xiaoxiaoqiong ee3a14fa28 fixed 增加自动登录 2022-05-24 10:34:31 +08:00
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