Commit Graph

19 Commits

Author SHA1 Message Date
xxq250 2137a3db74 fixed 关注重复保存 2025-10-08 16:48:36 +08:00
yystopf ebf1c1d31b Merge branch 'standalone_develop' into dev_osredm_server 2025-09-04 11:32:49 +08:00
yystopf 6a8ef3ac3b 新增:触发项目行为构建 2025-08-27 16:04:08 +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 b5d3f69f21 修复:时间nil处理 2024-11-07 11:44:26 +08:00
yystopf 4a12ab2d90 fix: string to number 2024-11-06 11:11:06 +08:00
yystopf 7d6d95c7eb 新增: 关注列表\点赞列表时间范围查询 2024-11-06 11:01:58 +08:00
“xxq250” 4560b9231e fixed 小程序活动 2022-11-04 11:23:47 +08:00
“xxq250” eb7f4e6da3 fixed 资讯增加活动报名 2022-10-24 16:21:42 +08:00
“xxq250” b075fdc3c1 fixed 关注竞赛列表,唯一标识也可 2022-10-09 11:46:34 +08:00
“xxq250” 1c1450a9a4 关注竞赛 2022-10-09 09:57:57 +08:00
“xxq250” 56921a1801 关注竞赛 2022-10-09 09:51:07 +08:00
yystopf c52458a7e3 add: require profile completed 2021-09-02 10:55:31 +08:00
sylor_huang@126.com b48fea51ca add watchers_count to user 2020-05-18 14:58:23 +08:00
sylor_huang@126.com 8bc503e9e6 change follow watched 2020-05-18 14:50:18 +08:00
sylor_huang@126.com 6c113d43f9 change follow and unfollow render json 2020-05-18 14:49:21 +08:00
sylor_huang@126.com a8aae3618b change watchers controller and related routes 2020-05-18 14:28:45 +08:00
Jasder 7ffc99b9d2 FIX 优化点赞、关注等功能 2020-03-27 17:31:31 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00