forgeplus

Commit Graph

Author	SHA1	Message	Date
xxq250	ba4a9687a6	Merge branch 'standalone_develop' into dev_osredm_server # Conflicts: # app/controllers/accounts_controller.rb	2025-03-31 20:52:18 +08:00
xxq250	076d92a3eb	fixed 密码处理，兼容base64	2025-03-31 20:47:23 +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	f49d5d5c3a	更改: password参数传递使用加密后的	2024-11-20 11:52:26 +08:00
yystopf	50cb870c34	Merge branch 'standalone_develop' into dev_osredm_server	2024-09-19 13:43:25 +08:00
xxq250	39f234cc06	fixed 个人项目列表条件增加标签名查询	2024-08-29 16:18:59 +08:00
xxq250	5d0b95f9ad	合并主干所有代码	2024-05-20 14:35:33 +08:00
xxq250	3b3fad7e3c	项目增加项目团队搜索	2022-12-27 15:58:44 +08:00
“xxq250”	8608e2d67a	注册增加单位和类型	2022-09-15 15:57:12 +08:00
yystopf	c5063e513d	fix: issue destroy return duplicate	2022-01-21 11:31:36 +08:00
jasder	651bf34cfc	FIX code review and conflict	2021-11-14 20:50:22 +08:00
jasder	03beee6cae	FIX code review	2021-11-11 18:03:30 +08:00
jasder	538d2113f1	FIX 完善重置密码功能	2021-11-03 17:19:43 +08:00
jasder	1008f17849	FIX 调整注册接口	2021-11-02 13:39:45 +08:00
yystopf	4841943419	fix	2021-09-29 10:49:39 +08:00
Jasder	2937b2a94d	init project	2020-03-09 00:40:16 +08:00

16 Commits