Commit Graph

161 Commits

Author SHA1 Message Date
yystopf ccec8e9819 Merge branch 'develop' into dev_jk_server 2022-12-12 16:17:22 +08:00
yystopf 64c6f69f56 新增:统计项目分类下私有项目的数量 2022-11-15 14:25:35 +08:00
“xxq250” 7cc9d207b6 fixed 项目列表查询count优化 2022-11-08 17:18:04 +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” 517d84c3bd fixed 项目列表查询排序,风雷改为可配置 2022-09-14 09:24:14 +08:00
“xxq250” 851577ea7c fixed 项目列表查询排序,风雷改为可配置 2022-09-14 09:23:22 +08:00
“xxq250” 8fdb2df0ef fixed 项目列表查询排序,增加推荐 2022-09-14 09:19:11 +08:00
“xxq250” 12c91ca680 fixed 项目列表查询排序fork项目放后面 2022-09-13 18:02:46 +08:00
“xxq250” d3967f25ad fixed 项目列表查询排序fork项目放后面 2022-09-13 17:55:35 +08:00
xiaoxiaoqiong 44db7c48f9 风雷主项目固定排第一 2022-06-21 10:22:20 +08:00
xiaoxiaoqiong 861a84d8ec 风雷主项目固定排第一 2022-06-21 10:19:40 +08:00
xiaoxiaoqiong d496e1c01e 风雷主项目固定排第一 2022-06-21 10:13:58 +08:00
xiaoxiaoqiong e4b2563780 风雷主项目固定排第一 2022-06-21 10:11:53 +08:00
xiaoxiaoqiong 944fb3b89e 风雷主项目固定排第一 2022-06-21 10:06:59 +08:00
yystopf a6cee63d17 fix: change owner must fix foreign_key 2022-05-07 11:57:58 +08:00
yystopf 7c88ea3d67 add: quit repo 2022-05-05 10:00:02 +08:00
yystopf 088c617cc1 add: name query for branches 2022-04-26 17:15:59 +08:00
yystopf e489c57fe8 fix: merge from develop 2022-03-10 11:07:14 +08:00
yystopf e1cf2fcdeb fix: owner project not allow repeat name 2022-03-07 10:25:05 +08:00
xiaoxiaoqiong 2e511655f6 Merge branch 'develop' into dev_jk_server
# Conflicts:
#	app/models/concerns/matchable.rb
#	config/routes.rb
2022-02-17 18:31:25 +08:00
xiaoxiaoqiong 8720cab1e9 通过配置确定github克隆方式 2022-02-14 16:53:29 +08:00
yystopf 29dc3fff39 fix: migrate use old rule 2022-02-11 16:27:22 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf f9bc2258ec fix: migrate repo github use another addr 2022-01-11 10:48:29 +08:00
yystopf 2a09ced1ce fix: branches use branch name api 2022-01-07 15:41:50 +08:00
yystopf 1faaf1d7d1 fix: project menu list wiki location 2021-12-13 11:45:58 +08:00
yystopf 66d1246a6c fix: educoder project menu return 2021-12-09 15:54:21 +08:00
viletyy b81d92af46 add: platform statistic 2021-12-02 14:39:53 +08:00
jasder 689b24da8f FIX 修改设置默认分支出错的bug 2021-11-10 16:35:26 +08:00
yystopf 46405e704a add: rank not include deleted project 2021-11-02 09:59:21 +08:00
yystopf 81ab0b01c0 fix: banner recommend remove login require 2021-10-28 14:21:42 +08:00
yystopf a43f6714de add: project explore api 2021-10-27 14:20:27 +08:00
yystopf e1b0abbf31 fix 2021-10-27 09:20:46 +08:00
yystopf 69c87fd5a4 add: callback cache 2021-10-26 15:22:42 +08:00
yystopf 24ec039895 fix 2021-10-21 11:23:12 +08:00
yystopf 1b87a7a733 fix: send message job need open notice menu 2021-10-18 13:51:25 +08:00
yystopf a4ee529216 fix: allow update repository identifier origin 2021-10-15 16:47:01 +08:00
yystopf 98a45eb05c fix: update repository identifier valid 2021-10-14 17:03:36 +08:00
yystopf 00100e59c4 add: project permit change identifier 2021-10-14 17:03:36 +08:00
yystopf 018745c062 add: project permit change identifier 2021-10-14 17:03:36 +08:00
yystopf 1198830422 add: project permit change identifier 2021-10-14 17:03:36 +08:00
yystopf 33473eecc2 fix: tag addition message 2021-09-29 11:34:21 +08:00
yystopf 91feb8cf89 add: project branch_slice 2021-09-29 11:34:21 +08:00
yystopf 88bc5f29ff add: message touch condition 2021-09-15 18:55:58 +08:00
jasder e594c72c43 Merge pull request '一些bug修复' (#147) from yystopf/forgeplus:hh_fix_bug into develop 2021-09-10 18:30:40 +08:00
jasder e38539445d FIX delete some mandatory field with migrate repo api 2021-09-09 14:34:29 +08:00
jasder 67d4544d6b FIX delete some mandatory field with projects list api 2021-09-09 13:50:31 +08:00
yystopf 84aed0391a fix: project list query 2021-09-07 17:19:38 +08:00
jasder cb1d77ee6d Merge pull request '系统保留关键词模块' (#137) from yystopf/forgeplus:hh_reversed_keyword into develop 2021-09-03 17:52:48 +08:00
yystopf 9926bff60d add: reversed keyword tip_exception 2021-09-03 17:30:44 +08:00