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

73 Commits

Author SHA1 Message Date
yystopf a3e57e6e73 Merge branch 'standalone_develop' into dev_osredm_server 2025-07-30 16:34:58 +08:00
yystopf 16a71a383b 更改：用户操作日志 2025-07-30 16:23:41 +08:00
yystopf a7ea0436e4 Merge branch 'standalone_develop' into dev_osredm_server 2025-06-24 16:56:29 +08:00
yystopf 16a64027f1 更改：运营人员菜单权限 2025-06-20 10:29:22 +08:00
yystopf e6eea663a9 更改：运营人员菜单权限 2025-06-20 10:25:24 +08:00
xxq250 ada0cf7c94 Merge branch 'standalone_develop' into dev_osredm_server 2025-04-11 11:27:21 +08:00
xxq250 6068d44d62 fixed 后台卡片管理 2025-04-09 09:18:42 +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 db396cd94f fix:导航栏放开 2025-02-17 11:07:00 +08:00
xxq250 735a70bac6 add admin custom sidebar css 2024-11-18 15:27:35 +08:00
xxq250 5a2f1aa61e add admin custom sidebar 2024-11-18 15:25:27 +08:00
xxq250 ea188dd2a0 add admin custom sidebar 2024-11-18 15:21:20 +08:00
yystopf f87a5ce286 新增: 首页底部配置管理后台 2024-11-12 16:22:26 +08:00
xxq250 2381851c88 操作记录后台查询菜单 2024-09-27 09:44:06 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf 785275c65b 更改：后台管理隐藏卡片管理 2024-07-12 15:30:02 +08:00
yystopf ae842938c2 新增：gitlink角色分级菜单完成 2024-06-28 11:51:55 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
yystopf ed81ce5927 更改：活跃度查询时间区间 2024-01-16 16:27:18 +08:00
yystopf 1c8811fda6 新增：项目疑修排行榜 2024-01-16 10:19:02 +08:00
yystopf 016a2f8cf5 更改：后台管理sidebar 2023-12-18 16:04:14 +08:00
呱呱呱 beeb12c336 add page themes for admins 2023-08-23 17:16:03 +08:00
呱呱呱 47a00092b1 update 2023-08-21 17:30:49 +08:00
呱呱呱 96936da9ac add site page 2023-08-10 14:29:26 +08:00
呱呱呱 e3b3dacde7 pr check and send email 2023-08-08 16:27:54 +08:00
xxq250 6c1f9cabda fixed 左侧菜单组织列表 2023-02-22 09:38:32 +08:00
xxq250 5f3d51027e fixed 左侧菜单组织列表 2023-02-22 09:36:13 +08:00
chenjing ee77be7c8a fix 2023-02-22 09:25:49 +08:00
chenjing b9e2a3736c admins org list 2023-02-22 09:24:11 +08:00
yystopf 4a3d1e5a69 Merge branch 'develop' into standalone_develop 2023-02-21 15:40:08 +08:00
yystopf 3a5d8e75df 修改：后台管理sidebar冲突 2023-02-21 15:39:52 +08:00
yystopf 08d8abd163 Merge branch 'develop' into standalone_develop 2023-02-01 14:26:52 +08:00
yystopf 0229d99e74 新增：后台管理排行榜数据 2023-02-01 14:25:55 +08:00
yystopf ccec8e9819 Merge branch 'develop' into dev_jk_server 2022-12-12 16:17:22 +08:00
yystopf 33a3d7f48c merge from develop 2022-11-09 14:37:27 +08:00
yystopf 83b46fcb50 新增：用户反馈意见后台管理逻辑 2022-11-09 11:37:12 +08:00
“xxq250” 4560b9231e fixed 小程序活动 2022-11-04 11:23:47 +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” 5674800c97 删除用户刷新 2022-09-14 18:16:53 +08:00
“xxq250” d51bb7030f Merge remote-tracking branch 'origin/develop' into standalone_develop 
# Conflicts:
#	app/views/users/get_user_info.json.jbuilder
 2022-08-30 18:14:17 +08:00
“xxq250” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
xiaoxiaoqiong 6c68a51091 管理端模态框顶部弹出 2022-04-28 15:38:41 +08:00
yystopf 7aea481ccf add: glcc_apply_infomations admin navbar 2022-04-18 10:24:54 +08:00
yystopf 8aa935ad5c add: glcc news management and api data 2022-04-07 16:13:32 +08:00
xiaoxiaoqiong 5d102f9ef4 统计去掉 2022-02-24 17:38:02 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 43cccc5429 fix: admins navbar and platform communicates order index and competitions filter 2021-12-09 14:04:03 +08:00
yystopf 9648afb0bb add: platform communicate admin 2021-12-06 14:29:05 +08:00
jasder ef6f2c7b42 FIX 删除后台管理不存在的功能入口 2021-11-16 15:44:51 +08:00
jasder 651bf34cfc FIX code review and conflict 2021-11-14 20:50:22 +08:00