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
..
_form.html.erb	管理端模态框顶部弹出	2022-04-28 15:38:41 +08:00
_list.html.erb	fixed 后台变量配置样式	2024-10-09 16:51:07 +08:00
edit.js.erb	ADD 后台系统配置管理功能	2021-09-10 15:29:08 +08:00
index.html.erb	ADD 后台系统配置管理功能	2021-09-10 15:29:08 +08:00
index.js.erb	ADD 后台系统配置管理功能	2021-09-10 15:29:08 +08:00
new.js.erb	ADD 后台系统配置管理功能	2021-09-10 15:29:08 +08:00