Commit Graph

79 Commits

Author SHA1 Message Date
“xxq250” dbafeb5cee fixed 第三方Gitlink登录 2022-10-21 17:02:18 +08:00
“xxq250” 5ce3b4cea4 fixed 第三方登录 2022-10-21 16:09:17 +08:00
“xxq250” 803c468a80 增加gitlink授权登录service 2022-10-10 14:46:30 +08:00
“xxq250” 46c57186b4 增加gitlink授权登录service 2022-10-10 14:40:21 +08:00
“xxq250” 2e116548db 增加gitlink授权登录 2022-10-10 14:33:15 +08:00
“xxq250” 65b12bb93a 注册增加领域配置 2022-10-10 13:56:15 +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
yystopf e8b8dc682a fix: import user login length required 2022-08-18 16:42:03 +08:00
“xxq250” df5efa0dc6 fixed 邮箱验证正则优化 2022-07-26 17:08:05 +08:00
xiaoxiaoqiong 73b5c0f63f fixed 打分次数可配置 2022-07-08 15:22:07 +08:00
xiaoxiaoqiong 5ab66e0c40 fixed 提交作品次数1 2022-07-01 16:53:44 +08:00
xiaoxiaoqiong b1b7b6a1e0 fixed 提交作品次数 2022-07-01 15:41:47 +08:00
xiaoxiaoqiong 16f2aecb6d fixed 提交作品次数 2022-07-01 15:31:33 +08:00
yystopf d14bf35ca1 修复: gitea module命名重复问题 2022-06-23 11:33:11 +08:00
yystopf b0092487e6 fix: is readme use regex 2022-05-23 18:10:41 +08:00
yystopf fbebd0a623 fix 2022-05-23 09:27:09 +08:00
yystopf 9cd18397f7 fix: import user login length required 2022-05-18 10:11:09 +08:00
xiaoxiaoqiong a8adf6f140 竞赛api限制打分接口 2022-05-17 11:30:39 +08:00
yystopf 910ae48556 fix: exception to ex 2022-04-11 10:50:18 +08:00
xiaoxiaoqiong 560adc458c 密码长度20 2022-04-02 10:27:29 +08:00
yystopf 747646cd9d add: trace client and api completed 2022-03-30 16:19:32 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf f339df699e add: user upload image 2022-01-03 22:32:09 +08:00
yystopf 3649bf1fd0 fix 2021-12-20 15:53:24 +08:00
jasder 2719e60248 ADD 邮箱、登录名、手机号验证api 2021-10-27 15:15:06 +08:00
yystopf 86d634d94f add: notice message skeletal code 2021-09-13 10:34:28 +08:00
jasder e38539445d FIX delete some mandatory field with migrate repo api 2021-09-09 14:34:29 +08:00
jasder 6570125a36 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into dev_military 2021-03-05 15:50:40 +08:00
victor cb90dc1f51 参数管理 2021-03-03 15:36:59 +08:00
vilet.yy cc978c8dea [FIX]merge from develop 2021-03-01 13:59:30 +08:00
viletyy c00336e7b5 [ADD]统计平台概况
[FIX]更改请求参数

[FIX]

[ADD]rank statistic

[FIX]
2021-02-06 11:15:25 +08:00
Jasder 0f01abd45f Merge branch 'develop' into dev_military 2021-01-28 15:21:43 +08:00
Jasder 3b7d425198 ADD upload avatar api with support multiple image formats 2021-01-26 14:49:02 +08:00
Jasder 5b261d6e81 FIX merge develop branch 2021-01-12 17:42:44 +08:00
Jasder 0794f77a87 Merge branch 'develop' into dev_military 2021-01-06 14:00:51 +08:00
moshenglv 47093ffcb9 调用drone创建用户接口 2020-12-31 19:39:20 +08:00
Jasder 837aa1ea9e FIX Merge master branch 2020-12-25 15:10:50 +08:00
moshenglv b5ab230a5c 删除调用drone创建用户接口 2020-12-24 10:40:42 +08:00
moshenglv d70168d255 增加trustie提供服务器流程。
1、增加接口trustie_bind
2、根据server_type字段判断使用哪个数据库连接
2020-12-18 13:14:30 +08:00
Jasder 3621f4ff48 ADD gitea databse config 2020-09-27 15:30:44 +08:00
Jasder a97bbb6ddb Update ci db schema 2020-09-23 09:17:30 +08:00
Jasder 4b3359108f FIX ci drone server cmd bug 2020-09-22 17:40:01 +08:00
Jasder a904adaaa0 FIX test ci init tables structure 2020-09-22 10:43:34 +08:00
Jasder 467f278de5 ADD ci datbase config 2020-09-18 16:40:54 +08:00
Jasder b74d43083e FIX 解决ci 数据库安全性问题 2020-09-18 15:26:14 +08:00
Jasder 5dfc6504a0 ADD sync ci user repos api 2020-09-08 15:29:38 +08:00
Jasder 1e99e87228 FIX delete 'docker rm -f' command 2020-08-26 14:34:32 +08:00
Jasder 8abf748778 FIX bug 2020-08-21 16:25:13 +08:00
Jasder 8758ec3197 Update trustie pipeline api 2020-08-21 16:06:47 +08:00
Jasder 7c1ab2cddf FIX 重构ci流程 2020-08-20 18:37:53 +08:00