Azheng
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,700 Commits 44 Branches 16 Tags 850 MiB
Commit Graph

93 Commits

Author SHA1 Message Date
xxq250 8b8fb883cc 内网509接入登录 2024-01-31 15:48:20 +08:00
“xxq250” cb302b50dd Merge branch 'develop' into dev_jk_server 
# Conflicts:
#	app/assets/javascripts/admin.js
#	app/controllers/accounts_controller.rb
#	app/controllers/application_controller.rb
#	app/controllers/attachments_controller.rb
#	app/controllers/concerns/login_helper.rb
#	app/controllers/concerns/register_helper.rb
#	app/controllers/concerns/render_helper.rb
#	app/controllers/concerns/repository/languages_percentagable.rb
#	app/controllers/repositories_controller.rb
#	app/controllers/users/is_pinned_projects_controller.rb
#	app/controllers/users_controller.rb
#	app/docs/slate/source/api.html.md
#	app/docs/slate/source/includes/_projects.md
#	app/docs/slate/source/includes/_pulls.md
#	app/docs/slate/source/includes/_repositories.md
#	app/docs/slate/source/includes/_teams.md
#	app/docs/slate/source/includes/_users.md
#	app/helpers/application_helper.rb
#	app/imports/admins/new_import_user_from_excel.rb
#	app/libs/custom_regexp.rb
#	app/models/journal.rb
#	app/models/project.rb
#	app/models/user.rb
#	app/queries/admins/user_query.rb
#	app/services/admins/import_user_from_excel_service.rb
#	app/views/admins/users/index.html.erb
#	app/views/members/index.json.jbuilder
#	app/views/settings/show.json.jbuilder
#	config/routes.rb
#	public/导入用户模板.xlsx
 2022-09-27 15:32:46 +08:00
“xxq250” ec0358d6b2 修改密码token skip 2022-09-19 09:25:49 +08:00
“xxq250” e8ce1e46d4 fixed 返回状态码修正 2022-09-08 14:28:07 +08:00
xiaoxiaoqiong 0f5fd424fb fixed 同步gitea密码,因为加了base64 2022-07-14 11:01:55 +08:00
yystopf e36c7a4b6a 修复: 邮箱搜索不需要return 404 2022-05-24 18:09:36 +08:00
yystopf 8e8ec821f2 新增: 根据邮箱来获取用户 2022-05-24 17:26:10 +08:00
yystopf 396ac55429 add: user super description 2022-04-28 10:42:55 +08:00
yystopf fc3cf01d3f add: get user image action 2022-04-18 13:49:08 +08:00
xiaoxiaoqiong cee09d9f8f Merge branch 'dev_military_server_local' into dev_jk_server 
# Conflicts:
#	app/controllers/accounts_controller.rb
#	app/controllers/concerns/login_helper.rb
#	app/controllers/users_controller.rb
#	config/routes.rb
 2022-03-24 16:35:04 +08:00
xiaoxiaoqiong 521a1a2c8a autologin_action可配置 2022-03-22 15:18:09 +08:00
xiaoxiaoqiong 66ca7fd1f0 fixed 固定token key 2022-02-24 09:25:01 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 499734ebf9 fix: upload user image allow base64 2022-01-04 22:44:39 +08:00
yystopf f339df699e add: user upload image 2022-01-03 22:32:09 +08:00
yystopf 8011dabaac fix: undo events 2021-11-18 17:02:09 +08:00
yystopf 46405e704a add: rank not include deleted project 2021-11-02 09:59:21 +08:00
jasder c0df55c20f Merge pull request 'ADD 合并项目首页改版功能' (#227) from feature_project_detail into develop 2021-10-29 11:21:27 +08:00
jasder 9cd54b0ccb FIX 解决老版本trustie项目链接错误的问题 2021-10-25 17:24:28 +08:00
yystopf fa476732e5 add: user common info cache service 2021-10-25 17:23:17 +08:00
yystopf dbcbc01251 fix and add some message feature 2021-09-16 16:54:49 +08:00
yystopf a0b6041394 add: get user info unread total 2021-09-13 18:17:09 +08:00
yystopf e93873c3d4 fix 2021-09-02 14:48:33 +08:00
yystopf a422aa638d fix: update user profile completed rule 2021-09-02 11:48:53 +08:00
yystopf c52458a7e3 add: require profile completed 2021-09-02 10:55:31 +08:00
vilet.yy 7fccd2aed2 fix: nickname search alone 2021-06-15 16:14:15 +08:00
vilet.yy 9d07181733 fix: undo_events 2021-06-10 10:57:06 +08:00
vilet.yy 77c1b1e188 add: undo_join_projects 2021-06-10 10:49:26 +08:00
vilet.yy a5b98bcad4 fix: concat nickname 2021-06-07 14:56:23 +08:00
vilet.yy e8f4b3f17c fix 2021-06-04 18:43:12 +08:00
vilet.yy 12c252ea10 fix: merge from hh_develop 2021-06-04 18:36:33 +08:00
viletyy 93169f8c96 fix: user update return info 2021-06-03 15:43:36 +08:00
vilet.yy 7dc21ff388 add: update user more info 2021-06-03 11:27:13 +08:00
vilet.yy 21d4751327 add: update user image 2021-06-03 11:27:12 +08:00
vilet.yy 86f0f2051d add: update user_info 2021-06-03 11:27:12 +08:00
vilet.yy 496867cac7 add: update user more info 2021-06-03 10:19:33 +08:00
vilet.yy 2ad963cdf1 add: update user image 2021-06-01 10:07:01 +08:00
vilet.yy 0b450c0c5f add: update user_info 2021-05-31 18:39:49 +08:00
vilet.yy 1a7b323120 fix: user info projects count 2021-04-29 18:09:39 +08:00
vilet.yy fffe57a211 fix: mirror project permission error 2021-04-29 18:09:39 +08:00
vilet.yy 120a33bc8a add: undo count 2021-04-27 15:43:37 +08:00
vilet.yy 1e081b5a3e add: transfer project 2021-04-25 18:41:13 +08:00
jasder 908cda56f3 ADD users/hovercard api 2021-04-22 16:36:40 +08:00
jasder e6b8435037 FIX gug 2021-04-02 18:57:13 +08:00
jasder 6ce4b26047 FIX api bug 2021-04-02 18:40:26 +08:00
jasder 50fb8d3983 ADD sync user info api 2021-04-02 18:18:52 +08:00
vilet.yy cc978c8dea [FIX]merge from develop 2021-03-01 13:59:30 +08:00
viletyy c6269f44ee [FIX]add user organization count 2021-02-06 15:49:54 +08:00
Jasder 0f01abd45f Merge branch 'develop' into dev_military 2021-01-28 15:21:43 +08:00
Jasder 458fca9992 fix change stoage file derictory 2021-01-28 15:11:47 +08:00