forgeplus/app/controllers/admins
“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
..
topic 小程序banner增加显示位置 2022-09-23 10:25:21 +08:00
abouts_controller.rb init project 2020-03-09 00:40:16 +08:00
agreements_controller.rb init project 2020-03-09 00:40:16 +08:00
apply_signatures_controller.rb [FIX]只有审核成功才添加成员 2020-12-29 18:08:10 +08:00
auth_schools_controller.rb fix: nickname search alone 2021-06-15 16:14:15 +08:00
base_controller.rb 修改bug 2020-04-17 00:31:22 +08:00
carousels_controller.rb init project 2020-03-09 00:40:16 +08:00
choose_mirror_repositories_controller.rb init project 2020-03-09 00:40:16 +08:00
contact_us_controller.rb init project 2020-03-09 00:40:16 +08:00
cooperatives_controller.rb init project 2020-03-09 00:40:16 +08:00
course_lists_controller.rb init project 2020-03-09 00:40:16 +08:00
courses_controller.rb init project 2020-03-09 00:40:16 +08:00
customers_controller.rb init project 2020-03-09 00:40:16 +08:00
daily_school_statistics_controller.rb init project 2020-03-09 00:40:16 +08:00
dashboards_controller.rb fixed 用户活跃数 2022-09-26 16:11:34 +08:00
department_applies_controller.rb init project 2020-03-09 00:40:16 +08:00
department_members_controller.rb init project 2020-03-09 00:40:16 +08:00
departments_controller.rb init project 2020-03-09 00:40:16 +08:00
disciplines_controller.rb init project 2020-03-09 00:40:16 +08:00
ec_templates_controller.rb init project 2020-03-09 00:40:16 +08:00
edu_settings_controller.rb ADD 后台系统配置管理功能 2021-09-10 15:29:08 +08:00
examination_authentications_controller.rb init project 2020-03-09 00:40:16 +08:00
faqs_controller.rb fix: sql attack 2021-06-17 16:13:40 +08:00
files_controller.rb init project 2020-03-09 00:40:16 +08:00
graduation_standards_controller.rb init project 2020-03-09 00:40:16 +08:00
help_centers_controller.rb init project 2020-03-09 00:40:16 +08:00
identity_authentications_controller.rb init project 2020-03-09 00:40:16 +08:00
import_course_members_controller.rb init project 2020-03-09 00:40:16 +08:00
import_disciplines_controller.rb init project 2020-03-09 00:40:16 +08:00
import_users_controller.rb add: download and import user template xlsx 2022-08-18 16:41:52 +08:00
item_authentications_controller.rb init project 2020-03-09 00:40:16 +08:00
laboratories_controller.rb fix: nickname search alone 2021-06-15 16:14:15 +08:00
laboratory_settings_controller.rb Add Setting button 2020-10-16 16:43:59 +08:00
laboratory_shixuns_controller.rb init project 2020-03-09 00:40:16 +08:00
laboratory_subjects_controller.rb init project 2020-03-09 00:40:16 +08:00
laboratory_users_controller.rb init project 2020-03-09 00:40:16 +08:00
library_applies_controller.rb init project 2020-03-09 00:40:16 +08:00
major_informations_controller.rb init project 2020-03-09 00:40:16 +08:00
message_templates_controller.rb fixed 消息模板配置type 2022-08-11 09:29:37 +08:00
mirror_repositories_controller.rb init project 2020-03-09 00:40:16 +08:00
mirror_scripts_controller.rb init project 2020-03-09 00:40:16 +08:00
nps_controller.rb nps数据统计 2022-09-20 09:41:27 +08:00
partners_controller.rb init project 2020-03-09 00:40:16 +08:00
phenglei_users_controller.rb [ADD]phenglei user list and cron job 2021-03-10 14:02:41 +08:00
platform_communicates_controller.rb fix: admins navbar and platform communicates order index and competitions filter 2021-12-09 14:04:03 +08:00
platform_people_controller.rb 提示语句更改 2022-05-05 16:55:43 +08:00
professional_authentications_controller.rb init project 2020-03-09 00:40:16 +08:00
project_categories_controller.rb 后管优化 2022-04-28 18:08:37 +08:00
project_ignores_controller.rb fix: sql attack 2021-06-17 16:13:40 +08:00
project_languages_controller.rb fix: sql attack 2021-06-17 16:13:40 +08:00
project_licenses_controller.rb fix: sql attack 2021-06-17 16:13:40 +08:00
project_package_applies_controller.rb init project 2020-03-09 00:40:16 +08:00
project_statistics_controller.rb init project 2020-03-09 00:40:16 +08:00
projects_controller.rb 后台项目列表导出 2022-09-15 17:05:11 +08:00
repertoires_controller.rb init project 2020-03-09 00:40:16 +08:00
reversed_keywords_controller.rb add: reversed keyword management 2021-08-31 14:22:49 +08:00
salesman_channels_controller.rb init project 2020-03-09 00:40:16 +08:00
salesman_customers_controller.rb init project 2020-03-09 00:40:16 +08:00
salesmans_controller.rb init project 2020-03-09 00:40:16 +08:00
school_statistics_controller.rb init project 2020-03-09 00:40:16 +08:00
schools_controller.rb init project 2020-03-09 00:40:16 +08:00
sites_controller.rb ADD 后台系统配置管理功能 2021-09-10 15:29:08 +08:00
sub_disciplines_controller.rb init project 2020-03-09 00:40:16 +08:00
sub_repertoires_controller.rb init project 2020-03-09 00:40:16 +08:00
subject_authorizations_controller.rb init project 2020-03-09 00:40:16 +08:00
subject_settings_controller.rb init project 2020-03-09 00:40:16 +08:00
subjects_controller.rb init project 2020-03-09 00:40:16 +08:00
system_notifications_controller.rb FIX revert system_notification_histories 2021-11-01 11:06:18 +08:00
tag_disciplines_controller.rb init project 2020-03-09 00:40:16 +08:00
tag_repertoires_controller.rb init project 2020-03-09 00:40:16 +08:00
unit_applies_controller.rb init project 2020-03-09 00:40:16 +08:00
user_statistics_controller.rb init project 2020-03-09 00:40:16 +08:00
users_controller.rb 后台增加导出用户 2022-09-26 15:43:24 +08:00
video_applies_controller.rb init project 2020-03-09 00:40:16 +08:00
weapp_adverts_controller.rb init project 2020-03-09 00:40:16 +08:00
weapp_carousels_controller.rb init project 2020-03-09 00:40:16 +08:00