Commit Graph

12 Commits

Author SHA1 Message Date
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
xxq250 cce7310d7b fixed EduSetting不允许重复name 2025-03-07 11:09:56 +08:00
xxq250 53e03e9809 fixed EduSetting不允许重复name 2025-03-07 11:08:14 +08:00
xxq250 de71b5e192 fixed EduSetting删除时清除缓存 2024-11-19 10:29:50 +08:00
xxq250 61098942f7 fixed EduSetting删除时清除缓存after_destroy 2024-11-19 09:07:09 +08:00
xxq250 8b968d3f1a fixed EduSetting删除时清除缓存 2024-11-19 08:33:15 +08:00
xxq250 6287566eb8 fixed EduSetting值1位时太短异常处理 2024-11-18 17:24:57 +08:00
chenjing cfaa5301ea cla init 2023-06-13 15:30:16 +08:00
“xxq250” 4560b9231e fixed 小程序活动 2022-11-04 11:23:47 +08:00
jasder 4c41d50506 ADD 后台系统配置管理功能 2021-09-10 15:29:08 +08:00
Jasder 60ac66ebe3 ADD db schema in models 2020-11-23 15:35:03 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00