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

170 Commits

Author SHA1 Message Date
xxq250 83261f5ae3 fixed 手机验证码临时性略过 2025-05-12 16:18:17 +08:00
xxq250 ba4a9687a6 Merge branch 'standalone_develop' into dev_osredm_server 
# Conflicts:
#	app/controllers/accounts_controller.rb
 2025-03-31 20:52:18 +08:00
xxq250 076d92a3eb fixed 密码处理，兼容base64 2025-03-31 20:47:23 +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
yystopf f49d5d5c3a 更改: password参数传递使用加密后的 2024-11-20 11:52:26 +08:00
xxq250 0cff620a0d fixed 项目名称长度100 2024-09-23 13:44:24 +08:00
xxq250 bcfb8985d7 fixed 项目名称长度100 2024-09-23 12:43:53 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf 655ac8ec67 fix 2024-08-23 16:04:04 +08:00
yystopf 771798220c 新增：导入项目服务参数 2024-08-23 10:02:07 +08:00
yystopf b0ec4d7e9e 更改：创建项目强关联 2024-07-04 16:47:25 +08:00
yystopf 551f9cbbad 新增：创建项目建立与gitea的关联关系 2024-07-03 10:54:33 +08:00
xxq250 93e3955c8d fixed 合并主干所有代码,错误代码 2024-05-21 13:56:51 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
yystopf 68bdf7856e 新增：需求字段 2024-04-12 09:15:28 +08:00
yystopf cc6d9c668e 新增：创建审核记录remark字段 2024-04-10 10:59:35 +08:00
yystopf 74d99b3785 更改：需要登录才能操作 2024-04-08 15:26:41 +08:00
yystopf 7440a79cc4 修复：unit不包含dataset正确返回以及字段验证 2024-04-07 14:28:42 +08:00
yystopf f12b8a300d 新增：访问审核功能接口 2024-04-07 11:35:48 +08:00
yystopf d95fefe589 Merge branch 'develop' into standalone_develop 2024-03-06 16:28:47 +08:00
yystopf 0e31daf9a8 修复：恢复auto_init 2024-03-06 16:27:43 +08:00
yystopf f35dddbbf7 fix 2024-03-01 17:36:58 +08:00
yystopf 59e8ce206f merge from develop 2024-03-01 16:58:29 +08:00
yystopf 447429a663 新增：创建项目auto_init参数 2024-01-31 16:47:00 +08:00
yystopf c89c394374 Merge branch 'develop' into standalone_develop 2024-01-11 13:40:04 +08:00
yystopf 35e6d945dd 更改：组织标识正则 2024-01-11 13:39:13 +08:00
chenjing 6b772ea889 fix cla 2023-06-14 16:53:24 +08:00
chenjing 04b3351962 change validate for create cla 2023-06-14 10:46:48 +08:00
chenjing cfaa5301ea cla init 2023-06-13 15:30:16 +08:00
chenjing e90c79486a add github token for mirror 2023-06-06 10:18:32 +08:00
xxqfamous dbdd2f8968 fixed 修改用户参数错误 2023-05-30 12:32:41 +08:00
xxqfamous 5fa1709664 fixed 修改用户 2023-05-30 11:38:00 +08:00
xxq250 5343fcf29e 项目标识提示文案统一 2023-05-08 16:40:57 +08:00
xxq250 5c26a6a877 项目标识提示文案统一 2023-05-08 16:33:43 +08:00
yystopf e1c51642e5 Merge branch 'develop' into standalone_develop 2023-04-13 11:17:54 +08:00
yystopf 6eea21821f 修复 2023-04-13 11:17:46 +08:00
yystopf ddf829eb8e Merge branch 'develop' into standalone_develop 2023-04-13 11:12:35 +08:00
yystopf 64f34cc868 更改：项目标识提示语 2023-04-13 11:12:27 +08:00
yystopf d6335af0ad Merge branch 'develop' into standalone_develop 2023-04-07 11:27:27 +08:00
yystopf 60b0ee6b28 更改：项目标识提示语 2023-04-07 11:27:19 +08:00
yystopf 582f364b16 修复 2023-03-10 14:49:20 +08:00
xxq250 b1c10d66f9 区块链确权相关 2023-03-02 13:49:50 +08:00
xxq250 aab1e42240 本地版不需要验证码 2022-12-06 09:44:37 +08:00
xxq250 0ec06bf54d 本地版不需要验证码 2022-12-06 09:42:18 +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” fba7c7f8b9 去掉namespace为空检测 2022-09-15 16:07:50 +08:00
“xxq250” 199240962a 注册增加单位和类型 2022-09-15 16:01:23 +08:00
yystopf 4ed846a68b 更改：导入用户规则 2022-09-13 08:54:56 +08:00
yystopf a0413be4b9 Merge branch 'develop' into standalone_develop 2022-09-06 14:58:02 +08:00
yystopf a438ab6f3e 新增：提示语locale配置 2022-09-06 14:57:54 +08:00