Commit Graph

13 Commits

Author SHA1 Message Date
yystopf a25db1afbf Merge branch 'standalone_develop' into dev_osredm_server 2025-11-04 11:32:39 +08:00
yystopf bdd9518a4c 新增:用户参与项目数量 2025-10-28 10:24:58 +08:00
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
yystopf bd19bb1251 修复:owners获取id回退到之前版本 2024-10-08 11:22:42 +08:00
yystopf ea76beb1bf 修复:处理owners .json后缀 2024-10-08 10:22:13 +08:00
xxq250 5c3a988336 fixed 检测用户不存在时清除cookie 2024-09-24 17:10:45 +08:00
“xxq250” 65b12bb93a 注册增加领域配置 2022-10-10 13:56:15 +08:00
yystopf e237fd46f7 fix: not found user return 404 2022-05-18 11:37:23 +08:00
yystopf ca3c564529 fix: not found user return 404 2022-05-18 11:03:39 +08:00
yystopf 51356da7f3 fix: owners not return 404 2021-12-07 14:34:57 +08:00
yystopf 39dbadeec9 fix: view authorize 2021-09-02 10:55:31 +08:00
yystopf 039779339a add: user and organization merge show api 2021-09-02 10:55:31 +08:00
viletyy f094fe1799 [ADD]组织项目相关 2021-02-06 14:27:47 +08:00