Commit Graph

40 Commits

Author SHA1 Message Date
xxq250 fb9b38b9aa 风雷删除成员清除申请加入记录 2024-09-19 09:44:36 +08:00
xxq250 34dacb1d01 fixed 错误代码 2024-06-03 09:07:47 +08:00
xxq250 8bd3899478 fixed 增加成员 2024-05-28 09:52:24 +08:00
xxq250 5d0b95f9ad 合并主干所有代码 2024-05-20 14:35:33 +08:00
yystopf 516f0a9f4e 新增:移除用户同时移除申请 2024-04-10 17:19:56 +08:00
xxq250 6e41605cbc fixed 删除文件失败,参数sha不匹配提示 2024-03-01 15:17:20 +08:00
xxq250 03ce084916 fixed 文件无权限提示修改 2023-08-30 16:09:28 +08:00
xxq250 075f525783 fixed 册除失败提示 2023-08-30 15:56:48 +08:00
xxq250 b7ab513efd 更新文件失败处理 2023-07-06 16:06:19 +08:00
yystopf 05b3317152 新增:文件变更路径使用base64 2023-04-03 17:13:38 +08:00
yystopf ccec8e9819 Merge branch 'develop' into dev_jk_server 2022-12-12 16:17:22 +08:00
yystopf 9b39446dfb 修复:提交文件内容格式由前端决定 2022-11-29 17:08:26 +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
yystopf d14bf35ca1 修复: gitea module命名重复问题 2022-06-23 11:33:11 +08:00
xiaoxiaoqiong 66c40d4791 fixed gitea接口返回判断 2022-06-15 11:16:08 +08:00
yystopf 04f2dbee9a merge from develop 2022-01-18 15:30:57 +08:00
jasder 071f913123 FIX code bug 2021-06-23 17:32:48 +08:00
jasder 6096fdd7bf FIX 解决在线创建文件错误提示信息不准确的问题 2021-06-23 17:31:45 +08:00
jasder 91e142ba82 FIX code bug 2021-06-18 16:44:37 +08:00
jasder 855c51a470 FIX 解决在线创建文件错误提示信息不准确的问题 2021-06-18 16:20:50 +08:00
vilet.yy 5489ea9fbc add: applied join project 2021-06-09 16:53:09 +08:00
Jasder 604da93c5c FIX when add members to project, permission set to readable 2020-12-29 17:17:36 +08:00
viletyy 6c436dd631 [ADD]后台审核特殊许可申请 2020-12-27 18:44:03 +08:00
Jasder 837aa1ea9e FIX Merge master branch 2020-12-25 15:10:50 +08:00
Jasder 6a8ae5234b ADD protected branch Features 2020-12-03 15:24:40 +08:00
Jasder 1daf8591ca FIX Adjust call gitea api for security 2020-11-27 10:18:31 +08:00
Jasder d24e7b6a10 FIX repository create file with token bug 2020-09-29 11:45:29 +08:00
Jasder 79c557bd68 FIX 修复版本库在线创建文件时,commiter信息错误的bug 2020-08-27 14:43:44 +08:00
Jasder 2ac2920399 FIX merge dev_trustie branch 2020-08-18 17:39:37 +08:00
sylor_huang@126.com c9a263e03c Add Dun Check For Project 2020-08-18 10:36:13 +08:00
Jasder 72ba784e70 FIX 版本库更新、创建、删除文件的权限问题 2020-08-13 11:06:34 +08:00
sylor_huang@126.com c5c3294bda 上传文件返回pull_request_id 2020-06-05 10:57:46 +08:00
sylor_huang@126.com ba93347df8 修改bug 2020-06-05 10:07:50 +08:00
sylor_huang@126.com d17d3dd84c 修改branch 2020-06-05 10:01:04 +08:00
Jasder 9a39f2ad7a FIX gitea create file bug 2020-04-23 23:02:57 +08:00
Jasder e6396bdefd FIX 完善gitea平台修改用户信息接口 2020-04-22 15:39:34 +08:00
Jasder 3e2b417cce FIX update repositories api 2020-03-20 20:15:43 +08:00
sylor_huang@126.com 17ad972b38 修改bug 2020-03-16 22:51:00 +08:00
sylor_huang@126.com af62da7ae6 修改bug 2020-03-16 21:54:31 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00