Commit Graph

513 Commits

Author SHA1 Message Date
jasder 84e48d25c1 FIX render user bug with pull‘s commits and repo's commits api 2021-04-20 18:35:41 +08:00
vilet.yy da98efe04f add: org project field 2021-04-20 10:50:06 +08:00
jasder f055fed7d0 ADD 创建团队支持中文名称
创建组织团队使用中文名称报错、组织项目下创建issue报错
2021-04-19 18:10:31 +08:00
jasder 9cddda7fd4 Update render user avatar url in projects api 2021-04-19 15:38:51 +08:00
vilet.yy 1c6982d15b add: org valid 2021-04-19 12:07:12 +08:00
vilet.yy 9300483c1a fix 2021-04-19 11:40:38 +08:00
vilet.yy 506ab1722d add: team nickname 2021-04-19 10:54:36 +08:00
vilet.yy 04a1376820 add: project's lesson_url 2021-04-08 15:20:34 +08:00
vilet.yy d6c3bcfaf1 add: org add nickname 2021-04-07 11:29:44 +08:00
vilet.yy c417fa7369 add: project list author type 2021-04-07 11:29:44 +08:00
vilet.yy c175fa1339 fix: commit author and fork create units 2021-04-02 18:53:53 +08:00
jasder d2293a2778 FIX setting api bug 2021-03-31 12:44:40 +08:00
jasder 860b46685a fix bug 2021-03-31 10:24:37 +08:00
jasder 3869529620 Update setting api 2021-03-31 09:49:05 +08:00
vilet.yy d0a65775aa fix: not show commiter avatar 2021-03-30 16:34:12 +08:00
jasder 7c0a2aa89e Merge branch 'develop' into trustie_server 2021-03-25 14:31:45 +08:00
vilet.yy 7f28f07665 fix: readme error 2021-03-25 11:31:43 +08:00
vilet.yy 66608b3baa add: detail project description 2021-03-24 13:59:24 +08:00
vilet.yy 9ee42e805b fix: update error 2021-03-24 13:50:17 +08:00
vilet.yy 15f9004f63 add: edit permit website 2021-03-24 10:50:47 +08:00
jasder 815b364428 ADD common url with setting api 2021-03-23 15:42:56 +08:00
jasder 18ae3853d7 FIX update setting api 2021-03-23 11:42:22 +08:00
jasder ce18cc380a Merge branch 'develop' into trustie_server 2021-03-22 21:02:17 +08:00
jasder aa23762b2f FIX update setting api for nav bar url 2021-03-22 18:02:12 +08:00
jasder 0909223867 FIX get readme api method 2021-03-21 11:24:34 +08:00
vilet.yy db2ba95e24 fadd: repo edit unit 2021-03-19 15:05:09 +08:00
vilet.yy 39f0811f0a fix:simple unit 2021-03-19 14:58:25 +08:00
vilet.yy 6a7ef2a1a7 add: repo contributors 2021-03-18 16:35:46 +08:00
vilet.yy a627ab4d82 fix 2021-03-18 09:51:56 +08:00
vilet.yy 8f98a83379 add: project unit list 2021-03-17 13:50:26 +08:00
vilet.yy b43926f69f add: new project detail 2021-03-15 19:01:35 +08:00
victor cb90dc1f51 参数管理 2021-03-03 15:36:59 +08:00
jasder fc680b5372 fix notice api 2021-02-26 14:38:32 +08:00
viletyy 2b898b0d1f [FIX]remove description 2021-02-06 16:43:41 +08:00
viletyy 54204d4db8 [ADD]org team search, project teams add\remove, org can create field
[FIX]
2021-02-06 15:49:55 +08:00
viletyy 4f6f257b37 [FIX]concat change to concat_ws, org render 403, normal team leave 2021-02-06 15:49:54 +08:00
viletyy ddaca5bafc [ADD]organization add num_teams 2021-02-06 15:49:54 +08:00
viletyy 1e70764d63 [FIX]teams add user info 2021-02-06 15:49:54 +08:00
viletyy 152e301bf3 [ADD]search is_member is_admin 2021-02-06 15:49:54 +08:00
viletyy c6269f44ee [FIX]add user organization count 2021-02-06 15:49:54 +08:00
viletyy 3d495797c0 [FIX]organization add created_at and total_count 2021-02-06 15:49:54 +08:00
viletyy 289d1877d6 [ADD]组织、组织团队 2021-02-06 15:49:53 +08:00
viletyy 0c58447afb [FIX]组织上传头像支持多种格式、项目详情返回拥有者类型
[FIX]

