forgeplus

Commit Graph

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	dd3c14e50e	fixed ci4s oauth2接入	2024-10-23 11:11:14 +08:00
xxq250	5d0b95f9ad	合并主干所有代码	2024-05-20 14:35:33 +08:00
yystopf	e891d52c32	新增：acge 第三方登录回调地址	2024-03-21 10:11:58 +08:00
yystopf	ccec8e9819	Merge branch 'develop' into dev_jk_server	2022-12-12 16:17:22 +08:00
xxq250	2238c8fcbb	fixed qq命名调整，方便封装	2022-12-06 10:27:04 +08:00
xxq250	ee27c90205	fixed qq命名调整，方便封装	2022-12-06 10:24:48 +08:00
xxq250	763d7b499e	fixed 第三方授权登录(github,gitee,qq,wechat)	2022-12-01 17:22:22 +08:00
“xxq250”	5ce3b4cea4	fixed 第三方登录	2022-10-21 16:09:17 +08:00
“xxq250”	2e116548db	增加gitlink授权登录	2022-10-10 14:33:15 +08:00
Jasder	60ac66ebe3	ADD db schema in models	2020-11-23 15:35:03 +08:00
Jasder	675c380967	FIX	2020-08-14 21:56:16 +08:00
Jasder	c1b0061b8d	ADD educode user login	2020-08-14 18:19:00 +08:00
Jasder	2937b2a94d	init project	2020-03-09 00:40:16 +08:00

14 Commits