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

121 Commits

Author SHA1 Message Date
yystopf a7ea0436e4 Merge branch 'standalone_develop' into dev_osredm_server 2025-06-24 16:56:29 +08:00
呱呱呱 346b815e0a fix bug 2025-06-19 16:27:33 +08:00
呱呱呱 470064ecd5 add Organization destroy create action 2025-06-19 16:24:02 +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
xxq250 b41844f47a fixed 可用流水线仓库actived屏蔽镜像仓库 2024-12-09 11:27:24 +08:00
xxq250 35c0ac4eec fixed 可用流水线仓库actived屏蔽镜像仓库 2024-12-09 11:24:52 +08:00
yystopf 58a02a0fda 更改: 删除组织密码加密处理 2024-11-20 13:56:42 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
xxq250 4516558e6f fixed 附件增加参数过虑导入失败项目 2024-08-22 14:58:02 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
xxq250 0a2ab5eddc Merge branch 'standalone_develop' into pm_project_develop 2024-04-29 11:11:18 +08:00
xxq250 b236733637 fixed 解散团队中成员在其他组织其他团队不存在的成员需清除组织 2024-04-29 11:11:01 +08:00
xxq250 9835f4f84f Merge branch 'standalone_develop' into pm_project_develop 
# Conflicts:
#	app/models/attachment.rb
#	app/views/api/v1/attachments/_simple_detail.json.jbuilder
 2024-04-29 09:11:08 +08:00
xxq250 c591a445f0 fixed 解散团队中成员在其他组织其他团队不存在的成员需清除组织 2024-04-29 09:07:36 +08:00
yystopf 36ae4a9cb5 新增：组织featured_content 2024-04-03 15:14:52 +08:00
yystopf be531eb283 Merge branch 'standalone_develop' into pm_project_develop 2024-03-06 08:56:37 +08:00
xxq250 8ca9ced360 fixed 组织成员数取组织内成员和组织所有仓库成员组合,排序加入时间 2024-01-30 08:27:49 +08:00
xxq250 d2663eb7b7 fixed 组织成员数取组织内成员和组织所有仓库成员组合 2024-01-29 16:05:04 +08:00
yystopf d55ff07296 新增：排除组织项目ID参数 2024-01-15 10:59:01 +08:00
yystopf f893ce41d0 新增：排除组织项目ID参数 2024-01-15 10:52:30 +08:00
呱呱呱 776533be8c fix bugs 2023-11-16 15:30:16 +08:00
呱呱呱 84895231dc 调整未关联issue 和设定组织搜索空间范围 2023-11-16 15:08:04 +08:00
呱呱呱 d60ba95444 OrganizationUsers add pm_check_user 2023-10-12 11:25:23 +08:00
呱呱呱 19d36af37f update 2023-10-12 11:12:53 +08:00
chenjing 65eaafe003 fix admins org and show private org's cla 2023-06-19 15:25:38 +08:00
chenjing fed604989f cla show add response 2023-06-16 10:35:10 +08:00
chenjing d5807c0df0 cla send issue journal 2023-06-16 10:19:38 +08:00
chenjing fccf36e1eb update response for cla 2023-06-15 14:01:36 +08:00
chenjing 6b772ea889 fix cla 2023-06-14 16:53:24 +08:00
chenjing 78a1d48a3e fix bug 2023-06-14 11:58:51 +08:00
chenjing bde9220641 change cla 2023-06-13 17:16:30 +08:00
chenjing cfaa5301ea cla init 2023-06-13 15:30:16 +08:00
xxq250 e50d4bdf34 仓库语言缓存随着项目数变化，计算调整 2023-04-27 18:10:35 +08:00
xxq250 9630fbfec5 仓库语言缓存随着项目数变化，计算调整 2023-04-27 18:07:43 +08:00
xxq250 1bfaa44af5 仓库语言缓存随着项目数变化 2023-04-27 09:29:13 +08:00
xxq250 73d441397c 组织语言缓存处理 2023-04-10 15:13:21 +08:00
xxq250 5eff025f62 组织首页改版，增加精选、新闻 2023-04-10 15:09:41 +08:00
xxq250 6f7b40ec24 fixed 搜索用户项目时过虑表情字符 2023-03-09 16:22:48 +08:00
xxq250 d9833ef1bf 更改组织可见性为私有，则需将该组织下的所有仓库同步更改为私有仓库 2022-12-09 14:18:19 +08:00
xxq250 f796d1be42 更改组织可见性为私有，则需将该组织下的所有仓库同步更改为私有仓库 2022-12-09 14:03:41 +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
yystopf 383660c778 更改：组织缓存信息方式改在控制器里面 2022-09-15 09:38:28 +08:00
yystopf aa50c50254 修复 2022-08-30 10:40:27 +08:00
yystopf 0f41cabe71 新增：添加全部或者移除全部团队项目 2022-08-30 10:23:35 +08:00
“xxq250” d04ed7e008 fixed 组织成员列表查询优化 2022-08-29 10:05:56 +08:00
“xxq250” 2fe5fc369c 组织项目风雷协议特别处理 2022-08-05 16:46:11 +08:00
“xxq250” cfadde830f fixed 组织新闻增加标题和跳转url 2022-07-29 14:54:24 +08:00
“xxq250” 2d306e20fb fixed 精选项目不包含私有仓库 2022-07-28 16:10:48 +08:00