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

27 Commits

Author SHA1 Message Date
yystopf a7ea0436e4 Merge branch 'standalone_develop' into dev_osredm_server 2025-06-24 16:56:29 +08:00
yystopf e6eea663a9 更改：运营人员菜单权限 2025-06-20 10:25:24 +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
xxq250 75153cb099 用户删除接口 2024-09-25 15:40:53 +08:00
xxq250 3b5894894f fixed 用户删除优化处理,多个owner时,仅将用户从组织移除, 一个时直接删除 2024-09-25 14:01:37 +08:00
xxq250 d1968a63c1 fixed 用户删除优化处理,多个owner时,仅将用户从组织移除, 一个时直接删除 2024-09-25 11:47:15 +08:00
xxq250 5f3aaa03eb fixed 用户删除优化处理 2024-09-25 11:43:43 +08:00
xxq250 2faea9aa59 fixed 用户删除优化处理 2024-09-25 11:40:13 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf c9d8ce073f 新增：gitlink菜单权限 2024-07-01 09:55:20 +08:00
yystopf ae842938c2 新增：gitlink角色分级菜单完成 2024-06-28 11:51:55 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
呱呱呱 6cb7af0401 add data_bank to user action 2023-10-10 13:49:52 +08:00
呱呱呱 96936da9ac add site page 2023-08-10 14:29:26 +08:00
chenjing 7da1c7e13b add admin user view button for gitea token reset 2023-03-20 15:25:47 +08:00
chenjing bd110bac00 remove identity for admins user 2023-03-16 16:48:00 +08:00
“xxq250” c44755f8d7 后台增加导出用户 2022-09-26 15:43:24 +08:00
“xxq250” 8ac0c1fcd1 用户管理增加查询条件 2022-08-23 17:01:03 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
jasder 25e1bf1565 FIX 后台管理修改用户信息支持同步到gitea 2021-11-05 18:54:14 +08:00
jasder 9f31dc02f4 FIX 后台管理修改用户信息时同步git用户 2021-11-04 17:58:45 +08:00
jasder 9ba297ccf6 FIX 后台管理系统添加用户时，自动为用户生成邮箱 2021-06-08 09:27:41 +08:00
jasder 66fd6a71e5 FIX 后台管理系统添加用户时，自动为用户生产登录名 2021-06-07 17:09:23 +08:00
jasder 8ee089b82d ADD 后台管理系统 添加新增用户功能 2021-06-04 18:01:03 +08:00
sylor_huang@126.com ac2e3ae730 admins 页面的修改 2020-05-14 18:08:27 +08:00
Jasder 546e112f80 FIX 解决后台管理导航的问题 2020-04-02 14:33:13 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00