[FIX]
2021-02-06 15:49:52 +08:00
viletyy 3f73484596 [FIX]一些筛选以及创建最大项目数量验证
[FIX]
2021-02-06 15:49:49 +08:00
viletyy f094fe1799 [ADD]组织项目相关 2021-02-06 14:27:47 +08:00
viletyy 31858a79e3 [FIX]成员细节修改 2021-02-06 14:27:47 +08:00
viletyy 7f309edc91 [ADD]组织、组织团队 2021-02-06 14:27:47 +08:00
viletyy c278ed1863 [FIX] 2021-02-06 14:27:47 +08:00
viletyy 2434ca9681 [ADD]组织模块相关代码 2021-02-06 14:27:47 +08:00
viletyy c00336e7b5 [ADD]统计平台概况
[FIX]更改请求参数

[FIX]

[ADD]rank statistic

[FIX]
2021-02-06 11:15:25 +08:00
victor 22d7478349 content接口返回分支 2021-02-01 10:36:30 +08:00
victor 6c77b73ec6 创建多条流水线、模板管理 2021-01-26 17:15:53 +08:00
Jasder 6d51657ecf FIX get latest commit bug
(cherry picked from commit b7e23a62d0)
2021-01-20 14:30:49 +08:00
Jasder ffeb076086 FIX pull api bug
(cherry picked from commit 36a3e36edb)
2021-01-20 14:30:29 +08:00
Jasder 06a7cb7558 FIX get readme file bug
(cherry picked from commit 30138cc1fa)
2021-01-20 14:30:26 +08:00
Jasder 5667c0854c FIX [api] get pull bug
(cherry picked from commit fa01194d3c)
2021-01-20 14:30:10 +08:00
Jasder b6aa0fd76c FIX render json builder partil performance for pull some api
(cherry picked from commit f084b72e3a)
2021-01-20 14:30:06 +08:00
moshenglv 0d6ddad013 查询steps接口修改 2021-01-19 16:23:19 +08:00
moshenglv 7e9acd1850 返回流水线文件sha 2021-01-19 14:19:06 +08:00
moshenglv 703be3f9a1 返回流水线内容同步状态 2021-01-19 13:59:55 +08:00
moshenglv f90bc0897b 流水线关联项目 2021-01-19 11:52:29 +08:00
moshenglv 05416339e5 流水线查询返回字段修改 2021-01-19 11:10:47 +08:00
moshenglv c6aeecb33c 查询阶段返回流水线名称 2021-01-18 09:58:33 +08:00
moshenglv 9af0ff4a71 步骤查询接口返回模板信息修改 2021-01-15 11:05:38 +08:00
moshenglv da1a992670 流水线查询返回时间格式化 2021-01-13 15:10:24 +08:00
moshenglv cb6c4b1e3f 阶段新增、删除、查询步骤接口修改 2021-01-12 17:40:42 +08:00
moshenglv 77529319a1 可视化创建流水线后端代码 2021-01-12 10:23:26 +08:00
moshenglv 9a66b48726 用户可以查看其他用户的构建列表 2021-01-06 18:47:39 +08:00
moshenglv a3724e80b9 增加trustie提供服务器流程。
1、增加接口trustie_bind
2、根据server_type字段判断使用哪个数据库连接
2020-12-24 10:35:38 +08:00
Jasder 3f60dd3f83 ADD edit protected branch api 2020-12-04 16:18:27 +08:00
Jasder b3649f03e7 ADD get protected branch api 2020-12-04 11:06:12 +08:00
Jasder 6a8ae5234b ADD protected branch Features 2020-12-03 15:24:40 +08:00
Jasder 69f2fd2fbb FIX code review 2020-11-23 15:52:00 +08:00
Jasder fa6b25a22d FIX render commit bug for sub entries api 2020-11-16 16:03:41 +08:00
Jasder 7449351270 FIX sub entries api return hash object when entries is file 2020-11-16 15:34:16 +08:00
Jasder 1c386e0ab3 FIX coder review 2020-11-10 10:03:30 +08:00
Jasder 939f33a8a2 FIX sha value bug 2020-11-09 17:23:19 +08:00
Jasder 97973b95bf ADD sha column ro pull request's files compare api 2020-11-06 22:03:12 +08:00
Jasder a8c3328bd6 ADD get a commit api 2020-11-06 17:23:14 +08:00
Jasder c85ad6444d FIX code bug 2020-11-04 15:03:21 +08:00
Jasder 0fe0f8a38b ADD some fileds for pull api 2020-11-04 14:08:34 +08:00
Jasder 58d8c911a8 ADD format time method 2020-11-04 11:21:51 +08:00
Jasder cfb794c94f FIX bug 2020-11-04 10:09:49 +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 bfbe1fdce5 FIX bug 2020-10-22 22:16:55 +08:00
Jasder 91c9423c72 add platform column for projects api 2020-10-22 20:12:28 +08:00
Jasder 58f8d60646 FIX 版本库兼容euducoder平台数据 2020-10-22 18:00:31 +08:00
Jasder 9477555ebd FIX merge dev_devops branch 2020-10-21 11:56:30 +08:00
Jasder e3d9dae8fd Update projects sime api with statics 2020-10-21 11:45:55 +08:00
Jasder 2eca095608 Merge branch 'dev_devops' into dev_sync_project_educoder 2020-10-20 16:45:04 +08:00
Jasder 2eef143251 ADD 同步educoder平台实训项目 2020-10-19 22:59:41 +08:00
Jasder 1ac606a8aa FIX 去掉区块链相关的token值 2020-10-19 15:20:30 +08:00
Jasder 232bb054ce Merge branch 'dev_trustie' into dev_devops 2020-10-16 16:48:26 +08:00
sylor_huang@126.com 32bc3fe9f5 FIX merge 2020-10-16 16:48:11 +08:00
Jasder 1bff81bb66 Merge branch 'dev_trustie' into dev_devops 2020-10-16 16:44:44 +08:00
sylor_huang@126.com 248eadb918 Add Setting button 2020-10-16 16:43:59 +08:00
Jasder 7372911fea FIX 重构项目管理权限 2020-10-16 16:02:26 +08:00
Jasder 5156450eac ADD 更改工作流的权限 2020-10-16 11:57:20 +08:00
Jasder 7b0f219a82 FIX pwd bug 2020-10-15 19:40:50 +08:00
Jasder b8cace558b Merge branch 'dev_trustie' into dev_devops 2020-10-04 17:33:21 +08:00
Jasder 0faa750450 ADD project detail api 2020-10-04 17:32:37 +08:00
Jasder 705ae1020b FIX merge dev_trustie branch 2020-10-04 12:05:53 +08:00
Jasder 4ff8c4dc1a ADD recommand projects api 2020-10-04 12:03:38 +08:00
sylor_huang@126.com e8d501e29e Merge branch 'dev_trustie' of http://git.trustie.net/jasder/forgeplus into dev_trustie 2020-09-29 14:28:11 +08:00
sylor_huang@126.com f5c7792717 Add Download 2020-09-29 14:27:57 +08:00
Jasder 2636923c9b FIX merge 2020-09-29 11:53:41 +08:00
Jasder db6e3b0f38 FIX fork users list api bug 2020-09-25 10:41:32 +08:00
sylor_huang@126.com 1fcf540dfc Add Attachment 2020-09-25 09:49:42 +08:00
sylor_huang@126.com 09d382ab8f Add Attachment Video1 2020-09-24 15:33:30 +08:00
sylor_huang@126.com e698efb14f Add Attachment Video 2020-09-24 14:57:36 +08:00
Jasder f116e3347d FIX build detail render user bug 2020-09-24 11:14:16 +08:00
Jasder 76b9031fc8 FIX bug 2020-09-23 11:06:54 +08:00
Jasder 467f278de5 ADD ci datbase config 2020-09-18 16:40:54 +08:00
Jasder 0467119605 FIX ci db bug 2020-09-18 15:46:36 +08:00
Jasder b74d43083e FIX 解决ci 数据库安全性问题 2020-09-18 15:26:14 +08:00
Jasder 12bef27260 Merge branch 'dev_trustie' into dev_devops 2020-09-11 23:24:50 +08:00
Jasder bb98dad64c FIX educoder auto register 2020-09-11 22:40:32 +08:00
Jasder 5b8b74b808 ADD ci authorue column for get user info api 2020-09-11 16:35:08 +08:00
Jasder 6985699989 Upage ci certifacate 2020-09-07 14:44:26 +08:00
Jasder e77475e26a ADD ci cloud account authenticate url 2020-09-04 17:35:29 +08:00
Jasder 81ec264483 Update destroy ci_user attassion 2020-09-04 17:26:37 +08:00
Jasder 74b2a5b021 FIX rename ucloud view dir 2020-09-03 17:10:23 +08:00
Jasder 562d0b7b07 ADD 个人中心添加devops管理功能 2020-09-03 15:52:54 +08:00
Jasder f47eae3aeb FIX app/views/projects/ci_authorize.json.jbuilder 2020-08-28 10:46:23 +08:00
Jasder 27b6a251af FIX . 2020-08-28 10:43:32 +08:00
Jasder 30ff51f93b FIX devops author url 2020-08-28 10:38:39 +08:00
Jasder 016971287c ADD open_devops for repositores show api 2020-08-27 11:50:17 +08:00
Jasder 82c4f4f38a ADD build error status 2020-08-27 11:39:11 +08:00
Jasder 8c9c085259 ADD cloud account id 2020-08-26 15:14:00 +08:00
Jasder aac6df8790 FIX time count bug 2020-08-26 10:46:54 +08:00
Jasder 087f81a6aa ADD duration time for stage and step 2020-08-25 17:59:32 +08:00
Jasder c54723a6c6 FIX step bug 2020-08-25 17:14:55 +08:00
Jasder 21192d70b6 FIX stage bug 2020-08-25 17:09:44 +08:00
Jasder 1ea9e420be ADD paginate for builds api 2020-08-25 15:43:30 +08:00
Jasder 4932eae285 ADD branch and sha for builds api 2020-08-25 14:25:42 +08:00
Jasder ae9d857d7f FIX ci server 2020-08-21 14:53:48 +08:00
Jasder 3aa0cb70fe Merge branch 'dev_devops' of http://git.trustie.net/jasder/forgeplus into dev_devops 2020-08-20 18:38:05 +08:00
Jasder 7c1ab2cddf FIX 重构ci流程 2020-08-20 18:37:53 +08:00
sylor_huang@126.com 957df36fb1 Merge branch 'dev_trustie' into dev_devops 2020-08-20 18:04:53 +08:00
sylor_huang@126.com 701b56ea90 Merge branch 'dev_trustie' of http://git.trustie.net/jasder/forgeplus into dev_trustie 2020-08-20 18:03:43 +08:00
sylor_huang@126.com 81c29e4cc2 Add PR identifier 2020-08-20 18:03:30 +08:00
Jasder 7b8bb996a6 Merge branch 'dev_trustie' into dev_devops 2020-08-17 11:14:35 +08:00
Jasder c68c8ed089 FIX remote regitster bug 2020-08-16 13:48:48 +08:00
Jasder b233586779 FIX merge 2020-08-15 19:57:20 +08:00
Jasder a9a0cab7d1 Merge branch 'dev_trustie' of http://git.trustie.net/jasder/forgeplus into dev_trustie 2020-08-15 19:53:05 +08:00
Jasder 7a3f8cf47f FIX migrate api bug 2020-08-15 19:52:58 +08:00
sylor_huang@126.com e092c1f222 Change 2020-08-15 13:49:36 +08:00
sylor_huang@126.com 5f3f6748f2 Change 2020-08-15 13:34:32 +08:00
Jasder ebce182b7e Merge branch 'dev_change_route' into dev_trustie 2020-08-15 13:24:29 +08:00
Jasder fb733722d6 Merge branch 'dev_change_route' into dev_devops 2020-08-15 11:06:04 +08:00
Jasder ec43c03f08 FIX bug 2020-08-15 11:05:20 +08:00
Jasder 8b9f0a9f06 FIX projects fork users bug 2020-08-15 10:59:29 +08:00
Jasder 90f14d2051 FIX projects fork users bug 2020-08-15 10:58:56 +08:00
Jasder bd9f32cfaa Merge branch 'dev_change_route' into dev_devops 2020-08-15 10:26:47 +08:00
Jasder b7b096d6d7 FIX password length validate 2020-08-15 10:26:30 +08:00
Jasder dac91f9a0c Merge branch 'dev_change_route' into dev_devops 2020-08-14 23:25:10 +08:00
Jasder 0cd790ecac fix js redirect 2020-08-14 23:24:54 +08:00
Jasder 9317e21dd5 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:17:50 +08:00
Jasder e11a32e113 FIX include jquery 2020-08-14 21:17:28 +08:00
Jasder 06d0065173 Merge branch 'dev_change_route' into dev_devops 2020-08-14 18:40:32 +08:00
Jasder 4642b1250f FIX oauth css for public dir 2020-08-14 18:40:05 +08:00
Jasder 63148c339c Merge branch 'dev_change_route' into dev_devops 2020-08-14 18:21:04 +08:00
Jasder c1b0061b8d ADD educode user login 2020-08-14 18:19:00 +08:00
Jasder 7a2d7f50fd Merge branch 'dev_change_route' into dev_devops 2020-08-13 20:49:33 +08:00
Jasder 425a374332 ADD fork info for repositories show action 2020-08-13 14:40:35 +08:00
Jasder 78b091ddd3 FIX merge bug 2020-08-13 09:44:38 +08:00
Jasder 0a9fbfd101 FIX entries api bug 2020-08-12 18:40:45 +08:00
sylor_huang@126.com 3596ddeee4 Change 2020-08-12 15:03:14 +08:00
sylor_huang@126.com d80600a58c Change 2020-08-12 10:58:16 +08:00
sylor_huang@126.com 0a321fd73e Change 2020-08-12 10:52:20 +08:00
Jasder 69ea60dfd5 FIX update devops process 2020-08-06 14:26:19 +08:00
Jasder 3f92d99136 Merge branch 'dev_trustie' into dev_devops 2020-07-23 09:32:35 +08:00
sylor_huang@126.com 5465d61d50 Fix bugs 2020-07-22 17:22:23 +08:00
sylor_huang@126.com 24d73f4eb6 Fix admin project list 2020-07-22 17:21:59 +08:00
sylor_huang@126.com 0fddf09e47 Merge branch 'dev_trustie' into dev_devops 2020-07-20 11:40:05 +08:00
sylor_huang@126.com f3dd4eb630 Change projects links 2020-07-20 11:39:39 +08:00
sylor_huang@126.com b89598d452 Merge branch 'dev_trustie' into dev_devops 2020-07-20 09:58:21 +08:00
sylor_huang@126.com 26f153b587 Update Mananger 2020-07-20 09:57:46 +08:00
sylor_huang@126.com b07f84a3a0 Merge branch 'dev_trustie' into dev_devops 2020-07-20 09:53:12 +08:00
sylor_huang@126.com 3d2f390e67 Update Mananger 2020-07-20 09:51:35 +08:00
sylor_huang@126.com 1f86ad6349 Merge branch 'dev_trustie' into dev_devops 2020-07-20 09:45:53 +08:00
sylor_huang@126.com b60625bcd0 Change repository permission 2020-07-20 09:45:27 +08:00
sylor_huang@126.com 5100c352fe Merge branch 'dev_trustie' into dev_devops 2020-07-16 11:57:39 +08:00
sylor_huang@126.com ea702e8e50 change 2020-07-16 11:57:12 +08:00
sylor_huang@126.com f4a54dbb38 Merge branch 'dev_trustie' into dev_devops 2020-07-16 11:02:10 +08:00
sylor_huang@126.com 88875ed473 change 2020-07-16 11:01:59 +08:00
Jasder da0e45a3c6 ADD devops 2020-07-15 09:43:30 +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
sylor_huang@126.com d812929152 Merge branch 'dev_trustie' into dev_chain 2020-07-03 17:01:16 +08:00
sylor_huang@126.com 8f6b455a95 change pr codes 2020-07-03 17:00:55 +08:00
sylor_huang@126.com 8eb3b149d7 Merge branch 'dev_trustie' into dev_chain 2020-07-03 15:26:46 +08:00
sylor_huang@126.com 281889ebae change counts 2020-07-03 15:14:25 +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 e75b84544a Merge branch 'dev_trustie' into dev_chain 2020-06-30 10:44:42 +08:00
sylor_huang@126.com acafef7901 change issue_tags_value error 2020-06-30 10:43:08 +08:00
sylor_huang@126.com 1e7826a298 Merge branch 'dev_trustie' into dev_chain 2020-06-30 09:44:49 +08:00
sylor_huang@126.com 999006fba7 change pr 2020-06-30 09:44:28 +08:00