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

115 Commits

Author SHA1 Message Date
yystopf ebf1c1d31b Merge branch 'standalone_develop' into dev_osredm_server 2025-09-04 11:32:49 +08:00
yystopf 9942974c42 更改：负责人排序规则 2025-09-04 11:30:46 +08:00
yystopf bda93ed5b1 Merge branch 'standalone_develop' into dev_osredm_server 2025-08-01 15:37:56 +08:00
yystopf 95f49450b0 新增：关联的疑修操作日志 2025-08-01 15:36:59 +08:00
xxq250 76241fb74d Merge branch 'standalone_develop' into dev_osredm_server 
# Conflicts:
#	config/harmonious_dictionary/chinese_dictionary.txt
#	config/harmonious_dictionary/harmonious.hash
 2025-07-29 11:33:48 +08:00
yystopf cece63286e 更改：排序正序倒序 2025-07-24 16:09:06 +08:00
yystopf debefe2e7c 新增：排序正序与倒序 2025-07-24 10:15:49 +08:00
yystopf ad2f42bed6 新增：排序正序与倒序 2025-07-24 10:13:43 +08:00
yystopf 473b9e3dfd 新增：负责人筛选 2025-07-24 09:59:45 +08:00
yystopf b628addafc 更改：更新子任务不更新任务的更新时间 2025-07-17 14:29:50 +08:00
yystopf f304b9d890 Merge remote-tracking branch 'origin/standalone_develop' into dev_osredm_server 2025-05-28 09:28:02 +08:00
xxq250 870eacaced fixed issue增加企业标识 2025-05-21 09:33:00 +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 9cdc593763 新增: 组织工作台部分接口以及关联工作项变动 2024-12-10 17:20:08 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf 91399808c4 新增：创建操作记录逻辑 2024-08-21 16:05:45 +08:00
xxq250 076683b006 fixed 错误代码 2024-05-30 11:32:00 +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
kingChan 10b404f750 解决合并问题 2024-05-23 17:56:27 +08:00
kingChan 52aeb9ec07 merge 
修复issue删除失败问题
 2024-05-23 17:54:46 +08:00
kingChan 907098619b 修复issue删除失败问题 2024-05-23 17:39:42 +08:00
KingChan 5edd492343 Merge pull request '修复pm工作项被删除后 关联项依然还存在的问题' (#283) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2024-05-23 17:24:07 +08:00
kingChan 0d0f25777a 新增issue 关联 修复pm工作项被删除后 关联项依然还存在的问题 2024-05-23 17:20:30 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
yystopf d20a7b65c2 fix 2024-03-06 09:02:25 +08:00
yystopf be531eb283 Merge branch 'standalone_develop' into pm_project_develop 2024-03-06 08:56:37 +08:00
呱呱呱 f3dd40515a fix bug check_pm_and_update_due_date 2024-01-31 10:21:31 +08:00
呱呱呱 9e90b2cef3 update check_pm_and_update_due_date for issue 2024-01-31 09:19:20 +08:00
呱呱呱 65d2387931 update 2024-01-31 09:08:38 +08:00
yystopf 354242a290 修复 2024-01-18 09:58:30 +08:00
yystopf f468f0cf67 更改：统计issue数量不应该统计pr关联的issue数量 2024-01-17 17:39:51 +08:00
yystopf 7d813c0ebe 新增：项目缓存加入关闭issue数量 2024-01-15 16:41:54 +08:00
呱呱呱 d590e1165e website update 2023-12-20 09:22:10 +08:00
xxq250 d74901cffa fixed 解决安全问题访问附件，id改为uuid 2023-12-12 14:31:21 +08:00
yystopf 947117ac5f 新增：父子关系判断以及可设置为父工作项的列表 2023-12-12 09:47:54 +08:00
yystopf 1a067d0607 更改：child_count使用count_cache 2023-11-23 08:53:02 +08:00
xxq250 778f9563f3 fixed 解决安全问题访问附件id改为uuid，统一处理，issue不单独处理 2023-11-22 11:38:34 +08:00
xxq250 2ea41d0100 fixed 解决安全问题访问附件，id改为uuid 2023-11-22 11:17:22 +08:00
KingChan 6ae4aded65 Merge pull request '新增 uuid' (#229) from KingChan/forgeplus:pm_project_develop into pm_project_develop 2023-11-21 17:11:51 +08:00
呱呱呱 2985dc7902 add uuid 2023-11-21 17:06:43 +08:00
yystopf 8030d7db1a 更改：删除工作项需删除子工作项放到回调中 2023-11-20 09:38:52 +08:00
呱呱呱 f9f0485e50 issue project 为nil时的特殊处理 2023-11-16 10:46:00 +08:00
yystopf 0c553203c1 新增：issue更新者字段 2023-11-14 10:52:15 +08:00
呱呱呱 a572554102 rename 2023-11-08 10:59:30 +08:00
呱呱呱 3fa3f3a7cc issue refresh aftercreate change to aftersave 2023-11-08 10:57:31 +08:00
呱呱呱 43be8d1724 update 2023-11-08 10:54:09 +08:00
呱呱呱 c752671453 issue links 2023-11-07 17:16:25 +08:00
呱呱呱 289cb08ccd issue time_scale 2023-11-07 09:40:50 +08:00
呱呱呱 770f743750 issue pm 2023-10-31 17:03:35 +08:00
xxq250 e4bf925905 fixed issue和评论里的附件解析关联，增强附件访问权限控制,切换到 项目保护 2023-10-31 08:19:41 +08:00