Azheng
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,226 Commits 44 Branches 16 Tags 850 MiB
Commit Graph

113 Commits

Author SHA1 Message Date
xxq250 cd7649d917 Merge branch 'develop' into dev_educoder_v2 
# Conflicts:
#	app/controllers/api/v1/projects/code_stats_controller.rb
#	app/controllers/concerns/register_helper.rb
#	app/controllers/projects_controller.rb
#	app/controllers/pull_requests_controller.rb
#	app/controllers/repositories_controller.rb
#	app/controllers/users_controller.rb
#	app/helpers/repositories_helper.rb
#	app/models/project.rb
#	app/models/project_unit.rb
#	app/models/user.rb
#	app/models/version.rb
#	app/views/repositories/_contributor.json.jbuilder
#	app/views/users/get_user_info.json.jbuilder
#	config/routes.rb
 2023-08-29 11:28:55 +08:00
yystopf 6eea21821f 修复 2023-04-13 11:17:46 +08:00
yystopf 64f34cc868 更改：项目标识提示语 2023-04-13 11:12:27 +08:00
yystopf 60b0ee6b28 更改：项目标识提示语 2023-04-07 11:27:19 +08:00
yystopf 534fdec9f2 merge from develop 2022-12-08 14:28:16 +08:00
yystopf a0413be4b9 Merge branch 'develop' into standalone_develop 2022-09-06 14:58:02 +08:00
yystopf a438ab6f3e 新增：提示语locale配置 2022-09-06 14:57:54 +08:00
yystopf ce432d9ad3 Merge branch 'develop' into standalone_develop 2022-09-06 09:04:54 +08:00
yystopf 4878d66620 修复 2022-09-06 09:04:46 +08:00
yystopf d240d4f4fa Merge branch 'develop' into standalone_develop 2022-09-06 09:02:37 +08:00
yystopf 632ade9d25 修复 2022-09-06 09:02:30 +08:00
yystopf 36443a54d8 Merge branch 'develop' into standalone_develop 2022-09-06 09:00:24 +08:00
yystopf 5acd45bf85 修复 2022-09-06 09:00:05 +08:00
yystopf d03b45eecf 新增：创建文件对分支长度进行验证 2022-09-06 08:59:24 +08:00
yystopf 7e5d5e31e5 merge from develop 2022-06-20 10:21:10 +08:00
yystopf c42f3d5928 新增：邀请用户链接生成 2022-06-17 14:06:59 +08:00
yystopf 1652e615be 同步develop最新代码 2022-05-25 17:25:21 +08:00
yystopf 19ec81e975 Merge branch 'develop' into standalone_develop 2022-05-25 11:47:44 +08:00
yystopf 2ea78b4f20 增加: 已登录用户对用户名、邮箱、电话进行校验 2022-05-25 11:47:35 +08:00
yystopf fb43268444 fix: merge from develop 2022-05-24 11:03:54 +08:00
yystopf c27cc063e6 add: new update user info simple and sync gitea 2022-05-24 10:59:52 +08:00
yystopf 9d8df2b4d9 Merge branch 'develop' into standalone_develop 2022-05-06 09:57:23 +08:00
yystopf ae7d0d1329 add: issues description and journals notes validate 2022-05-06 09:56:22 +08:00
yystopf d6937f195c sync from develop 2022-04-12 11:01:09 +08:00
xiaoxiaoqiong 183315bbd9 万能验证码，用于测试 2022-03-24 10:25:24 +08:00
yystopf 1fe8d1defc Merge branch 'develop' into standalone_develop 2022-03-07 11:20:23 +08:00
yystopf e1cf2fcdeb fix: owner project not allow repeat name 2022-03-07 10:25:05 +08:00
yystopf 67914201bf merge from develop 2022-01-24 10:06:20 +08:00
xiaoxiaoqiong 98d8ee1fb6 Merge remote-tracking branch 'origin/develop' into develop 2022-01-21 15:50:41 +08:00
xiaoxiaoqiong 2ca77732c8 fixed 注册登录类型 2022-01-21 15:50:37 +08:00
yystopf 96b0f2d167 Merge branch 'develop' into standalone_develop 2021-12-28 16:10:16 +08:00
yystopf 36b68df273 fix: remote register validate 2021-12-22 14:39:47 +08:00
yystopf ab361d8009 Merge branch 'develop' into standalone_develop 2021-12-20 15:53:40 +08:00
yystopf 3649bf1fd0 fix 2021-12-20 15:53:24 +08:00
yystopf a24d33d2ee Merge pull request '同步到测试环境' (#294) from develop into standalone_develop 2021-12-20 15:42:34 +08:00
yystopf 29f98513e2 fix: org update error 2021-12-20 15:38:08 +08:00
yystopf e35cdf39fb fix: login password validate 2021-12-20 15:34:55 +08:00
xiaoxiaoqiong efc82b9841 fix: issue is collaborators 2021-12-14 10:17:15 +08:00
xxq250 7c765817c9 Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop 2021-11-26 14:21:53 +08:00
xiaoxiaoqiong 399558550e fix 验证码过期等#53446，#50806，#50880 2021-11-24 18:13:15 +08:00
yystopf 0885575cc4 fix: organization validate name tip 2021-11-18 17:31:22 +08:00
jasder 651bf34cfc FIX code review and conflict 2021-11-14 20:50:22 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
jasder 77ad959a8c Merge remote-tracking branch 'gitlink/featrue_login_and_register' into standalone_develop 2021-11-08 15:08:47 +08:00
jasder c19c83d505 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-05 11:36:51 +08:00
jasder 8d3b674321 FIX viri code invalid bug 2021-11-04 14:14:11 +08:00
jasder 538d2113f1 FIX 完善重置密码功能 2021-11-03 17:19:43 +08:00
yystopf e27ba76f33 fix: project identifier regex 2021-11-03 14:43:17 +08:00
jasder 06cf52c384 ADD 注册接口添加确认密码参数 2021-11-03 13:50:38 +08:00
jasder 1008f17849 FIX 调整注册接口 2021-11-02 13:39:45 +08:00