KingChan
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,997 Commits 67 Branches 0 Tags 728 MiB
Commit Graph

65 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 67b7206183 fixed ci4s oauth2接入 user_info log 2024-10-23 14:56:07 +08:00
xxq250 527c1a5e9c fixed ci4s oauth2接入 user_info log 2024-10-23 14:03:46 +08:00
xxq250 13da8e3577 fixed ci4s oauth2接入 user_info 2024-10-23 13:57:30 +08:00
xxq250 52f43dbcc3 fixed ci4s oauth2接入 user_info 2024-10-23 11:52:53 +08:00
xxq250 3a460b3b1d fixed ci4s oauth2接入 user_info 2024-10-23 11:48:25 +08:00
xxq250 04da22ed64 fixed ci4s oauth2接入 log 2024-10-23 11:25:11 +08:00
xxq250 36409600ea fixed ci4s oauth2接入 log 2024-10-23 11:23:44 +08:00
xxq250 c93ae8ebae fixed ci4s oauth2接入 2024-10-23 11:21:04 +08:00
xxq250 d038f30994 fixed ci4s oauth2接入 2024-10-23 11:19:02 +08:00
xxq250 dd3c14e50e fixed ci4s oauth2接入 2024-10-23 11:11:14 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf 435f458f6a 新增：acge查询用户标识接口 2024-08-12 15:01:52 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
yystopf d8ddde617f 更改：使用uid作为创建用户标识 2024-03-26 13:39:44 +08:00
yystopf 68348f1fc3 更改：csv写入模式 2024-03-21 17:38:57 +08:00
yystopf c999d37f7e 新增：同步acge用户记录在册 2024-03-21 16:58:27 +08:00
yystopf 6e2816af75 新增：同步acge用户并同时创建平台账号 2024-03-21 14:58:35 +08:00
yystopf e891d52c32 新增：acge 第三方登录回调地址 2024-03-21 10:11:58 +08:00
xxq250 0d2d38d537 fixed 头歌快速登录用户绑定 2023-05-09 10:25:36 +08:00
xxq250 a04cad32cf fixed 授权登录绑定账号返回用户信息 2022-12-26 16:24:27 +08:00
xxq250 346ca9eb27 fixed 授权登录绑定账号返回用户信息 2022-12-26 16:15:18 +08:00
xxq250 3459054349 fixed 授权登录绑定账号 2022-12-22 17:04:50 +08:00
yystopf ccec8e9819 Merge branch 'develop' into dev_jk_server 2022-12-12 16:17:22 +08:00
xxq250 daf7514afe fixed 第三方授权登录配置 2022-12-05 17:46:21 +08:00
xxq250 ea187a59a0 fixed 随机密码防止溢出 2022-12-02 15:38:56 +08:00
xxq250 77087345c8 fixed 异常日志 2022-12-02 15:30:43 +08:00
xxq250 1fc79535ad fixed 错误对象 2022-12-02 15:17:57 +08:00
xxq250 feb8c66e4b Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/controllers/concerns/register_helper.rb
#	app/controllers/oauth/base_controller.rb
 2022-12-01 17:48:11 +08:00
xxq250 763d7b499e fixed 第三方授权登录(github,gitee,qq,wechat) 2022-12-01 17:22:22 +08:00
“xxq250” 75a78c839d fixed 第三方登录用户名生成 2022-10-27 14:12:29 +08:00
“xxq250” e7af767d02 fixed 第三方登录 2022-10-25 14:17:31 +08:00
“xxq250” 7b63fd6b9f fixed 第三方登录email生成 2022-10-21 17:52:24 +08:00
“xxq250” 20b97286e3 fixed 第三方Gitlink登录log 2022-10-21 17:44:28 +08:00
“xxq250” 3a4f6888fb fixed 第三方Gitlink登录log 2022-10-21 17:24:47 +08:00
“xxq250” da48675900 fixed 第三方Gitlink登录log 2022-10-21 17:21:42 +08:00
“xxq250” 74b84f9f86 fixed 第三方Gitlink登录 2022-10-21 17:14:59 +08:00
“xxq250” 5ce3b4cea4 fixed 第三方登录 2022-10-21 16:09:17 +08:00
“xxq250” 2e116548db 增加gitlink授权登录 2022-10-10 14:33:15 +08:00
“xxq250” 3777fa26a0 增加gitlink授权登录 2022-10-10 14:13:46 +08:00
vilet.yy fba58800a7 fix 2021-04-02 18:08:36 +08:00
vilet.yy c4a43c4392 add: need edit user password 2021-04-02 16:44:36 +08:00
vilet.yy 1153bd5ab6 fix: set redirect_uri 2021-04-02 09:43:18 +08:00
vilet.yy f732b0374c fix: ceshi 2021-04-02 09:23:11 +08:00
vilet.yy 0d97d7d4f0 add: educoder third party 2021-04-01 18:01:51 +08:00
Jasder 837aa1ea9e FIX Merge master branch 2020-12-25 15:10:50 +08:00
Jasder bb98dad64c FIX educoder auto register 2020-09-11 22:40:32 +08:00
sylor_huang@126.com 5bef80ee58 Change Index Category 2020-09-11 18:32:42 +08:00
Jasder 061f4cae45 FIX educoder account oauth 2020-09-07 13:50:26 +08:00
Jasder dc3ec48b8c FIX educoder author bug 2020-08-29 11:57:50 +08:00