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

994 Commits

Author SHA1 Message Date
vilet.yy 0d828ead1f fix:some bug 2021-04-26 16:50:50 +08:00
jasder 09ac49dda5 Merge branch 'develop' into dev_trustie_server 2021-04-26 16:46:24 +08:00
jasder 1a22491e36 ADD admin role to org api 2021-04-26 16:45:58 +08:00
vilet.yy 220ca96669 fix 2021-04-26 15:17:51 +08:00
vilet.yy 28c8761f32 fix 2021-04-26 15:11:08 +08:00
vilet.yy 96238c2e13 fix 2021-04-26 11:04:10 +08:00
vilet.yy 8b7b1b7a4e add: api doc about projects 2021-04-26 10:07:22 +08:00
vilet.yy 1e081b5a3e add: transfer project 2021-04-25 18:41:13 +08:00
jasder 341a810afc Merge branch 'develop' into dev_trustie_server 2021-04-23 17:54:13 +08:00
jasder 8c71a72fce FIX code bug 2021-04-23 17:53:59 +08:00
jasder 36fb5a118c Merge branch 'develop' into dev_trustie_server 2021-04-23 14:40:41 +08:00
jasder aa314c141c ADD some url with in hovercoard api 2021-04-23 14:40:26 +08:00
jasder 39193324e9 Merge branch 'develop' into dev_trustie_server 2021-04-22 16:38:58 +08:00
jasder 908cda56f3 ADD users/hovercard api 2021-04-22 16:36:40 +08:00
jasder 0d7a11f3ab Merge branch 'develop' into dev_trustie_server 2021-04-19 18:41:18 +08:00
vilet.yy a3c49b3d5f add: org valid 2021-04-19 18:37:30 +08:00
vilet.yy 3a47c61010 add: team nickname 2021-04-19 18:37:30 +08:00
jasder 879e45e106 Merge branch 'develop' into trustie_server 2021-04-13 16:40:23 +08:00
jasder 07d11737e9 组织权限问题 
组织权限问题
 2021-04-13 16:39:50 +08:00
