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_controller.rb	新增：acge查询用户标识接口	2024-08-12 15:01:52 +08:00
base_controller.rb	Merge branch 'develop' into dev_jk_server	2022-12-12 16:17:22 +08:00
callbacks_controller.rb	fixed 授权登录绑定账号返回用户信息	2022-12-26 16:24:27 +08:00
cas_controller.rb	init project	2020-03-09 00:40:16 +08:00
ci4s_controller.rb	fixed ci4s oauth2接入 user_info log	2024-10-23 14:56:07 +08:00
educoder_controller.rb	fixed 头歌快速登录用户绑定	2023-05-09 10:25:36 +08:00
gitlink_controller.rb	fixed 第三方登录用户名生成	2022-10-27 14:12:29 +08:00
openkylin_controller.rb	fixed 第三方登录用户名生成	2022-10-27 14:12:29 +08:00
qq_controller.rb	init project	2020-03-09 00:40:16 +08:00
wechat_controller.rb	init project	2020-03-09 00:40:16 +08:00