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

3345 Commits

Author SHA1 Message Date
“xxq250” ca57477dcb fixed osredm3.ico 2022-09-28 14:56:13 +08:00
“xxq250” 043e1b5237 fixed oauth2.0 logged 2022-09-28 14:53:08 +08:00
“xxq250” bcc2579910 fixed oauth2.0 logged 2022-09-28 14:47:12 +08:00
“xxq250” 3836270622 导入用户 2022-09-28 14:17:05 +08:00
“xxq250” b7c3c7c5eb fixed oauth2.0 logo 2022-09-28 10:42:16 +08:00
“xxq250” 15d4336c00 fixed oauth2.0 layout 2022-09-28 10:37:08 +08:00
“xxq250” c367eaca10 fixed oauth2.0 2022-09-28 10:31:32 +08:00
“xxq250” 9fbbd9805f fixed oauth2.0 2022-09-28 10:28:16 +08:00
“xxq250” 095e1c7b7b fixed oauth2.0 2022-09-28 10:22:11 +08:00
“xxq250” d401634af3 导入用户 2022-09-28 07:43:00 +08:00
“xxq250” 14022c0ccc 导入用户 2022-09-27 18:12:33 +08:00
“xxq250” 95303c5394 合并develop代码，js zip 2022-09-27 16:15:15 +08:00
“xxq250” 1701890e1a 合并develop代码，GiteaService.gitea_config 2022-09-27 15:59:19 +08:00
“xxq250” 63f8ca06df 合并develop代码，pr_reviews 2022-09-27 15:50:16 +08:00
“xxq250” a74335fd12 合并develop代码，pr_reviews 2022-09-27 15:46:14 +08:00
“xxq250” 497342bcff 合并develop代码，pr_reviews 2022-09-27 15:43:23 +08:00
“xxq250” 0f6ebbbf2f 合并develop代码 2022-09-27 15:35:30 +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” a8cf9b21c8 导入用户 2022-09-27 13:46:28 +08:00
“xxq250” 60eebead05 导入用户 2022-09-27 07:14:36 +08:00
“xxq250” fce8166ba7 fixed 用户活跃数 2022-09-26 16:11:34 +08:00
“xxq250” 81d29d3809 用户搜索文案 2022-09-26 16:03:25 +08:00
“xxq250” b0e6f2bcd3 导入用户 2022-09-26 15:44:13 +08:00
“xxq250” c44755f8d7 后台增加导出用户 2022-09-26 15:43:24 +08:00
“xxq250” f5f74f7333 导入用户 2022-09-26 12:32:06 +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
“xxq250” 84de681777 导入用户 2022-09-25 19:55:12 +08:00
“xxq250” 260737f417 导入用户 2022-09-24 21:53:38 +08:00
yystopf d7f3a21add 修复：周统计数据需加入年份 2022-09-23 17:56:39 +08:00
“xxq250” fd07a8c6ae 竞赛增加小程序banner配置 2022-09-23 11:02:00 +08:00
yystopf ef9592ef30 更改：活跃度算法更新 2022-09-23 10:28:12 +08:00
“xxq250” f072a2a7f3 小程序banner增加显示位置 2022-09-23 10:25:21 +08:00
yystopf cc42683316 新增：活跃度计算访问量限制 2022-09-23 10:07:52 +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” dfe884ec47 导入用户 2022-09-22 14:42:04 +08:00
“xxq250” da28624c0a 导入用户 2022-09-22 10:25:24 +08:00
“xxq250” 05ca426004 项目详情增加时间语言 2022-09-22 10:24:34 +08:00
yystopf 70f1e6827f 更改：项目已设置语言，则不重新设置语言 2022-09-21 10:06:29 +08:00
yystopf b5188e3272 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-09-21 09:54:53 +08:00
yystopf ff881732d2 更改：项目已设置语言，则不重新设置语言 2022-09-21 09:54:49 +08:00
“xxq250” 0373d08fdc 项目详情增加时间语言 2022-09-20 15:06:40 +08:00
“xxq250” 3ef6ed306f 项目详情增加时间语言 2022-09-20 15:06:27 +08:00
“xxq250” 9ab130f81e 项目详情增加时间语言 2022-09-20 15:04:32 +08:00
“xxq250” 20790f7548 fixed pull_request统计 2022-09-20 14:14:25 +08:00
“xxq250” 2adf87a289 fixed nps数据统计 2022-09-20 09:52:40 +08:00
“xxq250” 6954a860af fixed nps数据统计 2022-09-20 09:47:29 +08:00