Commit Graph

2f140d13f Merge pull request '用户可以查看其他用户的构建列表' (#10) from trustie_server into develop by jasder 2021-01-06 18:50:31 +0800
9a66b4872 (refs/pull/10/head) 用户可以查看其他用户的构建列表 by moshenglv 2021-01-06 18:47:39 +0800
5cdfc4ba6 Merge pull request '解绑流程修改' (#9) from trustie_server into develop by jasder 2021-01-06 16:53:22 +0800
06b8aab45 (refs/pull/9/head) 解绑时先判断是否是trustie提供服务器的场景 by moshenglv 2021-01-06 16:45:18 +0800
2abf1f066 Merge pull request '【devops】trustie提供服务器后台代码' (#8) from trustie_server into develop by jasder 2021-01-06 15:38:29 +0800
cbe5b3afd (refs/pull/8/head) 解绑时取消激活该用户的所有项目 by moshenglv 2021-01-06 14:45:34 +0800
0794f77a8 Merge branch 'develop' into dev_military by Jasder 2021-01-06 14:00:51 +0800
8f846ae29 FIX gitea user register service by Jasder 2021-01-06 14:00:15 +0800
f7a515778 使用trustie提供的服务器，需要多增加一条授权信息 by moshenglv 2021-01-06 12:59:34 +0800
e5a46a242 FIX register with validate email by Jasder 2021-01-06 11:03:00 +0800
4902237bd Merge branch 'dev_military_license' of http://git.trustie.net/jasder/forgeplus into dev_military_license by Jasder 2021-01-06 10:44:37 +0800
4ddc60a1c FIX user register bug by Jasder 2021-01-06 10:44:20 +0800
910425ddb (refs/pull/7/head) 修改授权接口，当选择trustie服务器时，clientId使用创建drone的clientId by moshenglv 2021-01-05 16:40:09 +0800
e412b9700 修改授权接口 by moshenglv 2021-01-05 15:04:01 +0800
cfa14fff9 [FIX] by viletyy 2021-01-04 17:52:05 +0800
ef327f299 [FIX] by viletyy 2021-01-04 16:19:11 +0800
387a565fe (refs/pull/6/head) 自有服务器进行判断是否已经绑定云账号 by moshenglv 2021-01-04 16:18:49 +0800
bf91c5e38 [FIX] by viletyy 2021-01-04 15:32:44 +0800
9b687f788 [FIX] by viletyy 2021-01-04 15:22:03 +0800
bab917496 选trustie服务器解绑时删除drone用户 by moshenglv 2021-01-04 14:57:28 +0800
a07216232 [ADD]项目创建者审核申请 by viletyy 2021-01-04 12:26:58 +0800
4aae60f3d 打印调用drone创建用户接口日志 by moshenglv 2021-01-04 09:49:42 +0800
1108b298f 绑定调用gitea接口，，错误，抛出异常 by moshenglv 2021-01-04 09:41:04 +0800
c5b24a344 add operation for pull request create/merge/refuse by nigel007 2021-01-03 17:09:54 +0800
cbb666052 add blockchain operation after comments by nigel007 2021-01-03 17:09:19 +0800
f4f1aef36 更新了显示文字，增加了功字 by nigel007 2021-01-03 17:08:44 +0800
6aef8e19c modify common function for update blockchain by nigel007 2021-01-03 17:08:13 +0800
43374c801 add gitea service for commit by nigel007 2021-01-03 17:07:05 +0800
fcc17eb07 change create function for issue controller, add invocation of blockchain related function and add ActiveRecord Rollback operation by nigel007 2020-12-31 20:29:41 +0800
f230c0d64 add common function for blockchain operation by nigel007 2020-12-31 20:28:38 +0800
2395d4ef5 add blockchain api url by nigel007 2020-12-31 20:27:42 +0800
c11cbf738 add this class to read blockchain configuration by nigel007 2020-12-31 20:27:29 +0800
47093ffcb 调用drone创建用户接口 by moshenglv 2020-12-31 19:39:20 +0800
3d332c75d 连接ci数据库方法 by moshenglv 2020-12-31 17:13:41 +0800
a84af1d74 根据用户选择的服务器类型创建不同的CI数据库连接 by moshenglv 2020-12-31 17:07:10 +0800
2b86c7eb9 修改turstie提供服务器，认证时调用drone url by moshenglv 2020-12-31 16:47:16 +0800
8f1e0f39e Merge branch 'dev_military_license' of https://git.trustie.net/jasder/forgeplus into dev_military_license by viletyy 2020-12-31 14:03:06 +0800
aaa648395 [FIX]几处bug修复 by viletyy 2020-12-31 14:02:37 +0800
904ac86c8 add column use_blockchain by nigel007 2020-12-30 16:24:32 +0800
99b631ced add function repo_use_blockchain to get param from front end form by nigel007 2020-12-30 16:18:46 +0800
4c9df8c83 add column use_blockchain into attrs by nigel007 2020-12-30 16:17:23 +0800
27b3bdc97 add two columns into permits, namely private and use_blockchain by nigel007 2020-12-30 16:16:44 +0800
213c24892 add use_blockchain column into table: projects by nigel007 2020-12-30 16:14:27 +0800
047624658 Merge branch 'develop' by Jasder 2020-12-30 15:05:24 +0800
d62df0f08 ADD MuLan licenses by Jasder 2020-12-30 15:05:07 +0800
a80037ae8 FIX init db structrue and add records of roles by Jasder 2020-12-30 15:00:15 +0800
ad129db4e Merge branch 'develop' by Jasder 2020-12-30 14:02:32 +0800
fa98636eb FIX migrate bug by Jasder 2020-12-30 14:02:21 +0800
e127d1239 Merge branch 'develop' by Jasder 2020-12-30 13:47:26 +0800
56965910a ADD column to cloud table by Jasder 2020-12-30 13:47:00 +0800
584ed2e85 NICE by jasder 2020-12-30 09:37:02 +0800
bf730ca18 Merge branch 'dev_military_license' of http://git.trustie.net/jasder/forgeplus into dev_military_license by Jasder 2020-12-29 18:20:46 +0800
132af875b Merge branch 'master' into dev_military_license by Jasder 2020-12-29 18:19:07 +0800
6b244b7b8 Merge branch 'develop' by Jasder 2020-12-29 18:18:44 +0800
50021a278 FIX generate token bug for regitster api by Jasder 2020-12-29 18:18:17 +0800
a862d994a [FIX]只有审核成功才添加成员 by viletyy 2020-12-29 18:08:10 +0800
604da93c5 FIX when add members to project, permission set to readable by Jasder 2020-12-29 17:17:36 +0800
3f525f577 FIX update model schema by Jasder 2020-12-29 14:25:40 +0800
da9d268e0 (refs/pull/5/head) fix issue #43166 by nigel007 2020-12-29 12:45:31 +0800
05d1e66ea [FIX] by viletyy 2020-12-28 20:29:56 +0800
10c1cccf2 [FIX] by viletyy 2020-12-28 19:42:59 +0800
27ec7ec7d [ADD]simple去除访问限制，并加入字段 by viletyy 2020-12-28 18:41:28 +0800
43b490756 Merge branch 'dev_military_license' of http://git.trustie.net/jasder/forgeplus into dev_military_license by Jasder 2020-12-28 14:53:52 +0800
cb90e1a13 FIX get branches bug by Jasder 2020-12-28 14:53:30 +0800
1420a47a5 FIX bug by Jasder 2020-12-28 13:44:03 +0800
72d8af8d7 FIX update deploy file by Jasder 2020-12-28 13:42:59 +0800
749cd058c [FIX] by viletyy 2020-12-28 12:57:58 +0800
47cc70f2c [ADD]增加下载文件接口 by viletyy 2020-12-28 12:31:05 +0800
5447d54d3 [FIX] by viletyy 2020-12-28 10:26:50 +0800
6c436dd63 [ADD]后台审核特殊许可申请 by viletyy 2020-12-27 18:44:03 +0800
9eb7219b9 [FIX] by viletyy 2020-12-25 18:58:03 +0800
ad5fcb25c [ADD]接口文档 by viletyy 2020-12-25 17:51:42 +0800
d42053ce0 [FIX]merge by viletyy 2020-12-25 16:33:16 +0800
36bae7194 [ADD]增加特殊许可的验证 by viletyy 2020-12-25 16:17:46 +0800
837aa1ea9 FIX Merge master branch by Jasder 2020-12-25 15:10:50 +0800
b5ab230a5 (refs/pull/4/head) 删除调用drone创建用户接口 by moshenglv 2020-12-24 10:40:42 +0800
2666a9517 Merge branch 'master' of https://git.trustie.net/moshenglv/forgeplus into master by moshenglv 2020-12-24 10:38:16 +0800
a3724e80b 增加trustie提供服务器流程。 1、增加接口trustie_bind 2、根据server_type字段判断使用哪个数据库连接 by moshenglv 2020-12-18 13:14:30 +0800
e370c4df1 Update deploy file by jasder 2020-12-24 10:07:36 +0800
9e5cf6c2f Update README.md by jasder 2020-12-24 10:00:39 +0800
32a52a5c7 Update model schemas by Jasder 2020-12-23 15:48:07 +0800
01f79c81c FIX code review for create pull request by Jasder 2020-12-23 15:47:08 +0800
ffb71512f FIX code review for create pull request by Jasder 2020-12-23 15:46:06 +0800
d70168d25 (refs/pull/3/head) 增加trustie提供服务器流程。 1、增加接口trustie_bind 2、根据server_type字段判断使用哪个数据库连接 by moshenglv 2020-12-18 13:14:30 +0800
6de617d89 (refs/pull/2/head, refs/pull/1/head) fix bugs, add test cases by qyzh 2020-12-14 22:04:25 +0800
5addece8d fix bugs by qyzh 2020-12-14 17:59:01 +0800
ffbe4942b delete some interface by qyzh 2020-12-11 17:01:52 +0800
6cbaf410b FIX Grammatical errors by Jasder 2020-12-10 18:05:33 +0800
5a25ffe10 FIX get repository protected branches bug by Jasder 2020-12-08 16:48:28 +0800
61c8e4113 FIX log writing failed. xE6 from ASCII-8BIT to UTF-8 by Jasder 2020-12-07 16:04:13 +0800
087ad0830 Merge branch 'develop' by Jasder 2020-12-07 10:29:37 +0800
a4a315ea3 FIX bug by Jasder 2020-12-07 10:29:18 +0800
0c98d13db Merge branch 'develop' by Jasder 2020-12-07 10:12:49 +0800
07caa77f9 FIX code review by Jasder 2020-12-07 10:06:08 +0800
a357ea3ec Merge branch 'develop' by Jasder 2020-12-06 21:48:47 +0800
4c980b577 FIX create protected branch params by Jasder 2020-12-04 18:15:48 +0800
539b4a10a Upate README.md by Jasder 2020-12-04 18:15:19 +0800
aaf3661fd FIX Forces conversion str to boolean by Jasder 2020-12-04 17:13:58 +0800
7c0c90b9b Update api document by Jasder 2020-12-04 16:31:52 +0800
3f60dd3f8 ADD edit protected branch api by Jasder 2020-12-04 16:18:27 +0800

... 55 56 57 58 59 ...