floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
3,718 Commits 7 Branches 16 Tags 710 MiB
Commit Graph

3023 Commits

Author SHA1 Message Date
yystopf 7b91ad37e5 修复 2022-06-30 16:38:46 +08:00
yystopf 9dbb9a42d6 新增: compare 支持sha对比 2022-06-30 16:33:09 +08:00
yystopf a608803aa8 新增: 合并请求审查需审查权限 2022-06-30 11:00:18 +08:00
yystopf 76cc185a1d 新增: 合并请求审核model 2022-06-29 17:16:29 +08:00
xiaoxiaoqiong bf2e6269f9 fixed 仓库报告者角色 可以走接口新建合并请求成功#61489 2022-06-28 11:05:12 +08:00
xiaoxiaoqiong 620d2eeb51 auth token 接入验证登录接口 2022-06-28 10:09:26 +08:00
xiaoxiaoqiong d97888ad16 auth token 接入验证登录接口 2022-06-28 10:02:39 +08:00
xiaoxiaoqiong bdaca48fde Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-06-27 18:05:52 +08:00
xiaoxiaoqiong 41eedff819 auth token 接入验证登录接口 2022-06-27 18:05:46 +08:00
yystopf fb2e2d9534 merge from develop 2022-06-24 14:18:53 +08:00
yystopf b59b76be4a 新增: 更新文档 2022-06-24 11:04:16 +08:00
yystopf 211581cef0 新增: webhooks文档使用新api地址 2022-06-24 09:26:01 +08:00
yystopf 7cad953413 新增: 用户项目列表支持多个参数 2022-06-23 18:16:57 +08:00
yystopf fe58175ee0 新增: webhooks使用token访问的接口 2022-06-23 16:14:00 +08:00
yystopf 5d0849a148 新增: 用户项目列表以及helper方法 2022-06-23 12:19:03 +08:00
yystopf d14bf35ca1 修复: gitea module命名重复问题 2022-06-23 11:33:11 +08:00
yystopf d7dd3901b8 新增: 项目详情 2022-06-22 19:08:14 +08:00
yystopf aefd6c08dc 新增: gitea-client引入以及路由定义 2022-06-21 17:39:11 +08:00
yystopf 5c793088fa Merge branch 'develop' into standalone_develop 2022-06-21 11:38:11 +08:00
yystopf 3c2c742121 修复: 项目邀请链接生成多次返回提示 2022-06-21 11:37:41 +08:00
yystopf 430582aa3d Merge branch 'develop' into standalone_develop 2022-06-21 11:18:28 +08:00
yystopf 9221e55752 修复: 邀请链接跳转用户已加入仓库的提示以及项目申请记录只创建一条 2022-06-21 11:18:14 +08:00
yystopf d6bbc7554f Merge branch 'develop' into standalone_develop 2022-06-20 16:38:06 +08:00
yystopf ba1fa8b685 修复: 项目邀请链接私有项目无法访问的情况 2022-06-20 16:37:59 +08:00
yystopf 7ba77680ac Merge branch 'develop' into standalone_develop 2022-06-20 16:36:10 +08:00
yystopf 29e3a55a0c 修复: 项目邀请链接私有项目无法访问的情况 2022-06-20 16:36:01 +08:00
yystopf 7e5d5e31e5 merge from develop 2022-06-20 10:21:10 +08:00
yystopf 45b7f70d9f 新增：项目邀请链接增加时间限制，以及show_link接口新增 2022-06-20 10:16:39 +08:00
yystopf 1ebb6cb561 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-20 09:34:29 +08:00
xiaoxiaoqiong 8f45bcf959 Merge remote-tracking branch 'origin/develop' into develop 2022-06-17 17:02:31 +08:00
xiaoxiaoqiong 1f9caeece5 auth2接入 2022-06-17 17:02:24 +08:00
yystopf f4737d88d8 Merge branch 'develop' into standalone_develop 2022-06-17 14:19:58 +08:00
yystopf 5b4e6f4902 修复: 项目存在敏感词更新forked数量使用update_column 2022-06-17 14:19:41 +08:00
yystopf c0c259a5fc Merge branch 'develop' into standalone_develop 2022-06-17 14:07:52 +08:00
yystopf 3d0e323801 fix 2022-06-17 14:07:33 +08:00
yystopf f6fb50529c 新增: 邀请项目链接接口文档 2022-06-17 14:06:59 +08:00
yystopf c42f3d5928 新增：邀请用户链接生成 2022-06-17 14:06:59 +08:00
yystopf 0fa5bb2211 Merge branch 'develop' into standalone_develop 2022-06-16 13:48:28 +08:00
yystopf 42d2b51f7f 修复: 项目敏感词判定只在创建或者更新的时候 2022-06-16 13:42:17 +08:00
xiaoxiaoqiong 66c40d4791 fixed gitea接口返回判断 2022-06-15 11:16:08 +08:00
yystopf dd03b9f147 merge from develop 2022-06-13 12:54:56 +08:00
yystopf ce467736a7 修复: readme无法正常跳转目录的问题 2022-06-13 12:53:40 +08:00
xiaoxiaoqiong f727e8f94e 用户头像访问取消权限制 2022-06-11 12:35:21 +08:00
xiaoxiaoqiong cc2c0e8e26 调整日志输出 2022-06-09 14:50:00 +08:00
yystopf 7a0dbaaefb Merge branch 'develop' into standalone_develop 2022-06-08 10:47:08 +08:00
yystopf 3e4dd90e17 修复: 用户名称展示时只去掉首末的空格 2022-06-08 10:46:55 +08:00
yystopf 8a7dc75907 fix merge from develop 2022-06-08 10:38:10 +08:00
yystopf 8ae5587516 fix: search name use strip 2022-06-08 10:37:31 +08:00
xiaoxiaoqiong 15a0b85ae6 通知邮件支持用户不存在时发送base_url 2022-06-01 16:11:18 +08:00
xiaoxiaoqiong 0b543f7dda 通知邮件支持用户不存在时发送base_url 2022-06-01 16:08:20 +08:00
xiaoxiaoqiong a07204111a 通知邮件支持用户不存在时发送 2022-06-01 15:24:39 +08:00
xiaoxiaoqiong a7ce3f3728 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-06-01 15:23:14 +08:00
xiaoxiaoqiong 7290cd6495 通知邮件支持用户不存在时发送 2022-06-01 15:23:05 +08:00
yystopf e69fe13745 merge from develop 2022-06-01 10:03:29 +08:00
yystopf 038df804c0 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-01 10:01:15 +08:00
yystopf 877948b0cd 新增: 通用消息模板后台创建 2022-06-01 10:00:57 +08:00
xiaoxiaoqiong 9a17c4865f 项目名称和描述增加敏感词检测 2022-06-01 09:27:18 +08:00
xiaoxiaoqiong 4a23878185 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-06-01 09:23:21 +08:00
xiaoxiaoqiong dc787a35d4 项目名称和描述增加敏感词检测 2022-06-01 09:23:11 +08:00
yystopf b785406ab8 Merge branch 'develop' into standalone_develop 2022-05-31 16:34:20 +08:00
yystopf 9427db3e5a 新增: 通用消息模板 2022-05-31 16:34:08 +08:00
yystopf 2d52dbfc2f Merge branch 'develop' into standalone_develop 2022-05-30 14:50:48 +08:00
yystopf 81da71d478 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-05-30 14:50:23 +08:00
yystopf 169dc84e22 新增: 组织下项目需返回是否为公有项目字段 2022-05-30 14:50:12 +08:00
xiaoxiaoqiong f66e951f31 Merge branch 'develop' into standalone_develop 2022-05-30 11:19:13 +08:00
xiaoxiaoqiong d6fd85f536 Repository.url重写，导入项目时为空 2022-05-30 11:18:24 +08:00
xiaoxiaoqiong 331dfa4b12 Merge branch 'develop' into standalone_develop 2022-05-30 10:26:35 +08:00
xiaoxiaoqiong 6448a30e03 render_error替换成tip_exception 2022-05-30 10:25:43 +08:00
xiaoxiaoqiong 17fb43cea8 render_error替换成tip_exception 2022-05-30 10:24:39 +08:00
xiaoxiaoqiong e76822eb34 fixed ci报错200处理 2022-05-27 16:54:09 +08:00
xiaoxiaoqiong 1220223322 rake导入项目,无语言处理 2022-05-27 14:43:16 +08:00
yystopf 2a387ad997 Merge branch 'develop' into standalone_develop 2022-05-27 10:48:38 +08:00
yystopf a6e50d2a25 修复 devops无法激活项目的问题 2022-05-27 10:48:20 +08:00
yystopf f6e8f24480 Merge branch 'develop' into standalone_develop 2022-05-26 15:09:26 +08:00
yystopf bd16ca476d 增加: 退出仓库api文档 2022-05-26 15:08:42 +08:00
yystopf 19ec81e975 Merge branch 'develop' into standalone_develop 2022-05-25 11:47:44 +08:00
yystopf 2ea78b4f20 增加: 已登录用户对用户名、邮箱、电话进行校验 2022-05-25 11:47:35 +08:00
yystopf ad9bb8e542 修复: 合并从develop 2022-05-24 18:10:20 +08:00
yystopf e36c7a4b6a 修复: 邮箱搜索不需要return 404 2022-05-24 18:09:36 +08:00
yystopf 9979c87d0c 修复: 合并从develop 2022-05-24 17:27:24 +08:00
yystopf 8e8ec821f2 新增: 根据邮箱来获取用户 2022-05-24 17:26:10 +08:00
xiaoxiaoqiong 94166a363c fixed 增加自动登录，gitea注册 2022-05-24 15:24:15 +08:00
xiaoxiaoqiong ebe5fad7dd fixed 增加自动登录，gitea注册 2022-05-24 14:33:23 +08:00
xiaoxiaoqiong 85a36ca2e7 fixed 增加自动登录，gitea注册 2022-05-24 14:14:57 +08:00
xiaoxiaoqiong 75cef14605 fixed 增加自动登录，gitea注册 2022-05-24 14:08:33 +08:00
xiaoxiaoqiong 93f8b659a1 fixed 增加自动登录，gitea注册 2022-05-24 14:00:15 +08:00
xiaoxiaoqiong b45ee11239 fixed 增加自动登录，gitea注册 2022-05-24 13:46:58 +08:00
xiaoxiaoqiong 33fa55bcb6 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-05-24 11:49:01 +08:00
xiaoxiaoqiong 643a99fdf1 fixed 增加自动登录，gitea注册 2022-05-24 11:48:56 +08:00
yystopf 38c5432c2a Merge branch 'develop' into standalone_develop 2022-05-24 11:46:26 +08:00
yystopf aa18fe0ad4 修复: 转移项目时新接受者需要移除原来的权限角色 2022-05-24 11:44:05 +08:00
yystopf 183eb15c7d Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-05-24 11:03:59 +08:00
yystopf fb43268444 fix: merge from develop 2022-05-24 11:03:54 +08:00
yystopf c27cc063e6 add: new update user info simple and sync gitea 2022-05-24 10:59:52 +08:00
xiaoxiaoqiong b673909f9e fixed 增加自动登录，手机号先记录，后续用 2022-05-24 10:47:17 +08:00
xiaoxiaoqiong ee3a14fa28 fixed 增加自动登录 2022-05-24 10:34:31 +08:00
xiaoxiaoqiong 26bfc2c0bf fixed 增加自动登录 2022-05-24 10:33:21 +08:00
xiaoxiaoqiong 56721930a2 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-05-24 10:26:06 +08:00
xiaoxiaoqiong 2959414d56 fixed 增加自动登录 2022-05-24 10:25:58 +08:00
yystopf 6223cf41e2 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-05-23 18:10:54 +08:00
yystopf 1d3f79e777 Merge branch 'develop' into standalone_develop 2022-05-23 18:10:47 +08:00
yystopf b0092487e6 fix: is readme use regex 2022-05-23 18:10:41 +08:00
xiaoxiaoqiong 0ae3544235 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 
# Conflicts:
#	app/controllers/users_controller.rb
#	app/helpers/application_helper.rb
 2022-05-23 18:06:24 +08:00
