Commit Graph

47 Commits

Author SHA1 Message Date
yystopf a25db1afbf Merge branch 'standalone_develop' into dev_osredm_server 2025-11-04 11:32:39 +08:00
yystopf 907ee60c1d 修复:后台管理密码位数为8 2025-11-04 11:30:14 +08:00
yystopf 211cd28ca1 新增:招聘信息后台管理 2025-05-08 15:51:41 +08:00
yystopf 50cb870c34 Merge branch 'standalone_develop' into dev_osredm_server 2024-09-19 13:43:25 +08:00
yystopf eaeb65443e Merge branch 'standalone_develop' into pm_project_develop 2024-09-12 09:21:10 +08:00
yystopf 9c2990e3f8 修复:用户反馈输入框无法点击 2024-08-27 16:31:56 +08:00
kingChan 36d17d37a4 merge 2024-06-20 10:12:48 +08:00
kingChan c98c7d5ac5 sonar 转发接口 2024-06-04 17:25:08 +08:00
xxq250 93f83c7142 Merge branch 'pm_project_develop' into dev_osredm_server
# Conflicts:
#	.gitignore
#	Gemfile.lock
#	app/controllers/application_controller.rb
#	app/controllers/organizations/projects_controller.rb
#	app/models/attachment.rb
#	app/models/issue.rb
#	app/models/token.rb
#	app/views/organizations/projects/index.json.jbuilder
#	config/application.rb
#	config/routes/api.rb
2024-05-29 17:28:58 +08:00
kingChan ad085fcddc add sonarqube 2024-05-29 16:15:07 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
呱呱呱 c752671453 issue links 2023-11-07 17:16:25 +08:00
呱呱呱 840bbff88a add project pm 2023-11-02 15:04:43 +08:00
呱呱呱 f00c3931a8 update issue tags for pm 2023-11-02 09:17:32 +08:00
呱呱呱 770f743750 issue pm 2023-10-31 17:03:35 +08:00
呱呱呱 f6ffaa82a6 根据pm管理需求新增issue接口 2023-10-18 16:13:20 +08:00
呱呱呱 beeb12c336 add page themes for admins 2023-08-23 17:16:03 +08:00
xxq250 bcf085b860 fixed patch换成put方法,js 2023-08-15 17:24:41 +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
chenjing bde9220641 change cla 2023-06-13 17:16:30 +08:00
chenjing cfaa5301ea cla init 2023-06-13 15:30:16 +08:00
chenjing 7da1c7e13b add admin user view button for gitea token reset 2023-03-20 15:25:47 +08:00
chenjing b9e2a3736c admins org list 2023-02-22 09:24:11 +08:00
viletyy c0e1ed9d12 Merge branch 'develop' into dev_jk_server 2022-10-18 15:54:59 +08:00
yystopf cad7e24299 修复:项目列表表头样式 2022-10-18 15:53:37 +08:00
“xxq250” 480f2b6516 Merge branch 'develop' into dev_jk_server
# Conflicts:
#	app/controllers/attachments_controller.rb
#	app/controllers/members_controller.rb
2022-10-17 11:16:10 +08:00
yystopf 53fe554d1e 更改:后台管理表头样式 2022-10-17 10:25:17 +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” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
xiaoxiaoqiong 6d4fb8df34 js zip 2022-05-17 14:45:45 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
yystopf 4310cc9f26 add: platform person admin 2021-12-06 16:41:12 +08:00
jasder 1533f40890 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-01 11:00:01 +08:00
yystopf 9aff90c03a fix 2021-10-28 10:52:44 +08:00
yystopf 43dc966cf9 add: project category upload logo 2021-10-27 18:02:21 +08:00
jasder 4676b756e8 FIX 完善邮箱注册发送邮件功能 2021-10-27 17:01:16 +08:00
yystopf f0580720e3 fix 2021-10-27 16:58:31 +08:00
yystopf 91852d7957 add: project explore management 2021-10-27 16:50:18 +08:00
yystopf d176508010 add: system notification management 2021-10-18 13:49:58 +08:00
yystopf f1586c320b add: rake assets precompile 2021-08-31 14:51:18 +08:00
yystopf 4cb71179fd add: reversed keyword management 2021-08-31 14:22:49 +08:00
jasder dac07bcae0 ADD 页面置顶功能、帮助文档快速入口 2021-05-14 16:23:19 +08:00
Jasder c1b0061b8d ADD educode user login 2020-08-14 18:19:00 +08:00
Jasder c1a5c390f7 ADD action cable for migrate project 2020-07-02 15:49:22 +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