forgeplus/app/libs
“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
..
ci 修复: gitea module命名重复问题 2022-06-23 11:33:11 +08:00
dun_check Add Dun Check For Project 2020-08-18 10:36:13 +08:00
gitea ADD gitea databse config 2020-09-27 15:30:44 +08:00
limit_forbid_control fixed 打分次数可配置 2022-07-08 15:22:07 +08:00
omniauth/strategies init project 2020-03-09 00:40:16 +08:00
trustie [ADD]统计平台概况 2021-02-06 11:15:25 +08:00
util init project 2020-03-09 00:40:16 +08:00
wechat init project 2020-03-09 00:40:16 +08:00
wechat_oauth init project 2020-03-09 00:40:16 +08:00
base64_image_converter.rb ADD upload avatar api with support multiple image formats 2021-01-26 14:49:02 +08:00
custom_regexp.rb Merge branch 'develop' into dev_jk_server 2022-09-27 15:32:46 +08:00
custom_sortable.rb init project 2020-03-09 00:40:16 +08:00
gitea_service.rb 修复: gitea module命名重复问题 2022-06-23 11:33:11 +08:00
hot_search_keyword.rb init project 2020-03-09 00:40:16 +08:00
limit_forbid_control.rb init project 2020-03-09 00:40:16 +08:00
notice.rb fix: exception to ex 2022-04-11 10:50:18 +08:00
oauth_educoder.rb FIX config 2020-08-14 21:31:46 +08:00
sidebar_util.rb init project 2020-03-09 00:40:16 +08:00
trace.rb fix: exception to ex 2022-04-11 10:50:18 +08:00
util.rb add: user upload image 2022-01-03 22:32:09 +08:00
wechat.rb init project 2020-03-09 00:40:16 +08:00
wechat_oauth.rb init project 2020-03-09 00:40:16 +08:00