xiaoxiaoqiong 05b3f2a2fb fixed timego时间差 2022-05-23 18:05:13 +08:00
yystopf 97fe157279 Merge branch 'develop' into standalone_develop 2022-05-23 09:27:16 +08:00
yystopf fbebd0a623 fix 2022-05-23 09:27:09 +08:00
yystopf 02681abaee Merge branch 'develop' into standalone_develop 2022-05-21 16:46:14 +08:00
yystopf fe23c2afbf fix: replace content next if blank 2022-05-21 16:45:42 +08:00
yystopf b06ad71082 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-05-20 17:06:10 +08:00
yystopf 3212bc4842 fix: merge from develop 2022-05-20 17:06:00 +08:00
yystopf 779c86108a fix: readme relative delay and replace_content 2022-05-20 17:00:02 +08:00
yystopf e4779926bd Merge pull request '代码溯源部分代码' (#9) from yystopf/forgeplus:standalone_develop into standalone_develop 2022-05-20 14:46:33 +08:00
yystopf 803fdfc49e fix: merge from develop 2022-05-20 11:44:56 +08:00
yystopf 83e43f0c97 add: new readme delay function 2022-05-20 11:43:22 +08:00
yystopf ccec3494bc merge from develop 2022-05-18 11:38:07 +08:00
yystopf e237fd46f7 fix: not found user return 404 2022-05-18 11:37:23 +08:00
yystopf 6dc2f0b062 Merge branch 'develop' into standalone_develop 2022-05-18 11:03:47 +08:00
yystopf ca3c564529 fix: not found user return 404 2022-05-18 11:03:39 +08:00
yystopf f79e4f8e81 Merge branch 'develop' into standalone_develop 2022-05-18 10:11:22 +08:00
yystopf 9cd18397f7 fix: import user login length required 2022-05-18 10:11:09 +08:00
yystopf bfd3298cd0 fix 2022-05-17 11:42:43 +08:00
yystopf 077926de18 fix 2022-05-17 11:39:57 +08:00
yystopf 4fade5d0b7 fix: project trace tasks name rule change 2022-05-17 11:34:08 +08:00
yystopf f51ebaad67 fix 2022-05-16 17:08:52 +08:00
yystopf 8ae6a0deb2 fix: some feature about permission 2022-05-16 17:02:38 +08:00
yystopf d9b3711e08 Merge branch 'develop' into standalone_develop 2022-05-16 16:59:36 +08:00
yystopf 77620f7735 add: download and import user template xlsx 2022-05-16 16:59:25 +08:00
yystopf acbd0d376c fix: change trace user post valid 2022-05-16 14:26:21 +08:00
yystopf 2f4ffe3d8e fix: change trace user post valid 2022-05-16 14:25:54 +08:00
yystopf a6efae8b10 fix 2022-05-16 10:48:23 +08:00
yystopf 5a728e7d4d fix: trace user exist and compact tasks create params 2022-05-16 09:58:47 +08:00
yystopf 04a733d99f fix: check user trace tasks count 2022-05-13 16:57:41 +08:00
yystopf 9e8c576ff6 fix: remove require manager operate 2022-05-13 15:38:04 +08:00
yystopf 94881dd72a add: user trace tasks record 2022-05-13 14:31:59 +08:00
yystopf 2c7bb1b5cd fix: remove project tasks_count 2022-05-13 14:00:21 +08:00
yystopf 7fcbbb7922 fix: remove project tasks_count 2022-05-13 13:53:25 +08:00
yystopf 3d9fe5bba5 add: download pdf from trace server 2022-05-12 17:52:19 +08:00
yystopf 4dccdfde97 fix 2022-05-12 17:15:19 +08:00
yystopf 00fc83235f download file use redirect 2022-05-12 17:11:16 +08:00
yystopf 498ee26f59 fix 2022-05-12 11:14:17 +08:00
yystopf 5d771c824b add: operate permission and request timeout 2022-05-12 11:12:34 +08:00
yystopf 3eccd6be64 add: user has trace user field 2022-05-12 09:45:37 +08:00
yystopf 9b3336c0a0 fix: reload task need increment tasks count 2022-05-12 09:43:55 +08:00
yystopf 12c961d70d fix 2022-05-12 09:43:55 +08:00
yystopf 7750cbe272 add: project trace tasks count 2022-05-12 09:43:55 +08:00
yystopf 1f13bba52e add: trace user tasks_count 2022-05-12 09:43:55 +08:00
yystopf 5dcee1b4dc add: traces api document 2022-05-12 09:43:55 +08:00
yystopf cf09b28f5e add: project menu services 2022-05-12 09:43:54 +08:00
yystopf f31796f344 add: branch valid for tasks 2022-05-12 09:43:52 +08:00
yystopf 2d9bde134a fix 2022-05-12 09:43:00 +08:00
yystopf a0a7f908f4 rename namespace 2022-05-12 09:42:59 +08:00
yystopf 17ccf3d576 rename namespace 2022-05-12 09:42:59 +08:00
yystopf 72a32ed8c4 rename namespace 2022-05-12 09:42:59 +08:00
yystopf c64fa5135b fix 2022-05-12 09:42:59 +08:00
yystopf 12cc37443e add: trace controller and router 2022-05-12 09:42:59 +08:00
yystopf f5efbcfc04 Merge branch 'develop' into standalone_develop 2022-05-07 14:06:58 +08:00
yystopf 50dc5cce5d fix 2022-05-07 14:06:48 +08:00
yystopf 0afac46778 Merge branch 'develop' into standalone_develop 2022-05-07 11:58:13 +08:00
yystopf a6cee63d17 fix: change owner must fix foreign_key 2022-05-07 11:57:58 +08:00
yystopf 20af4a7d82 Merge branch 'develop' into standalone_develop 2022-05-06 17:25:52 +08:00
yystopf 000197b0d1 fix: issues and pull_request length calculate 2022-05-06 17:25:34 +08:00
yystopf 67b386d947 Merge branch 'develop' into standalone_develop 2022-05-06 14:29:15 +08:00
yystopf 6aa3321d17 fix: pr title description validate 2022-05-06 14:29:05 +08:00
yystopf 9d8df2b4d9 Merge branch 'develop' into standalone_develop 2022-05-06 09:57:23 +08:00
yystopf d44308fc82 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-05-06 09:56:38 +08:00
yystopf ae7d0d1329 add: issues description and journals notes validate 2022-05-06 09:56:22 +08:00
xiaoxiaoqiong 55c74de8e4 fork_users加入组织 2022-05-05 10:41:02 +08:00
yystopf 52c94effdc Merge branch 'develop' into standalone_develop 2022-05-05 10:18:19 +08:00
yystopf 7c88ea3d67 add: quit repo 2022-05-05 10:00:02 +08:00
yystopf d799d329ff add: compare add paginate 2022-04-28 18:54:56 +08:00
yystopf f15cd44dff add: compare add paginate 2022-04-28 18:53:33 +08:00
yystopf 91ea5ca96a Merge branch 'develop' into standalone_develop 2022-04-28 11:12:35 +08:00
yystopf 3abd6037d9 fix: show super description aways desplay 2022-04-28 11:12:16 +08:00
yystopf 11724bf63f Merge branch 'develop' into standalone_develop 2022-04-28 11:04:01 +08:00
yystopf ec3a556a6f fix: default value for show super description 2022-04-28 11:03:42 +08:00
yystopf 1d7c7eba24 Merge branch 'develop' into standalone_develop 2022-04-28 10:54:02 +08:00
yystopf 396ac55429 add: user super description 2022-04-28 10:42:55 +08:00
yystopf e1b4622ede Merge branch 'develop' into standalone_develop 2022-04-26 17:17:05 +08:00
yystopf 088c617cc1 add: name query for branches 2022-04-26 17:15:59 +08:00
yystopf 246b484ad8 fix merge from develop 2022-04-18 14:14:48 +08:00
yystopf fc3cf01d3f add: get user image action 2022-04-18 13:49:08 +08:00
yystopf 345fd31834 Merge branch 'develop' into standalone_develop 2022-04-18 10:52:59 +08:00
yystopf 8f5bb0e2d9 fix: organization gitea_token read by associations 2022-04-18 10:52:48 +08:00
yystopf 7aea481ccf add: glcc_apply_infomations admin navbar 2022-04-18 10:24:54 +08:00
yystopf 37317f82bf Merge branch 'develop' into standalone_develop 2022-04-11 16:09:08 +08:00
yystopf 2dfd69ae21 fix: response data result 2022-04-11 16:08:50 +08:00
yystopf a132154136 Merge branch 'develop' into standalone_develop 2022-04-11 15:48:54 +08:00
yystopf 720c073f32 fix 2022-04-11 15:48:47 +08:00
yystopf 185cb308ac Merge branch 'develop' into standalone_develop 2022-04-11 15:30:44 +08:00
yystopf 0076468a15 fix: trace client request data 2022-04-11 15:30:28 +08:00
yystopf 910ae48556 fix: exception to ex 2022-04-11 10:50:18 +08:00
xiaoxiaoqiong 6e86f9d9f3 竞赛配置子赛项 2022-04-08 23:07:23 +08:00
xiaoxiaoqiong 6d280ed8f2 竞赛配置子赛项 2022-04-08 18:51:01 +08:00
xiaoxiaoqiong 3f85f88c92 竞赛配置子赛项 2022-04-08 18:46:14 +08:00
xiaoxiaoqiong f60cd409b6 竞赛配置子赛项 2022-04-08 18:40:52 +08:00
xiaoxiaoqiong 9d46f2743d 竞赛配置子赛项 2022-04-08 17:45:15 +08:00
xiaoxiaoqiong aaf2b43986 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-04-08 17:38:59 +08:00
xiaoxiaoqiong 75a9a65b9b 竞赛配置子赛项 2022-04-08 17:38:26 +08:00
yystopf 17f2436118 Merge branch 'develop' into standalone_develop 2022-04-08 15:03:52 +08:00
yystopf eac7331070 fix: settings need prefix 2022-04-08 15:03:40 +08:00
yystopf 2243697184 Merge branch 'develop' into standalone_develop 2022-04-08 14:53:06 +08:00
yystopf 551f333261 fix 2022-04-08 14:52:56 +08:00
yystopf 18cf1d3ecb Merge branch 'glcc_news_develop' into standalone_develop 2022-04-08 13:23:49 +08:00
yystopf 4cefaa7e92 Merge branch 'develop' into standalone_develop 2022-04-08 11:59:25 +08:00
yystopf dec264d169 fix: sync user pwd 2022-04-07 16:28:40 +08:00
yystopf 8aa935ad5c add: glcc news management and api data 2022-04-07 16:13:32 +08:00
xiaoxiaoqiong 4bdff8313a Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-04-06 20:32:06 +08:00
xiaoxiaoqiong c4f91fb054 搜索用户增加email和单位 2022-04-06 20:32:02 +08:00
yystopf fde01e62ef Merge branch 'develop' into standalone_develop 2022-04-06 17:04:52 +08:00
yystopf 7055974443 fix 2022-04-06 17:04:31 +08:00
xiaoxiaoqiong 1f6ac05bad 允许非登录搜索用户 2022-04-06 14:33:47 +08:00
yystopf c5dd099169 Merge branch 'develop' into standalone_develop 2022-03-31 16:18:25 +08:00
yystopf 3536918938 fix 2022-03-31 16:18:16 +08:00
yystopf d56da6d020 Merge branch 'develop' into standalone_develop 2022-03-31 16:08:43 +08:00
yystopf 56278b84f2 Merge pull request '导航增加动态用户数据获取' (#3) from hh_develop_navbar into develop 2022-03-31 16:08:36 +08:00
yystopf 882a50cf56 add: setting navbar varible 2022-03-31 16:04:48 +08:00
yystopf 234f5b900c Merge branch 'develop' into standalone_develop 2022-03-31 14:25:02 +08:00
yystopf db4031b8bf fix 2022-03-31 14:24:47 +08:00
yystopf dd3236e310 Merge branch 'develop' into standalone_develop 2022-03-31 13:18:46 +08:00
yystopf ecfc39565c fix 2022-03-31 13:18:38 +08:00
yystopf 7fd41e13e4 Merge branch 'develop' into standalone_develop 2022-03-31 13:04:02 +08:00
yystopf 9ced678f91 fix: user trace token 2022-03-31 13:03:54 +08:00
yystopf b25db9d37f fix: merge from develop 2022-03-31 13:00:36 +08:00
yystopf 4bbb843edf add: trace users and get trace token 2022-03-31 12:54:39 +08:00
yystopf 747646cd9d add: trace client and api completed 2022-03-30 16:19:32 +08:00
yystopf a5be4a9502 fix: readme image regex error rescued 2022-03-28 11:25:13 +08:00
yystopf d0d906d04c fix: readme image regex error rescued 2022-03-28 11:05:21 +08:00
xiaoxiaoqiong 4c69c4d20f Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-03-24 10:25:31 +08:00
xiaoxiaoqiong 183315bbd9 万能验证码，用于测试 2022-03-24 10:25:24 +08:00
yystopf 4dc3546124 Merge branch 'standalone_develop' of https://gitlink.org.cn/Trustie/forgeplus into standalone_develop 2022-03-22 10:45:55 +08:00
yystopf d796d59557 Merge branch 'develop' into standalone_develop 2022-03-22 10:45:45 +08:00
yystopf bc639488aa fix: issues filter error 2022-03-22 10:45:14 +08:00
xiaoxiaoqiong 930805704a fixed: 文件目录加载性能优化 2022-03-18 17:32:29 +08:00
xiaoxiaoqiong 9912ad0779 fixed: 1.readme加载不正常 2022-03-18 17:09:06 +08:00
xiaoxiaoqiong d9ae4e4ba0 fixed: 1.readme加载不正常, 2.文件目录加载性能优化 2022-03-18 16:52:23 +08:00
xiaoxiaoqiong 23dc2d7fb6 目录树加载图片不需要Content 2022-03-18 14:55:42 +08:00
xiaoxiaoqiong fe5c18c019 readme.md支持图片相对路径 2022-03-18 14:24:03 +08:00
xiaoxiaoqiong fa6f015128 readme.md支持图片相对路径 2022-03-18 14:21:12 +08:00
xiaoxiaoqiong 7f1b95c7d7 readme.md支持图片相对路径 2022-03-18 14:03:59 +08:00
xiaoxiaoqiong 2346b0f848 readme.md支持图片相对路径 2022-03-18 11:41:26 +08:00
xiaoxiaoqiong c0e97409cb gitea 请求延长到20分钟 2022-03-11 14:07:39 +08:00
xiaoxiaoqiong 99fbecc834 gitea 请求延长到20分钟 2022-03-11 14:06:12 +08:00
yystopf 4cc8dd70f4 Merge branch 'develop' into standalone_develop 2022-03-10 10:47:20 +08:00
yystopf 8d0a6d267a fix: download escape 2022-03-10 10:47:06 +08:00
yystopf 0db1820557 Merge branch 'develop' into standalone_develop 2022-03-10 09:52:12 +08:00
yystopf b1c03ed5e8 fix: activity issues must only issue 2022-03-10 09:51:46 +08:00
yystopf 1c660213a7 fix: claims is losed 2022-03-10 09:36:51 +08:00
yystopf 1fe8d1defc Merge branch 'develop' into standalone_develop 2022-03-07 11:20:23 +08:00
yystopf ef12f85687 fix: create pull request valid merge_user_login 2022-03-07 11:17:10 +08:00
yystopf e120c4dac2 add: origin repository need open pr menu 2022-03-07 10:53:07 +08:00
yystopf e1cf2fcdeb fix: owner project not allow repeat name 2022-03-07 10:25:05 +08:00
yystopf c4f380873e fix: is public project attachment allow is not member read 2022-03-07 10:20:51 +08:00
yystopf 5cb2e55f74 add: organization users insist team nickname search 2022-03-07 09:58:05 +08:00
xiaoxiaoqiong 1dd3fbc69a fixed fork列表中存在组织时显示错误 2022-03-03 14:16:57 +08:00
yystopf 217e0fdd97 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-24 18:09:53 +08:00
yystopf f0b8489828 Merge branch 'develop' into standalone_develop 2022-02-24 18:09:20 +08:00
yystopf a2612d8009 fix 2022-02-24 18:09:11 +08:00
yystopf 2f2655525f fix: user rank user_id must exist 2022-02-24 18:07:18 +08:00
yystopf 57c60b2fe9 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-24 16:44:58 +08:00
yystopf aa643430fa Merge branch 'develop' into standalone_develop 2022-02-24 14:27:31 +08:00
yystopf 1a93477635 fix: forked templete delay 2022-02-24 14:26:04 +08:00
yystopf ab989ed7d7 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-24 11:46:44 +08:00
yystopf 53d094784b Merge branch 'develop' into standalone_develop 2022-02-22 11:03:47 +08:00
yystopf 7c664addbd fix 2022-02-22 11:03:28 +08:00
yystopf 1bb754e9d8 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-22 10:39:47 +08:00
yystopf f2f2ce8252 merge from develop 2022-02-22 10:38:42 +08:00
yystopf c6b79f82bc fix: change password new version 2022-02-22 10:03:51 +08:00
xiaoxiaoqiong 4e3f9cc019 竞赛通知任务调度 2022-02-21 16:48:59 +08:00
xiaoxiaoqiong 5ed7b3e4ad 竞赛通知任务调度 2022-02-21 16:46:40 +08:00
xiaoxiaoqiong 4e2c46260c Merge remote-tracking branch 'origin/develop' into develop 2022-02-17 18:28:40 +08:00
xiaoxiaoqiong 9ba00b21c9 竞赛通知api 2022-02-17 18:28:32 +08:00
yystopf 1100309038 Merge branch 'develop' into standalone_develop 2022-02-17 11:12:58 +08:00
yystopf b11f5fd228 fix: cache rollback 2022-02-17 11:12:50 +08:00
yystopf af5f2b2fe3 Merge branch 'develop' into standalone_develop 2022-02-17 10:59:29 +08:00
yystopf 90dbe0730a fix: job not affect 2022-02-17 10:59:18 +08:00
yystopf f39e8b7668 Merge branch 'develop' into standalone_develop 2022-02-17 09:43:52 +08:00
yystopf d6633cb73a fix 2022-02-17 09:43:44 +08:00
yystopf 86ef890f8b Merge branch 'develop' into standalone_develop 2022-02-17 09:40:54 +08:00
yystopf a7a6abd22a fix: add rule for issue expire 2022-02-17 09:40:44 +08:00
yystopf 6fd47b56a5 Merge branch 'develop' into standalone_develop 2022-02-17 09:37:00 +08:00
yystopf c956667ce0 fix 2022-02-17 09:36:49 +08:00
yystopf 898453c88c Merge branch 'develop' into standalone_develop 2022-02-16 15:10:19 +08:00
yystopf 5701c818ed fix 2022-02-16 15:10:10 +08:00
yystopf 1ac2ddfaa5 fix: default setting for new template message 2022-02-16 11:46:34 +08:00
yystopf 0bd274f813 Merge branch 'develop' into standalone_develop 2022-02-16 11:17:15 +08:00
yystopf 4aac05d4e1 fix: build user template message data must fronted 2022-02-16 11:17:03 +08:00
yystopf 3c7da85bee Merge branch 'standalone_develop' into pre_trustie_server 2022-02-16 09:35:42 +08:00
yystopf 9751c954df Merge branch 'develop' into standalone_develop 2022-02-16 09:35:22 +08:00
yystopf 84b56bfcb8 fix: project milestone create notice template 2022-02-16 09:34:31 +08:00
yystopf ac07c88f84 Merge branch 'develop' into standalone_develop 2022-02-15 18:30:25 +08:00
yystopf 7485564bb9 add: template message platform varible 2022-02-15 18:30:13 +08:00
yystopf 5e696ae905 Merge branch 'develop' into standalone_develop 2022-02-15 17:33:55 +08:00
yystopf b5acf2308a Merge pull request '新增站内信以及里程碑完成度修复' (#299) from yystopf/forgeplus:develop into develop 2022-02-15 17:33:30 +08:00
yystopf e3f4313c80 fix 2022-02-15 17:29:13 +08:00
yystopf b223abe229 fix: init data 2022-02-15 17:26:46 +08:00
yystopf b3bede308c add: some new message rules 2022-02-15 17:13:06 +08:00
xiaoxiaoqiong 2f170a54c6 fixed setting编辑类型下拉选中 2022-02-15 17:10:57 +08:00
yystopf 22293572ac fix: issue changed about version callback 2022-02-14 17:02:59 +08:00
xiaoxiaoqiong 2050559077 通过配置确定github克隆方式 2022-02-14 16:54:24 +08:00
xiaoxiaoqiong 8720cab1e9 通过配置确定github克隆方式 2022-02-14 16:53:29 +08:00
yystopf 959c1e8d95 add: user profile setting message 2022-02-14 13:55:34 +08:00
yystopf ea11672fff Merge branch 'standalone_develop' into pre_trustie_server 2022-02-11 16:27:56 +08:00
yystopf 09c4f8db0e Merge branch 'develop' into standalone_develop 2022-02-11 16:27:42 +08:00
yystopf 29dc3fff39 fix: migrate use old rule 2022-02-11 16:27:22 +08:00
yystopf 8d18149537 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-10 14:11:06 +08:00
yystopf 8050af23fc Merge branch 'develop' into standalone_develop 2022-02-10 14:10:54 +08:00
yystopf 298abdd1b1 fix: devops organization bug 2022-02-10 14:08:14 +08:00
yystopf 2738d950d4 Merge branch 'standalone_develop' into pre_trustie_server 2022-01-26 13:47:14 +08:00
yystopf 3ce9b2d145 Merge branch 'develop' into standalone_develop 2022-01-25 14:26:20 +08:00
yystopf 26f87fba16 fix: edit transfer need change fork info 2022-01-25 14:26:11 +08:00
yystopf 465f38bca7 Merge branch 'develop' into standalone_develop 2022-01-25 11:39:15 +08:00
yystopf 1e9a32a93e fix: issues select count paginator 2022-01-25 11:39:06 +08:00
yystopf 04bc6d363f Merge branch 'develop' into standalone_develop 2022-01-25 10:34:33 +08:00
yystopf 2dc79052c2 fix: create project trend when status is closed 2022-01-25 10:34:20 +08:00
yystopf b9e2a6edf1 Merge branch 'standalone_develop' into pre_trustie_server 2022-01-24 17:27:21 +08:00
yystopf e0f5337fdd Merge branch 'develop' into standalone_develop 2022-01-24 14:26:36 +08:00
yystopf 380ca3a066 fix: projects query rule 2022-01-24 14:26:24 +08:00
yystopf 7d19849968 Merge branch 'develop' into standalone_develop 2022-01-24 10:44:59 +08:00
yystopf 237b0afb08 fix: team user build use find or create by 2022-01-24 10:44:46 +08:00
yystopf 67914201bf merge from develop 2022-01-24 10:06:20 +08:00
yystopf e14936e820 fix: issues select count 2022-01-24 10:00:44 +08:00
yystopf 655c85851f Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2022-01-21 18:20:40 +08:00
yystopf 1c7e414aa4 fix: owner allow nil 2022-01-21 18:19:43 +08:00
yystopf 099fc52e00 fix: contributor error rescue 2022-01-21 18:19:34 +08:00
yystopf 490957ec3b fix: contributor error rescue 2022-01-21 18:19:27 +08:00
yystopf b1884d30d5 fix: detail result delay 2022-01-21 18:19:06 +08:00
xiaoxiaoqiong 98d8ee1fb6 Merge remote-tracking branch 'origin/develop' into develop 2022-01-21 15:50:41 +08:00
xiaoxiaoqiong 2ca77732c8 fixed 注册登录类型 2022-01-21 15:50:37 +08:00
yystopf 9f7725b097 Merge branch 'standalone_develop' into pre_trustie_server 2022-01-14 17:38:16 +08:00
yystopf 612101498c Merge branch 'develop' into standalone_develop 2022-01-14 17:38:09 +08:00
yystopf 70d22f7c4f fix: create team overflow tip 2022-01-14 16:09:38 +08:00
yystopf 25d0e784bb fix: pr assignee info use array 2022-01-14 16:00:59 +08:00
yystopf 5d45b24299 fix: devops return result changed 2022-01-14 10:55:53 +08:00
yystopf b6b8befde7 fix: pr update must edit assignee login 2022-01-14 10:55:01 +08:00
yystopf f33b9559cd fix: download delay 2022-01-13 11:24:27 +08:00
yystopf cf69628f85 Merge branch 'standalone_develop' into pre_trustie_server 2022-01-11 10:53:29 +08:00
yystopf 4a8f8af896 Merge branch 'develop' into standalone_develop 2022-01-11 10:48:56 +08:00
yystopf f9bc2258ec fix: migrate repo github use another addr 2022-01-11 10:48:29 +08:00
yystopf 05f5982a53 Merge branch 'standalone_develop' into pre_trustie_server 2022-01-07 18:04:55 +08:00
yystopf f76dad680a Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop 2022-01-07 18:03:57 +08:00
yystopf 2a09ced1ce fix: branches use branch name api 2022-01-07 15:41:50 +08:00
yystopf 7a1e6cfbad fix: issue edit and new branches only load name api 2022-01-07 15:19:10 +08:00
yystopf 47d1f727ce fix: create team count limit 2022-01-06 17:38:44 +08:00
yystopf a7665df0ea fix: download file url use cgi escape 2022-01-06 15:04:59 +08:00
yystopf 84f12adce8 fix: webhook tasks list error delay 2022-01-06 14:29:31 +08:00
yystopf 7fde1e0e12 fix: webhook field changed 2022-01-06 11:10:49 +08:00
yystopf 499734ebf9 fix: upload user image allow base64 2022-01-04 22:44:39 +08:00
yystopf f339df699e add: user upload image 2022-01-03 22:32:09 +08:00
yystopf cfd94cb3b7 fix: migrate repo username nil is excepted 2022-01-03 20:33:11 +08:00
yystopf 43e0617429 fix: webhook field changed 2021-12-30 09:47:12 +08:00
xiaoxiaoqiong 5a43239ad9 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-29 15:01:25 +08:00
xiaoxiaoqiong 650dbea38b 停止trustie同步cookie 2021-12-29 15:00:37 +08:00
xiaoxiaoqiong abde13f061 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2021-12-29 14:23:56 +08:00
xiaoxiaoqiong 0619c5a4d9 开启dubug 2021-12-29 14:23:51 +08:00
yystopf ec444f3855 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-29 10:05:42 +08:00
yystopf 7beed940e9 Merge branch 'develop' into standalone_develop 2021-12-29 10:05:29 +08:00
yystopf d6b66d5324 fix 2021-12-29 09:56:49 +08:00
yystopf 0c1df3b2cb fix 2021-12-29 09:53:14 +08:00
yystopf fa86d3ea10 fix: branch delay 2021-12-29 09:50:57 +08:00
yystopf 8c99b754fb fix: create pr branch name escape 2021-12-28 18:37:44 +08:00
yystopf f3cf2c87c9 fix: create pr branch name escape 2021-12-28 18:29:58 +08:00
yystopf 4f63caa86c Merge branch 'standalone_develop' into pre_trustie_server 2021-12-28 16:10:44 +08:00
yystopf 96b0f2d167 Merge branch 'develop' into standalone_develop 2021-12-28 16:10:16 +08:00
yystopf 75f3166ffa fix 2021-12-28 14:45:12 +08:00
yystopf 04bf423fcb fix 2021-12-28 14:42:55 +08:00
yystopf 51e8c9d908 fix: compare use url escape 2021-12-28 14:22:06 +08:00
yystopf 4304a35b80 fix 2021-12-28 11:07:40 +08:00
yystopf dbf5e711a5 fix 2021-12-27 17:44:08 +08:00
yystopf 4432e65683 fix: operate issue permission reset 2021-12-27 17:32:35 +08:00
yystopf dcf44a78f0 fix: unvalid branch name return error 2021-12-27 16:34:54 +08:00
yystopf 12edc620df fix: complete profile condition 2021-12-24 16:15:59 +08:00
yystopf 4ce03145df fix 2021-12-23 14:33:31 +08:00
yystopf 3e04a37ece add: team remove and joined template message 2021-12-23 14:26:40 +08:00
yystopf 78f464ccba fix: escape 2021-12-23 10:37:57 +08:00
yystopf 64423f1999 fix 2021-12-22 18:16:39 +08:00
yystopf 05c3f60dab fix 2021-12-22 18:08:10 +08:00
yystopf 0083ef33cb fix 2021-12-22 16:03:23 +08:00
yystopf 36b68df273 fix: remote register validate 2021-12-22 14:39:47 +08:00
yystopf e1a5918c22 add: project trends project info 2021-12-22 13:57:02 +08:00
yystopf 26ae9b35df fix: change member role and change team user team 2021-12-22 11:32:40 +08:00
yystopf 8e79b43aaf add: member bind team user 2021-12-22 11:16:27 +08:00
yystopf c105785105 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-21 15:17:44 +08:00
yystopf c2bd78d70d Merge branch 'develop' into standalone_develop 2021-12-21 15:17:08 +08:00
yystopf d28eba6423 fix: create org error 2021-12-21 15:16:38 +08:00
yystopf 688be1bb7d fix: return issue version id 2021-12-21 15:16:38 +08:00
yystopf df69dee282 fix: some error for read raw data 2021-12-21 15:14:10 +08:00
yystopf ee6404a3b3 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-21 14:31:34 +08:00
yystopf fae8313df6 Merge branch 'develop' into standalone_develop 2021-12-21 14:31:24 +08:00
yystopf 45a77e5c07 fix: readme private file path use authorize 2021-12-21 14:24:27 +08:00
yystopf 7849bd0ebf fix: remove pr permission 2021-12-21 10:16:29 +08:00
yystopf 0c7499842f Merge branch 'standalone_develop' into pre_trustie_server 2021-12-20 15:53:54 +08:00
yystopf ab361d8009 Merge branch 'develop' into standalone_develop 2021-12-20 15:53:40 +08:00
yystopf 3649bf1fd0 fix 2021-12-20 15:53:24 +08:00
yystopf edb1114d39 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-20 15:42:36 +08:00
yystopf a24d33d2ee Merge pull request '同步到测试环境' (#294) from develop into standalone_develop 2021-12-20 15:42:34 +08:00
yystopf 6ffc2938a1 fix: download file url escape 2021-12-20 15:39:33 +08:00
yystopf aa60de1dac fix: valid pr title length 2021-12-20 15:38:08 +08:00
yystopf 29f98513e2 fix: org update error 2021-12-20 15:38:08 +08:00
yystopf e35cdf39fb fix: login password validate 2021-12-20 15:34:55 +08:00
yystopf bec98bbc9d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-17 15:45:57 +08:00
yystopf af160084c4 fix: merge from develop 2021-12-17 15:45:28 +08:00
yystopf da4fd3a762 fix: 易修 to 疑修 2021-12-17 15:35:30 +08:00
yystopf 96d1a7440d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-14 10:20:54 +08:00
yystopf 8a34699acd fix: merge from develop 2021-12-14 10:20:35 +08:00
xiaoxiaoqiong efc82b9841 fix: issue is collaborators 2021-12-14 10:17:15 +08:00
yystopf e3df503dd2 fix 2021-12-14 10:13:28 +08:00
yystopf 6a2ad67386 fix 2021-12-14 09:53:54 +08:00
yystopf 3d12db3a07 fix: atme service use perform later 2021-12-14 09:39:26 +08:00
yystopf 82bae9159b Merge branch 'standalone_develop' into pre_trustie_server 2021-12-13 16:40:14 +08:00
yystopf 1d13b3686b Merge branch 'develop' into standalone_develop 2021-12-13 16:39:47 +08:00
yystopf 1faaf1d7d1 fix: project menu list wiki location 2021-12-13 11:45:58 +08:00
yystopf f8a6f62342 fix: project rank include educoder 2021-12-10 09:35:03 +08:00
yystopf b816b6a449 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-10 09:20:04 +08:00
yystopf d48700d200 Merge pull request '同步代码' (#288) from develop into standalone_develop 2021-12-10 09:19:42 +08:00
yystopf 66d1246a6c fix: educoder project menu return 2021-12-09 15:54:21 +08:00
yystopf f79beef3f9 fix: issues branch educoder use master 2021-12-09 14:33:46 +08:00
yystopf 81e6691632 fix: educoder entries image file type 2021-12-09 11:33:43 +08:00
yystopf 38d6519381 fix 2021-12-09 11:08:54 +08:00
yystopf 16418675ac fix 2021-12-09 11:08:10 +08:00
yystopf 102858bc8c fix: educoder entries file use hash 2021-12-09 11:06:49 +08:00
yystopf 0d64768e4b fix: educoder file visit delay 2021-12-09 09:37:28 +08:00
yystopf beccac652f fix 2021-12-08 18:25:31 +08:00
yystopf 30eb1958c1 fix 2021-12-08 18:23:29 +08:00
yystopf 33e17e8439 fix: educoder sub_entries and commit author 2021-12-08 18:18:19 +08:00
yystopf 5445206716 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-08 16:26:15 +08:00
yystopf 1c19c05fd8 fix 2021-12-08 16:26:06 +08:00
yystopf 957980fc71 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-08 16:23:21 +08:00
yystopf 657e2cf169 fix: merge from develop 2021-12-08 16:22:34 +08:00
yystopf e0c47c2abd fix: educoder clone url 2021-12-08 16:18:13 +08:00
xiaoxiaoqiong 9e64a4842d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-08 15:32:47 +08:00
xxq250 93dd5b5d84 Merge pull request '易修声明功能' (#284) from starlee/forgeplus:lzx-claim-2.0 into standalone_develop 2021-12-08 15:12:15 +08:00
yystopf 422549f9e7 fix 2021-12-08 15:01:33 +08:00
yystopf 0358229b95 fix: educoder api delay 2021-12-08 14:47:15 +08:00
yystopf c4586fbb36 fix: remove detail language and contributors 2021-12-08 14:11:37 +08:00
xiaoxiaoqiong d4ee468435 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 17:03:02 +08:00
xiaoxiaoqiong a26d8be0b0 fixed educode not owner 2021-12-07 17:02:35 +08:00
xiaoxiaoqiong f94006abfd fixed educode not owner 2021-12-07 16:59:04 +08:00
xiaoxiaoqiong 3480e15c48 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:49:21 +08:00
xiaoxiaoqiong d85a446edc Merge branch 'develop' into standalone_develop 2021-12-07 16:48:52 +08:00
xiaoxiaoqiong 4d61e7618a fixed detail 2021-12-07 16:46:06 +08:00
xiaoxiaoqiong 2116af759d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:40:18 +08:00
xiaoxiaoqiong 38862b9843 fixed owner 2021-12-07 16:40:01 +08:00
xiaoxiaoqiong 3501ff6bd4 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:34:29 +08:00
xiaoxiaoqiong badd950ff9 merge develop 2021-12-07 16:34:11 +08:00
xiaoxiaoqiong 8f70d4f604 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:32:33 +08:00
xiaoxiaoqiong 20bfbdc06f fixed owner 404 2021-12-07 16:32:14 +08:00
xiaoxiaoqiong d4663e410d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:27:52 +08:00
xiaoxiaoqiong 5c445b9ea0 merge develop 2021-12-07 16:27:17 +08:00
xiaoxiaoqiong 36286d9003 fixed:educode项目 2021-12-07 16:20:05 +08:00
yystopf 51356da7f3 fix: owners not return 404 2021-12-07 14:34:57 +08:00
yystopf ebe893022f fix: api doc logo 2021-12-07 14:34:57 +08:00
yystopf c5f22e6c70 fix: org delete status error 2021-12-07 14:34:57 +08:00
xiaoxiaoqiong eac97c6698 关闭项目精选筛选 2021-12-01 17:45:02 +08:00
xiaoxiaoqiong 8ee52440c7 关闭项目精选 2021-12-01 17:43:43 +08:00
xiaoxiaoqiong cd4ba9c1d9 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-01 10:05:37 +08:00
xiaoxiaoqiong f12b10fa23 merge 测试环境standalone_develop 2021-12-01 10:05:00 +08:00
yystopf 4a3275a15e Merge pull request '同步代码到预上线分支' (#276) from develop into standalone_develop 2021-12-01 10:03:26 +08:00
yystopf 6f7899d16f fix: create pr authorize tip 2021-11-30 20:23:37 +08:00
yystopf 24170fc2cb Merge pull request '同步通用代码到预上线' (#274) from develop into standalone_develop 2021-11-30 17:09:31 +08:00
yystopf a7d681c4dd fix: compare commit author image url 2021-11-30 15:03:55 +08:00
yystopf 7a93db9ed2 fix: labels limit and issues operate field 2021-11-30 13:58:51 +08:00
yystopf 74e5fa0e31 fix: fork project id validate 2021-11-29 17:01:39 +08:00
yystopf 80b83c5230 fix: index read api data use params only data 2021-11-29 16:40:24 +08:00
yystopf 6ffc702209 Merge pull request '提交最新代码到预上线环境' (#272) from develop into standalone_develop 2021-11-29 15:44:51 +08:00
yystopf de995c8714 fix: merge conflict 2021-11-29 15:43:47 +08:00
xiaoxiaoqiong 16f37a3729 email中logo 2021-11-29 15:35:54 +08:00
yystopf ea156cec7e fix: download type add video type 2021-11-29 15:33:09 +08:00
yystopf 7499d8af89 fix: project private params to boolean 2021-11-29 14:43:29 +08:00
yystopf f8654edc3b fix: project labels return success info 2021-11-29 14:28:13 +08:00
yystopf d16f290aa6 fix: create pr validate fork_project_id 2021-11-29 14:17:27 +08:00
yystopf 9385d346f1 fix 2021-11-29 14:03:17 +08:00
yystopf 22f3371090 fix: change issues priority id default value 2021-11-29 11:05:33 +08:00
yystopf c0a4f8f4ec fix: create pull request need compare 2021-11-29 10:53:59 +08:00
yystopf 7586a0fb21 fix: change issue tag change size 2021-11-29 10:27:41 +08:00
xxq250 7c765817c9 Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop 2021-11-26 14:21:53 +08:00
xxq250 72553dec57 Merge pull request '一些功能修改以及bug修复' (#263) from yystopf/forgeplus:hh_hotfix into develop 2021-11-26 09:39:58 +08:00
yystopf abca0fe432 fix: change pr path id to number 2021-11-25 15:08:59 +08:00
yystopf d7612a0921 add: create update pr need authorize 2021-11-25 14:16:45 +08:00
yystopf c54950a95f fix: compare params contain .json 2021-11-25 14:06:55 +08:00
starlee e25e2fdd77 add the claim mechanism 2021-11-25 13:33:32 +08:00
yystopf be0f68cede fix 2021-11-25 11:19:50 +08:00
yystopf 1b92b53099 fix 2021-11-25 11:00:19 +08:00
yystopf 5634413cac add: create pullrequest validate 2021-11-25 10:52:42 +08:00
xiaoxiaoqiong 515307139a README文件中的图片显示问题 2021-11-25 10:30:46 +08:00
xiaoxiaoqiong 399558550e fix 验证码过期等#53446，#50806，#50880 2021-11-24 18:13:15 +08:00
yystopf 1a9ed1425e fix: destroy decrement forked count 2021-11-23 13:48:09 +08:00
yystopf f9d4316a8e fix: change fork project status 2021-11-23 11:43:44 +08:00
yystopf ddb826733b fix: project setting permission control 2021-11-19 14:56:20 +08:00
yystopf 1f989d0a37 fix: delete organization tip 2021-11-19 14:44:25 +08:00
yystopf 72ec7bc213 fix: change email default rule 2021-11-19 10:57:25 +08:00
yystopf 55ab694505 fix: change email default rule 2021-11-19 10:21:09 +08:00
yystopf 0885575cc4 fix: organization validate name tip 2021-11-18 17:31:22 +08:00
yystopf 8011dabaac fix: undo events 2021-11-18 17:02:09 +08:00
jasder 651bf34cfc FIX code review and conflict 2021-11-14 20:50:22 +08:00
jasder e216d7da70 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-11 18:09:26 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
yystopf 49c7827f87 fix 2021-11-10 16:40:11 +08:00
yystopf 222e5c1050 fix: atme sender info 2021-11-10 11:32:59 +08:00
yystopf 1298fedcbb fix: user rank 2021-11-10 10:47:03 +08:00
yystopf 937603d0f2 fix: change params is blank not sent email 2021-11-10 10:05:35 +08:00