Commit Graph

5304 Commits

Author SHA1 Message Date
1ecd7f26b6 Merge branch 'pre_trustie_server' into trustie_server 2023-12-15 10:49:54 +08:00
d4b46dbf97 Merge branch 'standalone_develop' into pre_trustie_server
# Conflicts:
#	app/controllers/api/v1/issues_controller.rb
#	app/models/identity_verification.rb
#	app/models/issue.rb
#	app/models/journal.rb
#	app/services/api/v1/issues/list_service.rb
2023-12-15 10:40:58 +08:00
d98ad8a3f4 Merge branch 'develop' into standalone_develop 2023-12-15 09:42:30 +08:00
ad96991730 更改:提示语逗号为中文逗号 2023-12-15 09:01:11 +08:00
03283813c2 fixed 用户搜索按昵称和登录时间倒排序 2023-12-14 16:50:13 +08:00
4b57e96914 fixed 用户搜索按昵称和登录时间倒排序 2023-12-14 16:49:44 +08:00
e78f7ab9dd Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2023-12-14 16:45:49 +08:00
835f2db759 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2023-12-14 16:45:36 +08:00
ac601b4b22 Merge branch 'develop' into standalone_develop 2023-12-14 16:45:32 +08:00
c972d538ee fixed 用户搜索按昵称和登录时间倒排序 2023-12-14 16:45:29 +08:00
c75953d343 新增:创建分支已存在分支提示 2023-12-14 16:45:02 +08:00
a2ca6bd91b Merge branch 'develop' into standalone_develop 2023-12-14 11:47:48 +08:00
129970a525 更改:提示语 2023-12-14 11:47:32 +08:00
8be254710e Merge branch 'develop' into standalone_develop 2023-12-14 11:44:18 +08:00
062e654d45 新增:更改密码须验证两次密码 2023-12-14 11:43:42 +08:00
b29e500645 fixed 解决安全问题访问附件,id改为uuid,id查询修改 2023-12-13 09:26:49 +08:00
60c8b25075 fixed 解决安全问题访问附件,id改为uuid,查看附件 2023-12-12 16:57:39 +08:00
247c5a60b1 fixed 解决安全问题访问附件,id改为uuid,关联pages功能修改 2023-12-12 16:47:48 +08:00
de1266ba6c fixed 解决安全问题访问附件,id改为uuid,关联功能修改 2023-12-12 16:41:02 +08:00
9a0809e45b fixed 发行版附件关联 2023-12-12 15:33:48 +08:00
637fcca509 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2023-12-12 15:21:02 +08:00
8264717017 fixed 解决安全问题访问附件,id改为uuid,migrate 2023-12-12 15:20:52 +08:00
a423576ffc Merge branch 'develop' into standalone_develop 2023-12-12 15:03:47 +08:00
852d430178 更改:获取标签详情特殊符号处理 2023-12-12 15:02:03 +08:00
d74901cffa fixed 解决安全问题访问附件,id改为uuid 2023-12-12 14:31:21 +08:00
0cb38bce4f 新增:根据id查询疑修 2023-12-11 16:07:24 +08:00
aac91538aa Merge branch 'develop' into standalone_develop 2023-12-11 09:18:00 +08:00
9ac061f2a9 更改:gemfile 2023-12-11 09:17:43 +08:00
60359333f8 Merge branch 'develop' into standalone_develop 2023-12-11 09:15:29 +08:00
b2250db79a 新增:查看标签详情api 2023-12-11 09:14:47 +08:00
03277d2ad7 commit_log_to_db.rake trustie all 2023-12-09 12:23:17 +08:00
c2a4e62131 commit_log_to_db.rake trustie all 2023-12-09 12:21:37 +08:00
f81b3a0b35 commit_log_to_db.rake trustie 2023-12-09 09:40:03 +08:00
98770ca47e 新增:代码溯源注册后须重新调用登录接口 2023-12-01 17:04:34 +08:00
6fb22d3117 Merge branch 'pre_trustie_server' into trustie_server 2023-12-01 14:59:47 +08:00
d0623e4d57 rake copy attachemnt 2023-12-01 14:59:44 +08:00
c63c0cc636 更改:issue status查询不使用where.not方式 2023-12-01 14:59:13 +08:00
32f03abe84 合并开发分支代码 2023-12-01 14:57:01 +08:00
24b5c4e672 合并开发分支代码 2023-12-01 14:53:48 +08:00
KingChan
f9427f17a3 Merge pull request '调整默认排序' (#235) from KingChan/forgeplus:standalone_develop into standalone_develop 2023-12-01 09:54:45 +08:00
kingchan
d797676639 change created on to updated_on for issue list service 2023-12-01 09:52:32 +08:00
21640fe5e6 更改:issue status和priority初始化数据 2023-12-01 09:48:08 +08:00
KingChan
ba196794a8 Merge pull request '调整 issue 的 order' (#233) from KingChan/forgeplus:standalone_develop into standalone_develop 2023-11-29 15:15:00 +08:00
呱呱呱
3833816a0a update issue order by 2023-11-29 15:11:41 +08:00
a3df60b185 Merge pull request 'url转义函数由CGI.escape改为URI.escape' (#212) from yystopf/forgeplus:standalone_develop into standalone_develop 2023-11-16 13:54:21 +08:00
9e4e30a495 更改:url转义函数 2023-11-16 13:50:49 +08:00
33c56e3e79 fixed 评论回复增加parent_id索引,解决性能问题 2023-11-15 08:53:30 +08:00
ce7a0e4884 fixed 评论回复增加parent_id索引,解决性能问题 2023-11-15 08:53:04 +08:00
27bfeb5fc8 fixed 评论回复增加parent_id索引,解决性能问题 2023-11-15 08:52:23 +08:00
5541002dab Merge branch 'pre_trustie_server' into trustie_server 2023-11-15 08:45:17 +08:00