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

890 Commits

Author SHA1 Message Date
xxq250 9065029d08 Merge branch 'master' into sponsor 
# Conflicts:
#	.gitignore
#	Gemfile
#	Gemfile.lock
#	app/controllers/accounts_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/compare_controller.rb
#	app/controllers/journals_controller.rb
#	app/controllers/members_controller.rb
#	app/controllers/pull_requests_controller.rb
#	app/controllers/settings_controller.rb
#	app/controllers/users_controller.rb
#	app/controllers/version_releases_controller.rb
#	app/models/gitea/webhook_task.rb
#	app/models/message_template/pull_request_atme.rb
#	app/models/project.rb
#	app/models/project_category.rb
#	app/models/user_extension.rb
#	app/views/users/get_user_info.json.jbuilder
#	app/views/users/show.json.jbuilder
#	config/routes.rb
 2023-01-12 17:33:18 +08:00
xxq250 56d9a4f46b fixed 代码贡献者email 2023-01-06 11:17:19 +08:00
xxq250 18ad80c51c fixed 授权登录绑定账号 2022-12-30 10:26:59 +08:00
xxq250 87ee19e882 fixed 授权登录绑定账号返回用户信息 2022-12-26 11:19:58 +08:00
xxq250 d821006cb5 fixed 邮件发送模板 2022-12-16 12:03:51 +08:00
yystopf a15d0827b7 merge from develop 2022-12-09 11:49:26 +08:00
yystopf 204554b34c Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-12-09 11:45:36 +08:00
yystopf bc2992cc3d 新增：后台管理更改用户信息邮箱需同步至gitea 2022-12-09 11:45:31 +08:00
xxq250 edd1d27b0a fixed 用户项目跳转链接修正 2022-12-09 11:04:24 +08:00
xxq250 3edac3656a fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 18:14:43 +08:00
xxq250 487630ad1c fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:28:31 +08:00
xxq250 3db761e2ae fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:25:54 +08:00
xxq250 988ebf3fc3 fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:19:03 +08:00
xxq250 6350d2e5a9 fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:19:02 +08:00
xxq250 d0b638cbc0 fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:16:21 +08:00
xxq250 1c16b74f1b fixed 下载文件类增加xlsx,Makefile可显示 2022-12-08 17:15:33 +08:00
yystopf a01c98164a Merge branch 'develop' into standalone_develop 2022-12-08 11:52:38 +08:00
yystopf bc6f5cec4d 新增：仓库贡献者行数查询接口 2022-12-08 11:51:59 +08:00
xxq250 cbe10b4b89 fixed 第三方授权登录(github,gitee,qq,wechat)，输出URL到前端 2022-12-01 18:03:06 +08:00
xxq250 66a1be944a fixed 组织用户不存在 2022-11-28 11:20:44 +08:00
xxq250 70ba78a9b5 fixed 组织用户不存在 2022-11-28 11:19:56 +08:00
xxq250 29d2ca63ed 取消lastname同步nickname 2022-11-23 18:15:27 +08:00
yystopf a6923bf7ed 新增：get_user_info电话号码展示 2022-11-23 17:44:37 +08:00
“xxq250” a01831e416 fixed banner增加url跳转 2022-11-17 15:04:23 +08:00
“xxq250” 19d32799a9 fixed banner url 2022-11-17 14:59:19 +08:00
“xxq250” 4e6e654e1f banner配置增加跳转URL 2022-11-17 14:58:51 +08:00
yystopf 9f74651a2b Merge branch 'develop' into standalone_develop 2022-11-15 14:42:07 +08:00
yystopf 255b615327 更改：项目首页分类后数量更改 2022-11-15 14:41:08 +08:00
yystopf 64c6f69f56 新增：统计项目分类下私有项目的数量 2022-11-15 14:25:35 +08:00
yystopf 6e46b683e1 Merge branch 'develop' into standalone_develop 2022-11-11 14:13:56 +08:00
yystopf 4cde7c374e 更改：反馈意见编辑器隐藏上传按钮 2022-11-11 14:04:36 +08:00
yystopf 7492662f7d Merge branch 'develop' into standalone_develop 2022-11-10 16:22:40 +08:00
yystopf ef83697cb8 修复：tooltip闪烁问题 2022-11-10 16:21:43 +08:00
yystopf 6dc06fc088 Merge branch 'develop' into standalone_develop 2022-11-10 11:03:08 +08:00
yystopf 570f664c27 修复：标记issue数量问题 2022-11-10 11:02:50 +08:00
yystopf e92588cf6d Merge branch 'develop' into standalone_develop 2022-11-09 14:56:43 +08:00
yystopf e24921bba3 修复 2022-11-09 14:56:27 +08:00
yystopf f75e05bb84 Merge branch 'develop' into standalone_develop 2022-11-09 14:55:06 +08:00
yystopf e4d62c5335 新增：字符串截取展示 2022-11-09 14:54:43 +08:00
yystopf 33a3d7f48c merge from develop 2022-11-09 14:37:27 +08:00
yystopf 7817487ab7 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-11-09 11:37:18 +08:00
yystopf 83b46fcb50 新增：用户反馈意见后台管理逻辑 2022-11-09 11:37:12 +08:00
“xxq250” 1f2af50091 fixed 项目列表查询count优化 2022-11-08 17:20:29 +08:00
“xxq250” 7cc9d207b6 fixed 项目列表查询count优化 2022-11-08 17:18:04 +08:00
viletyy 0a06b2098b Merge branch 'develop' into standalone_develop 2022-11-02 14:22:14 +08:00
yystopf 07aefa79eb 更改：项目后台管理移除精选设置 2022-11-02 14:21:49 +08:00
“xxq250” 969cbcfe60 fixed users/me返回email,用于三方登录 2022-10-21 17:44:02 +08:00
viletyy 2da84146eb Merge branch 'develop' into standalone_develop 2022-10-21 14:32:03 +08:00
yystopf cad7e24299 修复：项目列表表头样式 2022-10-18 15:53:37 +08:00
yystopf 3b15dd84fc 新增：标签列表返回总数 2022-10-18 14:52:15 +08:00