Commit Graph

242 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 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
yystopf 612101498c Merge branch 'develop' into standalone_develop 2022-01-14 17:38:09 +08:00
yystopf f33b9559cd fix: download delay 2022-01-13 11:24:27 +08:00
yystopf f76dad680a Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop 2022-01-07 18:03:57 +08:00
yystopf 7a1e6cfbad fix: issue edit and new branches only load name api 2022-01-07 15:19:10 +08:00
yystopf f339df699e add: user upload image 2022-01-03 22:32:09 +08:00
yystopf c2bd78d70d Merge branch 'develop' into standalone_develop 2021-12-21 15:17:08 +08:00
yystopf df69dee282 fix: some error for read raw data 2021-12-21 15:14:10 +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 d48700d200 Merge pull request '同步代码' (#288) from develop into standalone_develop 2021-12-10 09:19:42 +08:00
yystopf f79beef3f9 fix: issues branch educoder use master 2021-12-09 14:33:46 +08:00
yystopf 6ffc702209 Merge pull request '提交最新代码到预上线环境' (#272) from develop into standalone_develop 2021-11-29 15:44:51 +08:00
yystopf ea156cec7e fix: download type add video type 2021-11-29 15:33:09 +08:00
jasder 651bf34cfc FIX code review and conflict 2021-11-14 20:50:22 +08:00
jasder 03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
jasder 77ad959a8c Merge remote-tracking branch 'gitlink/featrue_login_and_register' into standalone_develop 2021-11-08 15:08:47 +08:00
jasder c19c83d505 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-05 11:36:51 +08:00
jasder 538d2113f1 FIX 完善重置密码功能 2021-11-03 17:19:43 +08:00
jasder 1008f17849 FIX 调整注册接口 2021-11-02 13:39:45 +08:00
yystopf 7193323be9 fix: field upper but 2021-11-02 09:59:21 +08:00
yystopf 28c3b4dda4 add: repo commit user use cache data 2021-11-02 09:59:21 +08:00
yystopf f9bb74aba4 add: cache service 2021-10-25 16:57:11 +08:00
yystopf 588850440e fix: decode error 2021-09-30 19:49:17 +08:00
yystopf b07781a514 fix: some issues 2021-09-29 18:50:51 +08:00
yystopf bbcca413c6 add: tags commiter message 2021-09-29 11:34:21 +08:00
yystopf 333d6a8ea4 add: branch commiter user info 2021-09-29 11:34:21 +08:00
yystopf 90ace8b753 fix: download file need authorize 2021-09-10 10:52:21 +08:00
yystopf c50f9ef28d fix: first commit show real commiter 2021-09-01 14:53:41 +08:00
yystopf eafc8ea527 add: return failed mirror repository field 2021-08-18 15:40:57 +08:00
yystopf 9425d2e59d add: issue chosen assign_user permission 2021-08-04 14:45:54 +08:00
yystopf 0654f81565 fix: new issue branch select 2021-08-04 14:36:01 +08:00
yystopf f334864f1b fix: get file extname 2021-07-23 14:50:01 +08:00
yystopf d4b9881f2d fix 2021-07-16 16:42:30 +08:00
yystopf a543c3e08f fix: write image filepath error 2021-07-16 16:10:20 +08:00
jasder 3614f3e15b FIX 解决私有版本库库不能访问、下载图片的问题 2021-07-09 16:57:11 +08:00
jasder fff21a1bc8 FIX 处理版本库zip、gzip包链接为无效的问题 2021-06-22 09:39:44 +08:00
jasder d2340e30cb ADD admim statistics url 2021-06-11 11:21:44 +08:00
jasder 2b82b2c4f5 FIX [bug]新建易修api中 更新相关cache key 2021-06-03 16:56:54 +08:00
jasder a0ca4d3acb FIX 新建易修api中 更新相关cache key 2021-06-02 17:35:06 +08:00
jasder dac07bcae0 ADD 页面置顶功能、帮助文档快速入口 2021-05-14 16:23:19 +08:00
jasder b162b3357a FIX get mirror url bug 2021-05-07 14:06:40 +08:00
jasder 1277e717ff ADD github gitlab镜像加速器 2021-04-29 18:35:57 +08:00
jasder 8bf02b1ee5 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-04-28 21:16:52 +08:00
vilet.yy 65d51e8578 add: project operate add organization team users 2021-04-28 15:15:45 +08:00
jasder 5bd33c033c FIX bug 2021-04-26 16:52:48 +08:00
jasder 908cda56f3 ADD users/hovercard api 2021-04-22 16:36:40 +08:00
jasder 21befb6486 FIX auto generate avatar bug 2021-04-19 17:28:57 +08:00
jasder b6e8a135f0 FIX url_to_avatar bug 2021-04-19 15:42:54 +08:00
jasder 002ae9f327 ADD auto generate user avatar 2021-04-19 15:06:56 +08:00
vilet.yy b11fd350da fix: project permission 2021-04-07 11:29:44 +08:00
vilet.yy d0a65775aa fix: not show commiter avatar 2021-03-30 16:34:12 +08:00
vilet.yy 7f28f07665 fix: readme error 2021-03-25 11:31:43 +08:00
vilet.yy a14459da50 add: project menu list 2021-03-17 11:52:36 +08:00
viletyy 0c58447afb [FIX]组织上传头像支持多种格式、项目详情返回拥有者类型
[FIX]

[FIX]
2021-02-06 15:49:52 +08:00
viletyy f094fe1799 [ADD]组织项目相关 2021-02-06 14:27:47 +08:00
Jasder 458fca9992 fix change stoage file derictory 2021-01-28 15:11:47 +08:00
Jasder 30138cc1fa FIX get readme file bug 2021-01-15 18:36:19 +08:00
moshenglv 9a66b48726 用户可以查看其他用户的构建列表 2021-01-06 18:47:39 +08:00
Jasder 6a8ae5234b ADD protected branch Features 2020-12-03 15:24:40 +08:00
Jasder 58d8c911a8 ADD format time method 2020-11-04 11:21:51 +08:00
Jasder 2347697e93 ADD some api
* api/v1/repos/{owner}/{repo}/pulls/{number}/commits
* api/v1/repos/{owner}/{repo}/pulls/{number}/files
* api/v1/repos/{owner}/{repo}/compare/{base}...{head}
2020-11-03 18:37:47 +08:00
Jasder 1bc935ffd5 FIX code review and user cache 2020-10-30 15:47:09 +08:00
Jasder af6c8efb2b FIX 更改 educoder用户头像链接 2020-10-23 00:16:41 +08:00
Jasder bfbe1fdce5 FIX bug 2020-10-22 22:16:55 +08:00
Jasder 58f8d60646 FIX 版本库兼容euducoder平台数据 2020-10-22 18:00:31 +08:00
Jasder 2eef143251 ADD 同步educoder平台实训项目 2020-10-19 22:59:41 +08:00
Jasder 7372911fea FIX 重构项目管理权限 2020-10-16 16:02:26 +08:00
Jasder 705ae1020b FIX merge dev_trustie branch 2020-10-04 12:05:53 +08:00
sylor_huang@126.com 75c951c204 Change 2020-09-29 14:47:12 +08:00
sylor_huang@126.com f5c7792717 Add Download 2020-09-29 14:27:57 +08:00
Jasder 3290609bbc FIX request devops languages api authoure 2020-09-08 15:29:19 +08:00
Jasder b26c2f273f FIX build time bug 2020-08-27 16:01:10 +08:00
Jasder 7e9d5a9acb FIX code bug 2020-08-26 10:45:21 +08:00
Jasder d16713e611 FIX buid time bug 2020-08-26 10:43:47 +08:00
Jasder 3e25a7b28c FIX code review 2020-08-25 15:49:47 +08:00
Jasder 41f876a714 FIX build finished time bug 2020-08-25 15:48:41 +08:00
Jasder 1ea9e420be ADD paginate for builds api 2020-08-25 15:43:30 +08:00
Jasder 7c1ab2cddf FIX 重构ci流程 2020-08-20 18:37:53 +08:00
Jasder da0e45a3c6 ADD devops 2020-07-15 09:43:30 +08:00
Jasder 4518a3ea87 FIX simple api with open_devops columen 2020-07-14 15:34:01 +08:00
Jasder 2b6fe8f9a8 FIX merge 2020-07-14 15:15:50 +08:00
Jasder 6527603e24 FIX 完善devops流程 2020-07-14 15:06:09 +08:00
Jasder e74bba9092 ADD test devops 2020-07-10 14:08:16 +08:00
sylor_huang@126.com d5849976a3 Merge branch 'dev_trustie' into dev_chain 2020-07-02 10:13:17 +08:00
sylor_huang@126.com dae013d386 change readme content 2020-07-02 10:12:55 +08:00
sylor_huang@126.com f6739a9502 Merge branch 'dev_trustie' into dev_chain 2020-06-30 11:22:30 +08:00
Jasder 88ee4830f2 ADD mirror_url to simpe project api 2020-06-30 11:16:18 +08:00
Jasder 959e6d6f3e ADD type for project simpe api 2020-06-30 10:44:58 +08:00
sylor_huang@126.com 1e7826a298 Merge branch 'dev_trustie' into dev_chain 2020-06-30 09:44:49 +08:00
Jasder 062a47d889 Update get simpe project api 2020-06-29 18:26:22 +08:00
sylor_huang@126.com 86c6a7bbdd Merge branch 'dev_trustie' into dev_chain 2020-06-29 17:07:38 +08:00
Jasder 1133517127 ADD simple project api 2020-06-29 16:05:22 +08:00
sylor_huang@126.com 6b9c424b07 Merge branch 'dev_trustie' into dev_chain 2020-06-24 16:16:33 +08:00
sylor_huang@126.com fb0a195857 修改项目分类的显示名 2020-06-24 16:16:10 +08:00
sylor_huang@126.com cfae67c3c9 Merge branch 'dev_trustie' into dev_chain 2020-06-24 15:33:48 +08:00
sylor_huang@126.com d07ce356d2 change 2020-06-24 15:31:57 +08:00
sylor_huang@126.com b7c86fd83c Merge branch 'dev_trustie' into dev_chain 2020-06-23 15:00:33 +08:00
sylor_huang@126.com 4facaf7076 change repository images error 2020-06-23 14:56:53 +08:00
sylor_huang@126.com b90bc0aed2 change bug 2020-06-18 15:47:43 +08:00
sylor_huang@126.com 4c7fa23404 修改bug 2020-06-18 15:46:00 +08:00
sylor_huang@126.com 79641e859c change chain 2020-06-09 18:55:09 +08:00
sylor_huang@126.com 26bc53ad26 修改工单和里程碑暂不需要的字段 2020-06-08 11:38:03 +08:00
sylor_huang@126.com 1780f825ef 修改里程碑的排序并优化工单筛选的返回参数 2020-06-08 11:22:07 +08:00
Jasder d06efe2738 FIX content tof focus utf-8 2020-06-05 18:14:19 +08:00
Jasder 883ff8f768 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-05 18:02:28 +08:00
Jasder 7c479f13fb FIX coder review for repository api 2020-06-05 18:01:58 +08:00
sylor_huang@126.com 4fe404708a change image_type 2020-06-05 11:39:18 +08:00
sylor_huang@126.com 245216964b 修改部分内容 2020-06-05 11:34:28 +08:00
Jasder f47456f540 FIX bug 2020-05-29 19:04:14 +08:00
Jasder d391972b8b FIX image download with in reposotiroy entries 2020-05-29 17:56:52 +08:00
Jasder 79a97b4a02 ADD get commit diff api 2020-05-29 15:33:17 +08:00
sylor_huang@126.com 634408363e 修改字节数 2020-05-26 15:35:21 +08:00
Jasder 6d39adfa08 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-19 18:34:53 +08:00
Jasder b02efc3609 FIX bug 2020-05-19 14:41:45 +08:00
sylor_huang@126.com 0b89372eef add hooks controler and related services 2020-05-19 11:57:55 +08:00
sylor_huang@126.com b8946d980a 修改前端问题及同步gitea的url到forge 2020-04-21 17:30:41 +08:00
sylor_huang@126.com 7bf539546c 前端的修复及文件下载后缀的扩展 2020-04-20 17:34:53 +08:00
Jasder 2937b2a94d init project 2020-03-09 00:40:16 +08:00