Nigel
/
forgeplus
forked from Gitlink/forgeplus
0
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
4,143 Commits 16 Branches 0 Tags 707 MiB
Commit Graph

126 Commits

Author SHA1 Message Date
zhangxunhui dc486d0a73 update issue controller for blockchain 2023-01-28 16:50:46 +08:00
xxq250 fc4db3bb9a Merge branch 'dev_nanda' of https://gitlink.org.cn/Gitlink/forgeplus 
# Conflicts:
#	app/controllers/application_controller.rb
#	app/controllers/pull_requests_controller.rb
#	app/controllers/users_controller.rb
#	app/models/ci/user.rb
#	app/models/gitea/pull.rb
#	app/models/gitea/webhook.rb
#	app/models/gitea/webhook_task.rb
#	app/models/organization.rb
#	app/models/project.rb
#	app/models/project_category.rb
#	app/models/user.rb
#	app/services/projects/create_service.rb
 2023-01-12 17:51:48 +08:00
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
zhangxunhui 6b83719632 merge conflict 2022-05-12 09:15:36 +08:00
yystopf 50dc5cce5d fix 2022-05-07 14:06:48 +08:00
Xunhui Zhang 8cf576946b merge conflicts 2022-05-06 21:48:59 +08:00
yystopf 000197b0d1 fix: issues and pull_request length calculate 2022-05-06 17:25:34 +08:00
yystopf ae7d0d1329 add: issues description and journals notes validate 2022-05-06 09:56:22 +08:00
yystopf bc639488aa fix: issues filter error 2022-03-22 10:45:14 +08:00
yystopf 22293572ac fix: issue changed about version callback 2022-02-14 17:02:59 +08:00
yystopf 1e9a32a93e fix: issues select count paginator 2022-01-25 11:39:06 +08:00
yystopf 2dc79052c2 fix: create project trend when status is closed 2022-01-25 10:34:20 +08:00
yystopf e14936e820 fix: issues select count 2022-01-24 10:00:44 +08:00
yystopf 4304a35b80 fix 2021-12-28 11:07:40 +08:00
yystopf 4432e65683 fix: operate issue permission reset 2021-12-27 17:32:35 +08:00
yystopf 7a93db9ed2 fix: labels limit and issues operate field 2021-11-30 13:58:51 +08:00
yystopf 7586a0fb21 fix: change issue tag change size 2021-11-29 10:27:41 +08:00
yystopf 1a449d1dc6 add: atme service 2021-11-08 11:35:14 +08:00
yystopf ff97daac54 fix 2021-10-18 13:52:52 +08:00
yystopf 1b87a7a733 fix: send message job need open notice menu 2021-10-18 13:51:25 +08:00
yystopf 2a09fadf71 fix: change projec trend rule and fix data 2021-10-15 14:36:50 +08:00
yystopf 46ab55d50f fix: issue change operate permission and repository detail remove garbage 2021-10-09 09:50:56 +08:00
qyzh 34212a3468 merge gitlink/develop 2021-09-28 16:31:33 +08:00
jasder 4f3dc2b627 Merge pull request '同步镜像项目增加重试机制，更新项目去掉一些验证，易修访问权限修复' (#160) from yystopf/forgeplus:hh_fix_bug into develop 2021-09-28 15:27:11 +08:00
yystopf 12681b0842 fix: issue visit permission 2021-09-17 14:56:34 +08:00
yystopf 41d04e9e99 fix: 标签改为标记 2021-09-16 18:39:19 +08:00
yystopf a1679cfc53 fix some template and add copy issue message 2021-09-16 17:29:07 +08:00
yystopf dbcbc01251 fix and add some message feature 2021-09-16 16:54:49 +08:00
yystopf 88bc5f29ff add: message touch condition 2021-09-15 18:55:58 +08:00
yystopf e9915cb654 add: change project menu authorize 2021-09-03 09:37:30 +08:00
yystopf c52458a7e3 add: require profile completed 2021-09-02 10:55:31 +08:00
yystopf 486ed960ca fix: issue series update 2021-08-17 15:33:03 +08:00
yystopf ede2f7199a fix: not edit issue create journal 2021-08-03 17:24:23 +08:00
vilet.yy d1939116a3 fix: authorize 2021-07-01 13:58:36 +08:00
vilet.yy 2a72fc56a4 fix: copy issue author id 2021-07-01 13:56:15 +08:00
vilet.yy 6c3c1ce093 fix: issue show permission 2021-06-25 17:54:22 +08:00
vilet.yy 4126ea7b4e fix: some bug from security 2021-06-22 15:54:42 +08:00
vilet.yy 526920f564 fix: version issues count except pull requests count 2021-06-21 18:50:45 +08:00
jasder 67e49a4f56 FIX 修复pulls、issues 搜索数量统计问题 2021-06-18 10:52:14 +08:00
vilet.yy 80c1573aea fix: change issue navbar count 2021-06-16 10:42:04 +08:00
nigel007 6d399fe8d5 add 存证信息 2021-05-13 22:27:25 +08:00
nigel007 c069bb0544 merge conflict 2021-05-11 21:38:22 +08:00
guotao c96dacbf88 修复编号：45283 易修标题过长导致排版问题 去掉多余的属性 2021-05-07 16:26:56 +08:00
guotao 1021731d2b 修复编号：45283 易修标题过长导致排版问题 2021-05-07 10:45:31 +08:00
nigel007 bc2721deb0 resolve conflicts 2021-04-23 22:27:02 +08:00
nigel007 3ad45f86f2 change blockchain related functions 2021-04-23 21:36:22 +08:00
qyzh 8b11fb604a 新增：发表issue奖励 2021-04-20 09:58:43 +08:00
qyzh 244c1b865a merge integrated_blockchain 2021-04-08 16:19:27 +08:00
vilet.yy f1ed61c687 add: menu permission control 2021-03-19 18:01:29 +08:00
nigel007 f4f1aef365 更新了显示文字，增加了功字 2021-01-03 17:08:44 +08:00