Commit Graph

24 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 ebb1ff76ea fixed 后台项目列表支持id查询 2024-10-09 17:18:32 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf f9e7dafefd 新增:删除fork仓库关闭对应合并请求 2024-07-19 09:46:57 +08:00
yystopf 23dc4a5ec9 新增:后台管理项目列表项目类别筛选 2024-07-18 16:30:53 +08:00
yystopf c362315ea5 新增:后台管理项目列表项目类别筛选 2024-07-18 15:32:34 +08:00
yystopf c9d8ce073f 新增:gitlink菜单权限 2024-07-01 09:55:20 +08:00
yystopf c58ca88edd 修复:导入项目相关问题 2024-06-03 10:36:31 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
xxq250 f0b9765462 fixed 后台项目可查询标识 2024-04-29 09:22:47 +08:00
呱呱呱 6cb7af0401 add data_bank to user action 2023-10-10 13:49:52 +08:00
xxq250 d369741900 项目导出增加地址 2022-12-26 11:47:28 +08:00
“xxq250” 6b67344493 后台项目列表导出 2022-09-15 17:05:11 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 91852d7957 add: project explore management 2021-10-27 16:50:18 +08:00
vilet.yy 09dfd504c2 fix: sql attack 2021-06-17 16:13:40 +08:00
vilet.yy 3e7ae82258 [ADD]phenglei user list and cron job 2021-03-10 14:02:41 +08:00
vilet.yy 0aa75e077e [ADD]sync phenglei user job 2021-03-05 17:04:06 +08:00
sylor_huang@126.com 569c33b254 修改bug 2020-05-25 14:25:46 +08:00
sylor_huang@126.com 0b3683b99e 修改部分bug 2020-05-25 14:22:57 +08:00
sylor_huang@126.com ac2e3ae730 admins 页面的修改 2020-05-14 18:08:27 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00