forgeplus

Commit Graph

Author	SHA1	Message	Date
“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
yystopf	1feb166fd5	修复：合并请求评审模型修改	2022-07-25 16:20:42 +08:00
yystopf	76cc185a1d	新增: 合并请求审核model	2022-06-29 17:16:29 +08:00
yystopf	c42f3d5928	新增：邀请用户链接生成	2022-06-17 14:06:59 +08:00
yystopf	4bbb843edf	add: trace users and get trace token	2022-03-31 12:54:39 +08:00
yystopf	04f2dbee9a	merge from develop	2022-01-18 15:30:57 +08:00
yystopf	86d634d94f	add: notice message skeletal code	2021-09-13 10:34:28 +08:00
jasder	4c41d50506	ADD 后台系统配置管理功能	2021-09-10 15:29:08 +08:00
yystopf	fe7dfcea52	add: reversed keyword and api forbidden	2021-08-31 10:18:00 +08:00
vilet.yy	c2449d59af	add: user pinned projects	2021-05-27 14:23:59 +08:00
vilet.yy	a14459da50	add: project menu list	2021-03-17 11:52:36 +08:00
vilet.yy	3e7ae82258	[ADD]phenglei user list and cron job	2021-03-10 14:02:41 +08:00
vilet.yy	cc978c8dea	[FIX]merge from develop	2021-03-01 13:59:30 +08:00
viletyy	2434ca9681	[ADD]组织模块相关代码	2021-02-06 14:27:47 +08:00
viletyy	d42053ce0c	[FIX]merge	2020-12-25 16:33:16 +08:00
viletyy	36bae71947	[ADD]增加特殊许可的验证	2020-12-25 16:17:46 +08:00
Jasder	837aa1ea9e	FIX Merge master branch	2020-12-25 15:10:50 +08:00
Jasder	6a8ae5234b	ADD protected branch Features	2020-12-03 15:24:40 +08:00
Jasder	7c1ab2cddf	FIX 重构ci流程	2020-08-20 18:37:53 +08:00
sylor_huang@126.com	46c929a394	关注列表/点赞列表/fork列表的后端	2020-05-15 17:05:53 +08:00
Jasder	bf5e191efa	ADD sync trustie data	2020-03-19 17:17:27 +08:00
Jasder	2937b2a94d	init project	2020-03-09 00:40:16 +08:00

22 Commits