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

41 Commits

Author SHA1 Message Date
yystopf a7ea0436e4 Merge branch 'standalone_develop' into dev_osredm_server 2025-06-24 16:56:29 +08:00
yystopf 6a7174781c 新增：重新打开pr接口 2025-06-23 19:27:47 +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 4e855a2a7b fixed 删除用户时issue，pr跟随项目数据 2024-10-09 15:00:23 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf c9df8fa3fe 新增：存储pull_request源仓库信息 2024-07-19 11:17:15 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
chenjing 1727435aa6 add pull request state 2023-06-16 11:58:31 +08:00
yystopf 71052c0f7c Merge branch 'develop' into standalone_develop 2023-04-14 15:41:00 +08:00
chenjing 39c2166c12 update pr model and webhook 2023-04-11 10:16:38 +08:00
yystopf cd489d3b97 修改：自定义事件 2023-04-11 10:16:38 +08:00
yystopf 18156ffd8d 新增：合并请求关联疑修逻辑 2023-03-10 14:48:53 +08:00
“xxq250” 4560b9231e fixed 小程序活动 2022-11-04 11:23:47 +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” 4ccf8ea5ff CloudIDEA文件标记已读未读 2022-07-28 16:42:21 +08:00
“xxq250” 19ffd9fea1 fixed PullRequest 统一关联关系字段gitea_id 2022-07-26 10:55:42 +08:00
yystopf 1feb166fd5 修复：合并请求评审模型修改 2022-07-25 16:20:42 +08:00
yystopf 000197b0d1 fix: issues and pull_request length calculate 2022-05-06 17:25:34 +08:00
xiaoxiaoqiong f0fc456a1c merge local 2022-03-30 14:13:42 +08:00
xiaoxiaoqiong 2f06e89b54 竞赛banner_url 2022-03-30 14:10:19 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 69c87fd5a4 add: callback cache 2021-10-26 15:22:42 +08:00
yystopf 91f1f4090f fix: old cache 2021-10-25 18:03:56 +08:00
jasder a825271a36 FIX code bug 2021-09-28 15:59:36 +08:00
jasder 62d1a2378c FIX [更改字段名称]conflicts file for pull api 2021-06-25 17:31:23 +08:00
jasder b7dd12927b ADD conflicts file for pull api 2021-06-24 16:08:32 +08:00
vilet.yy be63beb78b fix: update openning count navbar 2021-06-16 09:49:08 +08:00
vilet.yy bdec369ec2 back: change navbar count 2021-06-11 16:19:43 +08:00
vilet.yy 672f37fe48 add: project detail show open task count 2021-06-11 14:11:44 +08:00
vilet.yy 5489ea9fbc add: applied join project 2021-06-09 16:53:09 +08:00
vilet.yy 02fe8a8966 add: user and platform cache 2021-06-08 11:51:46 +08:00
viletyy c58b074173 fix: init project 2021-06-03 11:27:13 +08:00
jasder 77076c60a6 ADD issue、pull、milestone钩子,自动触发项目的更新时间 2021-05-26 17:37:13 +08:00
Jasder 5b261d6e81 FIX merge develop branch 2021-01-12 17:42:44 +08:00
Jasder 2b140d6f7c FIX pull request bug 2021-01-12 15:45:18 +08:00
Jasder 837aa1ea9e FIX Merge master branch 2020-12-25 15:10:50 +08:00
Jasder 01f79c81cc FIX code review for create pull request 2020-12-23 15:47:08 +08:00
Jasder 60ac66ebe3 ADD db schema in models 2020-11-23 15:35:03 +08:00
sylor_huang@126.com fc9588fb63 Add Dun Check 2020-08-17 18:49:18 +08:00
sylor_huang@126.com 999006fba7 change pr 2020-06-30 09:44:28 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00