anph
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,508 Commits 48 Branches 16 Tags 710 MiB
Commit Graph

167 Commits

Author SHA1 Message Date
“xxq250” 5ce3b4cea4 fixed 第三方登录 2022-10-21 16:09:17 +08:00
yystopf 89f57fa4fc fix: merge from develop 2022-10-10 19:10:55 +08:00
yystopf 2cde13eabb 新增：接口测试以及功能测试 2022-09-29 12:05:57 +08:00
yystopf 649d9c4ea6 新增：更改邮箱控制器方法 2022-09-28 16:09:10 +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” ae0efc1115 Merge remote-tracking branch 'origin/develop' into develop 2022-09-26 10:38:32 +08:00
“xxq250” dfc2edd62d fixed注册gitea错误信息 2022-09-26 10:38:28 +08:00
yystopf 70f1e6827f 更改：项目已设置语言，则不重新设置语言 2022-09-21 10:06:29 +08:00
yystopf ff881732d2 更改：项目已设置语言，则不重新设置语言 2022-09-21 09:54:49 +08:00
“xxq250” 63c40a2025 fixed 返回状态码 2022-09-08 14:22:22 +08:00
“xxq250” 809cce9085 fixed 组织语言 2022-07-28 14:38:03 +08:00
yystopf 5db43bf768 新增：新合并请求列表接口 2022-07-25 16:21:03 +08:00
yystopf 24d83133e7 新增: 创建分支接口 2022-07-15 14:02:48 +08:00
yystopf 3b62f09669 新增: 项目语言匹配并设置 2022-07-07 10:05:12 +08:00
xiaoxiaoqiong 484c91a581 fixed 同步gitea密码状态is_sync_pwd更新 2022-07-06 15:26:49 +08:00
xiaoxiaoqiong aabb7518c0 fixed 同步gitea密码状态is_sync_pwd 2022-07-06 14:50:28 +08:00
xiaoxiaoqiong de2afba910 fixed 同步gitea密码状态 2022-07-06 14:49:04 +08:00
xiaoxiaoqiong a465e8de66 fixed 同步gitea密码状态 2022-07-06 14:47:10 +08:00
xiaoxiaoqiong e4a79a4049 fixed 同步gitea密码状态 2022-07-06 14:46:00 +08:00
xiaoxiaoqiong 25a686e4f3 分页大小改为10行 2022-06-27 11:15:07 +08:00
yystopf 5d0849a148 新增: 用户项目列表以及helper方法 2022-06-23 12:19:03 +08:00
yystopf d14bf35ca1 修复: gitea module命名重复问题 2022-06-23 11:33:11 +08:00
yystopf d7dd3901b8 新增: 项目详情 2022-06-22 19:08:14 +08:00
xiaoxiaoqiong d243fff299 current_main_site_url 2022-06-01 10:53:24 +08:00
yystopf a6e50d2a25 修复 devops无法激活项目的问题 2022-05-27 10:48:20 +08:00
yystopf 8e8ec821f2 新增: 根据邮箱来获取用户 2022-05-24 17:26:10 +08:00
yystopf c27cc063e6 add: new update user info simple and sync gitea 2022-05-24 10:59:52 +08:00
xiaoxiaoqiong f0e2277f1c 台管地址可配置 2022-04-28 16:53:41 +08:00
xiaoxiaoqiong 3f94cf3637 登录同步gitea密码 2022-04-11 18:07:07 +08:00
yystopf dec264d169 fix: sync user pwd 2022-04-07 16:28:40 +08:00
xiaoxiaoqiong cee09d9f8f Merge branch 'dev_military_server_local' into dev_jk_server 
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/concerns/login_helper.rb
#	app/controllers/users_controller.rb
#	config/routes.rb
 2022-03-24 16:35:04 +08:00
xiaoxiaoqiong 521a1a2c8a autologin_action可配置 2022-03-22 15:18:09 +08:00
xiaoxiaoqiong b1c3d62e41 fixed 固定token key 2022-02-23 18:28:16 +08:00
xiaoxiaoqiong c1ea0232bb fixed注册gitea 2022-02-22 13:48:37 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 5d45b24299 fix: devops return result changed 2022-01-14 10:55:53 +08:00
xiaoxiaoqiong 01bf13ddd9 fixed 手机号注册失败 2021-12-25 20:22:46 +08:00
xiaoxiaoqiong 293121ab91 其他平台用户注册 2021-12-14 14:41:59 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
jasder 1008f17849 FIX 调整注册接口 2021-11-02 13:39:45 +08:00
jasder f5ffd978ac FIX delete some file 2021-09-09 14:35:26 +08:00
jasder c627ea6c19 FIX migration project accelerator's bug 2021-05-17 17:14:55 +08:00
jasder 1277e717ff ADD github gitlab镜像加速器 2021-04-29 18:35:57 +08:00
vilet.yy 223755a965 fix: languages filter 0.0% 2021-03-19 18:36:55 +08:00
jasder d91e8dcbfe Merge branch 'dev_military' of https://git.trustie.net/jasder/forgeplus into dev_military 2021-03-05 15:38:06 +08:00
jasder 0c2507b1e9 FIX valid user before register action 2021-03-05 15:37:41 +08:00
jasder 50928f82c0 FIX valid user before register action 2021-03-05 15:36:26 +08:00
vilet.yy cc978c8dea [FIX]merge from develop 2021-03-01 13:59:30 +08:00
viletyy f094fe1799 [ADD]组织项目相关 2021-02-06 14:27:47 +08:00
Jasder b552e29aa3 ADD forge host and main web host for setting api 2021-02-04 11:43:11 +08:00