forgeplus/app/models/open_users
xxq250 b760d17988 Merge branch 'standalone_develop' into dev_osredm_server
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/admins/users_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/owners_controller.rb
#	app/helpers/application_helper.rb
#	app/helpers/avatar_helper.rb
#	app/models/edu_setting.rb
#	app/models/user.rb
#	app/models/user_action.rb
#	app/views/layouts/admin.html.erb
#	app/views/projects/index.json.jbuilder
#	config/harmonious_dictionary/chinese_dictionary.txt
#	config/harmonious_dictionary/harmonious.hash
#	config/harmonious_dictionary/harmonious_english.yml
#	config/routes/api.rb
2025-03-20 14:32:54 +08:00
..
acge.rb 新增:acge 第三方登录回调地址 2024-03-21 10:11:58 +08:00
cas.rb ADD db schema in models 2020-11-23 15:35:03 +08:00
ci4s.rb fixed ci4s oauth2接入 2024-10-23 11:11:14 +08:00
educoder.rb ADD db schema in models 2020-11-23 15:35:03 +08:00
gitee.rb fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:22:22 +08:00
github.rb fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:22:22 +08:00
gitlink.rb 增加gitlink授权登录 2022-10-10 14:33:15 +08:00
openkylin.rb fixed 第三方登录 2022-10-21 16:09:17 +08:00
qq.rb fixed qq命名调整,方便封装 2022-12-06 10:27:04 +08:00
wechat.rb ADD db schema in models 2020-11-23 15:35:03 +08:00