vilet.yy 1fe9ea126a fix: permission with organization 2021-04-13 11:53:06 +08:00
jasder b3b0f75e9b Merge branch 'develop' into trustie_server 2021-04-13 10:18:52 +08:00
jasder dcd4457cf5 FIX 开放平台管理员可以访问所有团队信息 2021-04-13 10:16:18 +08:00
jasder 5c8e561bd8 Merge branch 'develop' into trustie_server 2021-04-08 18:36:27 +08:00
vilet.yy 04a1376820 add: project's lesson_url 2021-04-08 15:20:34 +08:00
jasder 2b0c987558 Merge branch 'develop' into trustie_server 2021-04-07 11:35:09 +08:00
vilet.yy cf224bc9fe add: project menulist resources 2021-04-07 11:29:44 +08:00
vilet.yy d6c3bcfaf1 add: org add nickname 2021-04-07 11:29:44 +08:00
jasder e6b8435037 FIX gug 2021-04-02 18:57:13 +08:00
jasder 5752f19b2f FIX gug 2021-04-02 18:56:44 +08:00
vilet.yy 7a00541375 Merge branch 'develop' into hh_develop 2021-04-02 18:41:37 +08:00
jasder 6ce4b26047 FIX api bug 2021-04-02 18:40:26 +08:00
vilet.yy 1d832a1723 fix 2021-04-02 18:38:08 +08:00
vilet.yy 80ce40e492 fix 2021-04-02 18:33:31 +08:00
vilet.yy 91f6dae56a fix 2021-04-02 18:24:20 +08:00
vilet.yy 57f420848e Merge branch 'develop' into hh_develop 2021-04-02 18:20:41 +08:00
jasder 50fb8d3983 ADD sync user info api 2021-04-02 18:18:52 +08:00
vilet.yy fba58800a7 fix 2021-04-02 18:08:36 +08:00
vilet.yy c4a43c4392 add: need edit user password 2021-04-02 16:44:36 +08:00
vilet.yy 1153bd5ab6 fix: set redirect_uri 2021-04-02 09:43:18 +08:00
vilet.yy f732b0374c fix: ceshi 2021-04-02 09:23:11 +08:00
vilet.yy 0d97d7d4f0 add: educoder third party 2021-04-01 18:01:51 +08:00
jasder 0b6ebb7b36 FIX get site url bug with setting api 2021-04-01 15:04:17 +08:00
jasder b89501822f FIX code bug 2021-03-31 14:53:50 +08:00
jasder 5f5b380514 FIX conflict 2021-03-31 13:35:40 +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 9394d15752 fix: menu manager allow visit 2021-03-30 17:27:50 +08:00
vilet.yy 8952f6a944 fix: menu manager allow visit 2021-03-30 17:13:58 +08:00
jasder 69bf30d482 Merge branch 'develop' into trustie_server 2021-03-28 20:05:34 +08:00
jasder c4560ebb66 FIX tags api bug 2021-03-28 20:05:13 +08:00
jasder 0211d6152e fix conflict 2021-03-28 20:00:28 +08:00
jasder 06c851d22f Merge branch 'develop' into trustie_server 2021-03-27 23:54:32 +08:00
jasder ad4617288d FIX repositories detail api bug 2021-03-27 23:54:14 +08:00
jasder 7c0a2aa89e Merge branch 'develop' into trustie_server 2021-03-25 14:31:45 +08:00
vilet.yy 9ee42e805b fix: update error 2021-03-24 13:50:17 +08:00
jasder 0f67944911 FIX code bug 2021-03-23 15:58:12 +08:00
jasder 8b656fd409 FIX bug 2021-03-23 15:47:01 +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
vilet.yy 8bbfea2079 fix 2021-03-22 11:18:04 +08:00
vilet.yy 8c2a543e61 fix: project code change to default 2021-03-22 11:16:35 +08:00
vilet.yy 223755a965 fix: languages filter 0.0% 2021-03-19 18:36:55 +08:00
vilet.yy f1ed61c687 add: menu permission control 2021-03-19 18:01:29 +08:00
vilet.yy 6a7ef2a1a7 add: repo contributors 2021-03-18 16:35:46 +08:00
vilet.yy 8f98a83379 add: project unit list 2021-03-17 13:50:26 +08:00
vilet.yy a14459da50 add: project menu list 2021-03-17 11:52:36 +08:00
vilet.yy 34d95451b5 add: get project all files 2021-03-16 10:25:37 +08:00
vilet.yy b43926f69f add: new project detail 2021-03-15 19:01:35 +08:00
jasder 899e7ccab8 FIX CI 修复参数设置的bug 2021-03-05 15:48:08 +08:00
victor d3df04fb97 参数管理修改 2021-03-05 15:43:42 +08:00
jasder 50928f82c0 FIX valid user before register action 2021-03-05 15:36:26 +08:00
victor 33984e16d0 参数管理修改 2021-03-05 15:26:29 +08:00
victor d7bc309d49 参数管理删除 2021-03-04 09:33:04 +08:00
victor cb90dc1f51 参数管理 2021-03-03 15:36:59 +08:00
vilet.yy ccbaa8efe5 [FIX]pull_request create and update error 2021-03-01 16:43:09 +08:00
vilet.yy c299c9fa69 [FIX]repository setting entry error 2021-02-26 13:49:29 +08:00
vilet.yy f7b7122d60 [FIX]join projects add org projects and update project private bug 2021-02-21 15:20:04 +08:00
jasder 9f4c2bd673 FIX repo setting api for forbidden 2021-02-09 11:48:05 +08:00
viletyy ec1acde99a [FIX]show teams, org name valid message 2021-02-06 15:49:56 +08:00
viletyy 55528950f1 [FIX]owner text 2021-02-06 15:49:56 +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 629f3fbbe1 [FIX]little vliad about team_user 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 ce4c71c6a0 [FIX]组织可以不上传头像 2021-02-06 15:49:54 +08:00
viletyy dab57e9af3 [FIX]一些筛选以及创建最大项目数量验证 2021-02-06 15:49:53 +08:00
viletyy fef43caf4c [ADD]组织项目相关 2021-02-06 15:49:53 +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 1dc43a23b7 [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
Jasder 6053907828 fix change stoage file derictory 2021-02-02 14:32:16 +08:00
victor 4816ee04d3 流水线列表查询 2021-02-02 13:10:53 +08:00
victor d2209619f0 流水线增加owner选项 2021-02-02 11:48:09 +08:00
victor 155fc35cfa 获取代码库文件sha 2021-02-01 16:19:42 +08:00
victor ce31875c19 根据阶段查询模板接口 2021-02-01 15:17:03 +08:00
victor d214b1ddae 流水线初始化模板名称修改 2021-02-01 13:40:15 +08:00
victor 22d7478349 content接口返回分支 2021-02-01 10:36:30 +08:00
victor c3f69a48d6 流水线sha查询 2021-01-28 15:04:51 +08:00
victor c3136fc1a8 流水线查询接口修改 2021-01-28 14:14:22 +08:00
victor 2c648b7941 流水线创建修改 2021-01-27 16:27:56 +08:00
victor 6c77b73ec6 创建多条流水线、模板管理 2021-01-26 17:15:53 +08:00
Jasder 0adcbaa19f ADD repository languages percentage api 
(cherry picked from commit efa99e0f06)
 2021-01-20 14:30:41 +08:00
Jasder ffeb076086 FIX pull api bug 
(cherry picked from commit 36a3e36edb)
 2021-01-20 14:30:29 +08:00
Jasder 6fa4ee6c14 ADD get readme api 
(cherry picked from commit 232f26ea3b)
 2021-01-20 14:30:24 +08:00
Jasder 5667c0854c FIX [api] get pull bug 
(cherry picked from commit fa01194d3c)
 2021-01-20 14:30:10 +08:00
Jasder f212c5213d FIX base and head params problem for compare api 
(cherry picked from commit 4c2c3d17e2)
 2021-01-20 14:30:01 +08:00
Jasder d2e2793d29 FIX pull request bug 
(cherry picked from commit 2b140d6f7c)
 2021-01-20 14:29:52 +08:00
moshenglv ab4af170fb 连接ci数据库名修改，根据repo 2021-01-20 13:52:30 +08:00
moshenglv ab3242569d 流水线查询 2021-01-20 11:54:10 +08:00
moshenglv 69c6e2ac3f cotent接口修改 2021-01-19 18:39:57 +08:00
moshenglv efdbc6fd4e 创建流水线文件新增接口返回内容修改 2021-01-19 18:23:28 +08:00
moshenglv 3946c7116b 创建pipeline文件接口 2021-01-19 18:11:00 +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 5e0cdba1f9 流水线与项目关联 2021-01-19 11:03:27 +08:00
moshenglv c6aeecb33c 查询阶段返回流水线名称 2021-01-18 09:58:33 +08:00
moshenglv 2d99713cd0 流水线增加用户字段 2021-01-18 09:32:23 +08:00
moshenglv 4ac7634031 流水线步骤新增、更新 2021-01-14 15:32:49 +08:00
moshenglv cb6c4b1e3f 阶段新增、删除、查询步骤接口修改 2021-01-12 17:40:42 +08:00
moshenglv bcb4e78829 修改模板查询相关接口 2021-01-12 13:54:11 +08:00
moshenglv 77529319a1 可视化创建流水线后端代码 2021-01-12 10:23:26 +08:00
jasder 2f140d13f0 Merge pull request '用户可以查看其他用户的构建列表' (#10) from trustie_server into develop 
Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/10
 2021-01-06 18:50:31 +08:00
moshenglv 9a66b48726 用户可以查看其他用户的构建列表 2021-01-06 18:47:39 +08:00
jasder 5cdfc4ba62 Merge pull request '解绑流程修改' (#9) from trustie_server into develop 
Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/9
 2021-01-06 16:53:22 +08:00
moshenglv 06b8aab455 解绑时先判断是否是trustie提供服务器的场景 2021-01-06 16:45:18 +08:00
jasder 2abf1f0665 Merge pull request '【devops】trustie提供服务器后台代码' (#8) from trustie_server into develop 
Reviewed-on: https://git.trustie.net/jasder/forgeplus/pulls/8
 2021-01-06 15:38:29 +08:00
moshenglv cbe5b3afde 解绑时取消激活该用户的所有项目 2021-01-06 14:45:34 +08:00
Jasder 8f846ae29b FIX gitea user register service 2021-01-06 14:00:15 +08:00
moshenglv f7a5157788 使用trustie提供的服务器，需要多增加一条授权信息 2021-01-06 12:59:34 +08:00
moshenglv 910425ddb3 修改授权接口，当选择trustie服务器时，clientId使用创建drone的clientId 2021-01-05 16:40:09 +08:00
moshenglv e412b97003 修改授权接口 2021-01-05 15:04:01 +08:00
moshenglv 387a565fe3 自有服务器进行判断是否已经绑定云账号 2021-01-04 16:18:49 +08:00
moshenglv bab9174966 选trustie服务器解绑时删除drone用户 2021-01-04 14:57:28 +08:00
moshenglv 4aae60f3d8 打印调用drone创建用户接口日志 2021-01-04 09:49:42 +08:00
moshenglv 1108b298f0 绑定调用gitea接口，，错误，抛出异常 2021-01-04 09:41:04 +08:00
moshenglv 47093ffcb9 调用drone创建用户接口 2020-12-31 19:39:20 +08:00
moshenglv 3d332c75d6 连接ci数据库方法 2020-12-31 17:13:41 +08:00