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

154 Commits

Author SHA1 Message Date
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf cadafb6fe0 更改：测试环境debug用户id 2024-09-13 14:03:58 +08:00
yystopf 2033b2cbf0 add: debug user 2024-09-11 11:30:00 +08:00
yystopf 7dda079ff3 Merge branch 'standalone_develop' into pm_project_develop 2024-07-11 10:07:20 +08:00
yystopf c9d8ce073f 新增：gitlink菜单权限 2024-07-01 09:55:20 +08:00
yystopf ae842938c2 新增：gitlink角色分级菜单完成 2024-06-28 11:51:55 +08:00
xxq250 9555cc3499 fixed 错误代码 2024-06-05 09:14:51 +08:00
xxq250 d6e11efcf1 fixed 错误代码 2024-05-29 17:34:35 +08:00
xxq250 93f83c7142 Merge branch 'pm_project_develop' into dev_osredm_server 
# Conflicts:
#	.gitignore
#	Gemfile.lock
#	app/controllers/application_controller.rb
#	app/controllers/organizations/projects_controller.rb
#	app/models/attachment.rb
#	app/models/issue.rb
#	app/models/token.rb
#	app/views/organizations/projects/index.json.jbuilder
#	config/application.rb
#	config/routes/api.rb
 2024-05-29 17:28:58 +08:00
xxq250 a044e59a68 fixed 合并主干所有代码,错误代码 2024-05-21 09:10:05 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
xxq250 cb0ecc4194 fixed 多浏览器退出账号时，token不存在处理 2024-04-30 15:35:35 +08:00
yystopf cb125dc85f Merge branch 'develop' into standalone_develop 2024-03-22 08:49:36 +08:00
yystopf b91358a7fe 新增：查询用户需传type值 2024-03-22 08:49:26 +08:00
xxq250 6f01ce170e fixed 注册时支持中划线的邮箱地址 2023-08-22 13:59:02 +08:00
xxq250 86a583017b fixed diff接口切换到hat 2023-07-11 17:06:04 +08:00
xxqfamous 18a4833759 接口请求限流 2023-06-08 14:00:06 +08:00
xxqfamous 9f40886c45 接口请求限流 2023-06-08 13:58:07 +08:00
xxqfamous f1ab52da5c 接口请求限流 2023-06-08 11:25:03 +08:00
yystopf bb73cb111a Merge branch 'develop' into standalone_develop 2023-04-19 10:15:19 +08:00
yystopf 82ba843d7d 新增：发送邮件及短信次数控制 2023-04-19 10:15:07 +08:00
yystopf 76028a71f0 Merge branch 'develop' into standalone_develop 2023-03-24 14:37:49 +08:00
yystopf 01467a3d2a 新增：个人项目分页limit使用9999 2023-03-24 14:37:42 +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 a7e493b821 修复 2023-03-10 14:49:20 +08:00
yystopf 00eda17c2c 修复：请求gitea接口需获取当前用户token 2023-03-10 14:49:20 +08:00
xxq250 b1c10d66f9 区块链确权相关 2023-03-02 13:49:50 +08:00
xxq250 1cd43de75b 增加Bot授权相关 2023-02-15 18:37:36 +08:00
yystopf e1c600a2f5 更改：分页大小最高限制为50 2023-01-05 15:40:03 +08:00
xxq250 4e244bed3a 增加手机验证码校验 2022-11-24 14:28:49 +08:00
xxq250 fd2b20ed87 个人资料修改手机号 2022-11-24 11:09:58 +08:00
“xxq250” 134a395ffa fixed 区分找回密码邮件标题 2022-11-15 14:31:18 +08:00
“xxq250” 518f373b88 增加ucloud短信发送通道 2022-11-15 10:03:01 +08:00
“xxq250” a4c892ec0a fixed cloudIDE saas定制api 2022-10-25 11:19:59 +08:00
“xxq250” 4cc4ed5864 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-10-21 09:42:27 +08:00
“xxq250” 0a5dd2f1ee ssh公钥允许token请求 2022-10-21 09:42:21 +08:00
“xxq250” 480f2b6516 Merge branch 'develop' into dev_jk_server 
# Conflicts:
#	app/controllers/attachments_controller.rb
#	app/controllers/members_controller.rb
 2022-10-17 11:16:10 +08:00
viletyy 2df259c927 Merge branch 'develop' into standalone_develop 2022-10-14 15:02:53 +08:00
yystopf 83f1263f85 修复：更改查询项目判断条件 2022-10-14 14:52:25 +08:00
“xxq250” 0f6ebbbf2f 合并develop代码 2022-09-27 15:35:30 +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” 2609908d6b 取消请完善资料后再操作 2022-09-14 18:03:03 +08:00
“xxq250” 80ec837964 用户信息增加单位和类型 2022-09-14 16:21:40 +08:00
“xxq250” 1193acc3a9 token访问 2022-09-06 17:01:14 +08:00
“xxq250” 640094def7 token访问 2022-09-06 16:43:43 +08:00
“xxq250” 6c0bd6a6fe fixed 竞赛列表分页 2022-09-06 16:34:38 +08:00
“xxq250” d51bb7030f Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/views/users/get_user_info.json.jbuilder
 2022-08-30 18:14:17 +08:00
“xxq250” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
yystopf 5c5b4b5d92 新增：分页数量限制修改 2022-08-24 10:30:23 +08:00