Commit Graph

66 Commits

Author SHA1 Message Date
viletyy eac812a7bf merge from develop 2022-11-04 11:24:25 +08:00
yystopf 84a8339a04 修复 2022-10-26 15:16:06 +08:00
yystopf 8b14ee3c72 修复:更改组织下项目权限同时更改组织下权限同步至gitea 2022-10-26 14:49:40 +08:00
“xxq250” 480f2b6516 Merge branch 'develop' into dev_jk_server
# Conflicts:
#	app/controllers/attachments_controller.rb
#	app/controllers/members_controller.rb
2022-10-17 11:16:10 +08:00
yystopf 630a7aadeb 新增:组织数据修复任务 2022-10-15 11:29:23 +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” 8d28b41357 导入用户增加用户类型 2022-09-22 16:22:27 +08:00
“xxq250” a247d5fc7a 导入用户增加用户类型 2022-09-22 16:21:44 +08:00
“xxq250” 3d9aeef8b4 导入用户增加用户类型 2022-09-22 14:57:19 +08:00
“xxq250” 2790f91f1b 导入用户增加用户类型 2022-09-22 14:55:57 +08:00
“xxq250” da28624c0a 导入用户 2022-09-22 10:25:24 +08:00
“xxq250” 05ca426004 项目详情增加时间语言 2022-09-22 10:24:34 +08:00
“xxq250” acaea1901d 更换短信模板 2022-09-15 13:52:10 +08:00
“xxq250” 3ec44cbfa3 注册增加没有密码时初始密码的短信发送 2022-09-08 10:03:06 +08:00
“xxq250” fbdb4cbf39 rake导入外部项目 2022-08-12 17:22:02 +08:00
yystopf d14bf35ca1 修复: gitea module命名重复问题 2022-06-23 11:33:11 +08:00
xiaoxiaoqiong 01ccbe89cd 通知提醒规则更改5分钟 2022-03-02 16:59:51 +08:00
xiaoxiaoqiong 643dedc8cb 通知提醒规则更改5分钟 2022-03-02 16:55:33 +08:00
xiaoxiaoqiong 31d7103da3 通知提醒规则更改5分钟 2022-03-02 15:59:31 +08:00
xiaoxiaoqiong 0b0a57035a 通知提醒规则更改 2022-03-02 15:26:06 +08:00
xiaoxiaoqiong 7449d915ab 通知提醒规则 2022-03-02 10:36:20 +08:00
xiaoxiaoqiong 33c0e026fd 通知提醒规则 2022-03-02 10:35:52 +08:00
xiaoxiaoqiong 751187a3da 通知提醒规则 2022-03-02 10:31:25 +08:00
xiaoxiaoqiong 58ca8e2651 竞赛通知任务调度log 2022-02-21 17:55:06 +08:00
xiaoxiaoqiong 692d51792a 竞赛通知任务调度log 2022-02-21 17:02:07 +08:00
xiaoxiaoqiong 5ed7b3e4ad 竞赛通知任务调度 2022-02-21 16:46:40 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
yystopf 2a09fadf71 fix: change projec trend rule and fix data 2021-10-15 14:36:50 +08:00
jasder f5ffd978ac FIX delete some file 2021-09-09 14:35:26 +08:00
yystopf 8832114805 fix: import structure and data 2021-08-27 18:12:06 +08:00
yystopf c9e265f95c fix: transfer repository user id 2021-08-27 10:54:20 +08:00
yystopf 5637001b16 add: fix some data task 2021-08-26 17:51:46 +08:00
yystopf 258272d439 fix: generate username type 2021-08-17 15:33:03 +08:00
yystopf 8b809fb813 add: generate ceshi users 2021-08-17 15:33:03 +08:00
viletyy 312fca7e2b fix: update shell simple 2021-07-01 17:55:48 +08:00
vilet.yy 8331d849d5 fix: forked projects private set 2021-06-29 17:36:15 +08:00
viletyy c58b074173 fix: init project 2021-06-03 11:27:13 +08:00
vilet.yy fffe57a211 fix: mirror project permission error 2021-04-29 18:09:39 +08:00
vilet.yy 70c7b1da0c add: auto counter rake 2021-03-24 15:42:57 +08:00
vilet.yy 495de925dd add: sync mulan repo 2021-03-19 11:29:31 +08:00
vilet.yy 93fa02bd7b [FIX]
[FIX]

[FIX]
2021-02-22 10:53:01 +08:00
vilet.yy ef0c44f29c [ADD]fix error script 2021-02-22 10:10:22 +08:00
Jasder 8facfc96e4 FIX merge develop branch 2020-11-27 11:00:37 +08:00
Jasder 225bb9f7b7 Update table structure's rake task 2020-11-24 17:00:42 +08:00
Jasder 60ac66ebe3 ADD db schema in models 2020-11-23 15:35:03 +08:00
Jasder 0192fa9f85 FIX bug 2020-10-21 18:14:06 +08:00
Jasder 84854e5c0c FIX code bug 2020-10-21 18:12:58 +08:00
Jasder 0c92b571c5 FIX perfect devops languages formate 2020-10-21 18:07:18 +08:00
Jasder 6527603e24 FIX 完善devops流程 2020-07-14 15:06:09 +08:00
sylor_huang@126.com c0aff6e456 修改version的issues数量 2020-04-22 17:16:50 +08:00