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

1453 Commits

Author SHA1 Message Date
Jasder 32ec60bbe3 FIX 完善ci服务的解绑流程 2020-09-04 10:17:44 +08:00
Jasder 74b2a5b021 FIX rename ucloud view dir 2020-09-03 17:10:23 +08:00
Jasder b31a11302c FIX devops admin bug 2020-09-03 17:05:38 +08:00
Jasder 562d0b7b07 ADD 个人中心添加devops管理功能 2020-09-03 15:52:54 +08:00
Jasder 731c06185b Merge branch 'dev_trustie' into dev_devops 2020-09-03 15:34:05 +08:00
Jasder 6ec599a946 FIX forge登录时，修改同步trustie平台登录接口请求方法 2020-09-01 15:51:03 +08:00
Jasder cd933f2031 FIX CODE BUG 2020-09-01 15:33:31 +08:00
Jasder 57ee5c5397 Merge branch 'dev_trustie' into dev_devops 2020-09-01 15:23:37 +08:00
Jasder 318c9487fb FIX 解决trustie和forge同步登录登出的问题 2020-09-01 15:23:02 +08:00
Jasder 003db1405d Merge branch 'dev_trustie' into dev_devops 2020-08-29 12:07:37 +08:00
Jasder ef4578286f FIX 解决forked项目删除后，fork user没有关联删除的bug 2020-08-29 12:07:06 +08:00
Jasder dc3ec48b8c FIX educoder author bug 2020-08-29 11:57:50 +08:00
Jasder 1290b3446f FIX update_column bug 2020-08-28 11:50:14 +08:00
Jasder 903103ec5d FIX ci active repo bug 2020-08-28 11:40:29 +08:00
Jasder b9a57be67d FIX code bug 2020-08-28 10:56:04 +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 b75896821f FIX 优化ci初始化流程 2020-08-28 10:25:08 +08:00
Jasder b26c2f273f FIX build time bug 2020-08-27 16:01:10 +08:00
Jasder 0461c2735b Merge branch 'dev_trustie' into dev_devops 2020-08-27 15:10:25 +08:00
Jasder c6a31cbda8 FIX delete hash merge code 2020-08-27 15:10:11 +08:00
Jasder f09a9bdedc Merge branch 'dev_trustie' into dev_devops 2020-08-27 15:05:24 +08:00
Jasder 9823b03099 FIX hash merge bug 2020-08-27 15:05:09 +08:00
Jasder 43a8576089 Merge branch 'dev_trustie' into dev_devops 2020-08-27 14:44:26 +08:00
Jasder 79c557bd68 FIX 修复版本库在线创建文件时，commiter信息错误的bug 2020-08-27 14:43:44 +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 2866c060c7 FIx code review 2020-08-26 16:24:51 +08:00
Jasder 518e966a87 FIX update trustie-pileline 2020-08-26 16:23:59 +08:00
Jasder 8c9c085259 ADD cloud account id 2020-08-26 15:14:00 +08:00
Jasder 72cacb72a6 FIX devops author api 2020-08-26 15:02:02 +08:00
Jasder 1e99e87228 FIX delete 'docker rm -f' command 2020-08-26 14:34:32 +08:00
Jasder 21fa22ed21 FIX 2020-08-26 12:02:51 +08:00
Jasder fc7b714d4c FIX delete project_id with create cloud_account 2020-08-26 11:57:47 +08:00
Jasder aac6df8790 FIX time count bug 2020-08-26 10:46:54 +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 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 5375c3ec71 ADD build status with killed 2020-08-25 17:01:03 +08:00
Jasder 66efdcc1b6 FIX build's number params 2020-08-25 16:39:31 +08:00
Jasder ec7becc26e FIX user search cloud account's bug 2020-08-25 16:34:13 +08:00
Jasder 1617a541fe FIX code review 2020-08-25 15:59:53 +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 4932eae285 ADD branch and sha for builds api 2020-08-25 14:25:42 +08:00
Jasder 405e5b5d3d FIX bug 2020-08-25 11:05:46 +08:00
sylor_huang@126.com e23ce05b1b Fixed: Issues2 2020-08-24 15:09:16 +08:00
sylor_huang@126.com 200cb70f4b Fixed: Issues 2020-08-24 15:06:05 +08:00
sylor_huang@126.com 46801284aa Test Project Validate Failed15 2020-08-24 14:28:30 +08:00
sylor_huang@126.com 7e7ab71231 Test Project Validate Failed14 2020-08-24 14:20:48 +08:00
sylor_huang@126.com 79bc2655b7 Test Project Validate Failed13 2020-08-24 14:19:32 +08:00
sylor_huang@126.com 5a065d83b7 Test Project Validate Failed12 2020-08-24 14:17:23 +08:00
sylor_huang@126.com 3586952a89 Test Project Validate Failed1 2020-08-24 14:16:11 +08:00
sylor_huang@126.com 72feacecbb Test Project Validate Failed 2020-08-24 14:12:59 +08:00
Jasder 6d0eb74683 FIX educoder platform register bug when mail exists 2020-08-22 13:24:58 +08:00
Jasder 8abf748778 FIX bug 2020-08-21 16:25:13 +08:00
Jasder 8758ec3197 Update trustie pipeline api 2020-08-21 16:06:47 +08:00
Jasder c1e6792f29 FIX cloud account bug 2020-08-21 15:26:42 +08:00
Jasder ae9d857d7f FIX ci server 2020-08-21 14:53:48 +08:00
Jasder e7a0bc7e0f FIX code bug 2020-08-21 10:46:37 +08:00
Jasder 137e780db4 FIX . 2020-08-21 10:15:26 +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 89b2e263ae FIX devops builds api bug 2020-08-19 18:19:27 +08:00
Jasder ac2d2b842d Merge branch 'dev_trustie' into dev_devops 2020-08-19 17:13:48 +08:00
Jasder 6ea4cacc9a fix trustie_related_projects 接口添加项目相关链接 2020-08-19 16:24:24 +08:00
Jasder 9b25b7a9e6 FIX ci drone server database 2020-08-18 16:40:39 +08:00
Jasder 5ac6133aef FIX ci drone server connect database 2020-08-18 09:23:23 +08:00
Jasder 3a18772de0 Merge branch 'dev_trustie' into dev_devops 2020-08-18 09:07:59 +08:00
Jasder a36072e8f1 Delete mail validate for bind action 2020-08-18 09:07:16 +08:00
Jasder a9012b4c53 Merge branch 'dev_trustie' into dev_devops 2020-08-17 18:08:41 +08:00
Jasder 806fa686a6 FIX OpenUser's bug 2020-08-17 18:08:18 +08:00
Jasder 90693d4745 Merge branch 'dev_trustie' into dev_devops 2020-08-17 17:48:07 +08:00
Jasder 44441ec215 FIX mail bug 2020-08-17 17:47:47 +08:00
Jasder ad229081f0 Merge branch 'dev_trustie' into dev_devops 2020-08-17 17:41:39 +08:00
Jasder 9f85b8da8e FIX query bug 2020-08-17 17:41:01 +08:00
Jasder 7db195147e FIX educoder帐号同步流程优化(支持邮箱自动授权) 2020-08-17 17:30:15 +08:00
Jasder a4d8338cb5 ADD ci database port 2020-08-17 14:29:09 +08:00
Jasder af220cfffc FIX config drone database 2020-08-17 14:22:26 +08:00
Jasder 7bb43700b4 ADD namespace ci for model 2020-08-17 11:22:53 +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 086ebc34b2 FIX login_hepler set cookie's bug 2020-08-16 02:26:21 +08:00
Jasder c40777be2b FIX debug token 2020-08-16 00:54:22 +08:00
Jasder 480cfb66b1 Merge branch 'dev_devops' of http://git.trustie.net/jasder/forgeplus into dev_devops 2020-08-15 19:57:35 +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 8fd167b578 Merge branch 'dev_trustie' into dev_devops 2020-08-15 15:04:24 +08:00
sylor_huang@126.com 1bfcc466fe change 2020-08-15 15:04:09 +08:00
sylor_huang@126.com 09802819b8 Merge branch 'dev_trustie' into dev_devops 2020-08-15 14:50:12 +08:00
sylor_huang@126.com fae9df56a4 cahnge 2020-08-15 14:49:52 +08:00
sylor_huang@126.com 2979eaaeb4 Merge branch 'dev_trustie' into dev_devops 2020-08-15 14:48:42 +08:00
sylor_huang@126.com 531b66e862 Change 2020-08-15 14:48:12 +08:00
sylor_huang@126.com bc8240b772 Merge branch 'dev_trustie' into dev_devops 2020-08-15 14:35:52 +08:00
sylor_huang@126.com b1d974c362 Change 2020-08-15 14:35:31 +08:00
sylor_huang@126.com 372687e509 Merge branch 'dev_trustie' into dev_devops 2020-08-15 13:49:52 +08:00
sylor_huang@126.com e092c1f222 Change 2020-08-15 13:49:36 +08:00
sylor_huang@126.com a7b096d00e Merge branch 'dev_trustie' into dev_devops 2020-08-15 13:36:03 +08:00
sylor_huang@126.com 5f3f6748f2 Change 2020-08-15 13:34:32 +08:00
sylor_huang@126.com 2267872076 Chnage 2020-08-15 13:30:44 +08:00
sylor_huang@126.com 929b56629c Change 2020-08-15 13:28:22 +08:00
sylor_huang@126.com 2154892a0b Merge branch 'dev_trustie' into dev_devops 2020-08-15 13:27:32 +08:00
sylor_huang@126.com 0aa46815f2 Change Project Id 2020-08-15 13:27:13 +08:00
Jasder a8522edaa9 Merge branch 'dev_trustie' of http://git.trustie.net/jasder/forgeplus into dev_trustie 2020-08-15 13:24:52 +08:00
Jasder ebce182b7e Merge branch 'dev_change_route' into dev_trustie 2020-08-15 13:24:29 +08:00
sylor_huang@126.com 0af359ec0c Change 2020-08-15 13:21:33 +08:00
sylor_huang@126.com a0d287b1df Change 2020-08-15 12:50:04 +08:00
sylor_huang@126.com 466bdedfcd Change 2020-08-15 12:40:31 +08:00
sylor_huang@126.com e1c49c0ba8 Change 2020-08-15 12:38:25 +08:00
sylor_huang@126.com aa0f7ff873 Change 2020-08-15 12:37:26 +08:00
sylor_huang@126.com 5aff092a35 Change 2020-08-15 12:35:56 +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 0c64b36fab FIX merge 2020-08-14 22:17:09 +08:00
Jasder c4a92fe4a4 FIX login bug 2020-08-14 22:16:24 +08:00
Jasder 775c27a45b FIX login bug 2020-08-14 22:14:59 +08:00
Jasder 10adc42257 Merge branch 'dev_change_route' into dev_devops 2020-08-14 22:05:35 +08:00
Jasder 17da5fad38 ADD log 2020-08-14 22:05:22 +08:00
Jasder 58d0044764 Merge branch 'dev_change_route' into dev_devops 2020-08-14 22:00:52 +08:00
Jasder 17183d8769 FIX 2020-08-14 22:00:37 +08:00
Jasder 652654e606 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:57:10 +08:00
Jasder 675c380967 FIX 2020-08-14 21:56:16 +08:00
Jasder f7db9c0892 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:53:25 +08:00
Jasder c38b073715 FIX validat bug 2020-08-14 21:53:11 +08:00
Jasder 07edd5f8b4 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:49:47 +08:00
Jasder 93dabf9f06 FIX 2020-08-14 21:49:33 +08:00
Jasder 94bf6f99cc Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:43:53 +08:00
Jasder bf5937fc85 FIX logger 2020-08-14 21:43:39 +08:00
Jasder 840e048d77 Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:32:09 +08:00
Jasder 04ae2da5bc FIX config 2020-08-14 21:31:46 +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 39424ec8da Merge branch 'dev_change_route' into dev_devops 2020-08-14 21:09:12 +08:00
Jasder 86bbefd036 FIX bug 2020-08-14 21:08:59 +08:00
Jasder b2a6630e15 Merge branch 'dev_change_route' into dev_devops 2020-08-14 19:47:19 +08:00
Jasder 2199258f8e FIX bug 2020-08-14 19:47:02 +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 cf43a64ada FIX rewrite devops with ci 2020-08-13 23:38:32 +08:00
Jasder 8e7c25b5ed FIX code bug 2020-08-13 21:11:33 +08:00
Jasder 7a2d7f50fd Merge branch 'dev_change_route' into dev_devops 2020-08-13 20:49:33 +08:00
Jasder 5bd8079386 FIX create project bug 2020-08-13 17:15:54 +08:00
Jasder 8d46eecc2c Delete create labels for gitea platform 2020-08-13 16:32:23 +08:00
Jasder 7a2b496d95 FIX 取消项目点赞、关注、fork等列表需要登录的限制 2020-08-13 15:58:07 +08:00
Jasder 425a374332 ADD fork info for repositories show action 2020-08-13 14:40:35 +08:00
Jasder 28c7199ce6 FIX bug 2020-08-13 11:38:05 +08:00
Jasder 72ba784e70 FIX 版本库更新、创建、删除文件的权限问题 2020-08-13 11:06:34 +08:00
Jasder 78b091ddd3 FIX merge bug 2020-08-13 09:44:38 +08:00
Jasder 193ba325ce FIX code bug 2020-08-12 22:24:06 +08:00
Jasder 0a9fbfd101 FIX entries api bug 2020-08-12 18:40:45 +08:00
sylor_huang@126.com ae4161fa9b Change 2020-08-12 16:51:24 +08:00
Jasder 0e951df5d0 FIX pull_requests new action bug 2020-08-12 15:03:23 +08:00
sylor_huang@126.com 3596ddeee4 Change 2020-08-12 15:03:14 +08:00
sylor_huang@126.com b5532c2e8a Change 2020-08-12 14:55:50 +08:00
sylor_huang@126.com 01be601ed4 Change 2020-08-12 14:55:19 +08:00
Jasder 082c3b05b3 FIX repositories controller bug 2020-08-12 14:51:12 +08:00
sylor_huang@126.com 97bec74589 Change 2020-08-12 11:46:55 +08:00
Jasder 066dede6e3 FIX bug 2020-08-12 11:18:14 +08:00
sylor_huang@126.com ccf2053ca4 Change 2020-08-12 11:17:49 +08:00
Jasder e2926acd2f FIX some routes bug 2020-08-12 11:14:57 +08:00
sylor_huang@126.com 3a0ec56564 Chnage 2020-08-12 11:12:04 +08:00
sylor_huang@126.com ff847184cc Change 2020-08-12 11:01:34 +08:00
sylor_huang@126.com facf7a0040 Chnage 2020-08-12 11:00:39 +08:00
sylor_huang@126.com d80600a58c Change 2020-08-12 10:58:16 +08:00
sylor_huang@126.com 54b1af8d06 Change 2020-08-12 10:55:13 +08:00
sylor_huang@126.com d40725a605 Merge branch 'dev_trustie' into dev_change_route 2020-08-12 10:53:18 +08:00
sylor_huang@126.com 0a321fd73e Change 2020-08-12 10:52:20 +08:00
sylor_huang@126.com 5ecd4532f2 Repair 2020-08-12 10:42:19 +08:00
sylor_huang@126.com eb0c69e802 Add Sync Project Military Job 2020-08-12 10:38:45 +08:00
Jasder 009b1976a7 FIX bug 2020-08-12 10:35:19 +08:00
Jasder 6bd8095258 FIX 升级完善项目相关路由 2020-08-11 23:20:04 +08:00
Jasder 25a3c8a372 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-08-06 14:29:48 +08:00
Jasder c63c916d9d Update sync gitea user info 2020-08-06 14:29:34 +08:00
Jasder 69ea60dfd5 FIX update devops process 2020-08-06 14:26:19 +08:00
sylor_huang@126.com 97f40f6d76 Change Issue series Update 2020-07-30 09:53:10 +08:00
Jasder 0b9a69ec56 ADD sha for get trsitie-pileline.yml file api 2020-07-24 15:35:43 +08:00
Jasder 3f92d99136 Merge branch 'dev_trustie' into dev_devops 2020-07-23 09:32:35 +08:00
sylor_huang@126.com 8ce7d8c921 Fix bugs 2020-07-22 20:20:42 +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 9694074b01 Fix trustie projects projectscore 2020-07-22 16:48:31 +08:00
sylor_huang@126.com 860edb0d13 Fix trustie projects projectscore 2020-07-22 16:47:42 +08:00
sylor_huang@126.com f4cfe5804d Add trustie projects projectscore 2020-07-22 16:43:45 +08:00
sylor_huang@126.com c45b8184c6 Merge branch 'dev_devops' of http://gitea.trustie.net/jasder/forgeplus into dev_devops 2020-07-22 16:43:09 +08:00
sylor_huang@126.com 5d7458bede Add trustie projects projectscore 2020-07-22 16:42:55 +08:00
Jasder b7b3751d43 ADD devops authorize 2020-07-22 15:16:01 +08:00
Jasder 3c7b257462 FIX devops 所有仓库相关的请求参数repo_id 改为project_id 2020-07-22 14:28:54 +08:00
Jasder 3d99dee31b Update devops redirect_url 2020-07-22 11:44:42 +08:00
Jasder 8b5c3797e9 FIX devops ucloud account 2020-07-22 11:27:30 +08:00
Jasder 1c2264f721 ADD get .trustie-pipeline.yml file api with devops 2020-07-22 11:18:02 +08:00
Jasder 07dfc06c9f FIX code review 2020-07-21 17:27:57 +08:00
Jasder cf244390ef FIX git drone logs api params's bug 2020-07-21 17:13:15 +08:00
Jasder 794f281787 FIX bug 2020-07-21 17:11:28 +08:00
Jasder 0f92aa7981 FIX test devops 2020-07-21 17:08:07 +08:00
Jasder 20d8f21ebb FIX bug 2020-07-21 15:19:43 +08:00
Jasder 236782eca8 FIX drone server command's bug 2020-07-21 15:07:42 +08:00
Jasder 5d34ac68d5 FIX create oauth bug 2020-07-21 14:17:19 +08:00
Jasder 15fc5de3de FIX 测试giteawebhook 2020-07-21 12:35:26 +08:00
Jasder 5fcb4a5500 FIX drone sever request params 2020-07-20 16:52:26 +08:00
Jasder 9cc2e80e98 FIX bug 2020-07-20 15:47:58 +08:00
Jasder 3b26434c78 Merge branch 'dev_devops' of http://gitea.trustie.net/jasder/forgeplus into dev_devops 2020-07-20 15:38:20 +08:00
Jasder e414960153 Update drone request server 2020-07-20 15:38:12 +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 b47f38137b Merge branch 'dev_devops' of http://gitea.trustie.net/jasder/forgeplus into dev_devops 2020-07-17 18:30:09 +08:00
sylor_huang@126.com 8a7464cf6c change 2020-07-17 18:29:56 +08:00
Jasder 97b5193e2b Merge branch 'dev_trustie' into dev_devops 2020-07-17 18:18:31 +08:00
Jasder dbd0c75fa8 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-17 18:18:04 +08:00
Jasder 884a0a3823 FIX 解决点赞、关注、fork用户访问列表的权限问题 2020-07-17 18:17:51 +08:00
sylor_huang@126.com 26e1592d93 Merge branch 'dev_trustie' into dev_devops 2020-07-17 17:55:00 +08:00
sylor_huang@126.com 3a0e729ef3 Change User Select 2020-07-17 17:54:41 +08:00
sylor_huang@126.com 1223a8c2a1 Merge branch 'dev_trustie' into dev_devops 2020-07-17 17:04:27 +08:00
sylor_huang@126.com 375e1fee83 Remove Email Regex 2020-07-17 17:04:10 +08:00
sylor_huang@126.com 0fd97e31a5 Merge branch 'dev_trustie' into dev_devops 2020-07-17 16:58:13 +08:00
sylor_huang@126.com ed02967a40 Change Gitea User Mail Regex 2020-07-17 16:57:53 +08:00
sylor_huang@126.com 69d319ef3b Merge branch 'dev_trustie' into dev_devops 2020-07-17 16:18:51 +08:00
sylor_huang@126.com 8fe9f5a649 Add login 2020-07-17 16:18:30 +08:00
sylor_huang@126.com b73dc77a4b Merge branch 'dev_devops' of http://gitea.trustie.net/jasder/forgeplus into dev_devops 2020-07-17 16:16:44 +08:00
sylor_huang@126.com d4220efc00 Merge branch 'dev_trustie' into dev_devops 2020-07-17 16:16:23 +08:00
sylor_huang@126.com 1617bdc58f Fix bugs 2020-07-17 16:15:57 +08:00
Jasder 69425d6d0a FIX . 2020-07-17 16:02:54 +08:00
sylor_huang@126.com bb9c79537d Merge branch 'dev_trustie' into dev_devops 2020-07-17 15:59:06 +08:00
sylor_huang@126.com 9fce30a052 change 2020-07-17 15:58:43 +08:00
Jasder e9af85cd16 Merge branch 'dev_trustie' into dev_devops 2020-07-17 15:38:10 +08:00
sylor_huang@126.com 6525c17a61 change 2020-07-17 15:37:07 +08:00
sylor_huang@126.com 46e8920f25 Merge branch 'dev_trustie' into dev_devops 2020-07-17 15:31:34 +08:00
sylor_huang@126.com 4d2f56e60b change 2020-07-17 15:31:12 +08:00
sylor_huang@126.com f2f7a7d915 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-17 15:30:42 +08:00
sylor_huang@126.com 7b219d385c 修改同步项目及添加没有gitea账户的用户 2020-07-17 15:30:17 +08:00
Jasder fb9ab7d9d4 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-17 14:45:57 +08:00
Jasder fd9aadcdce FIX bug 2020-07-17 14:45:53 +08:00
sylor_huang@126.com 5439078427 Merge branch 'dev_trustie' into dev_devops 2020-07-17 14:33:41 +08:00
sylor_huang@126.com 98e60ee9d3 change 2020-07-17 14:33:22 +08:00
sylor_huang@126.com 6b725acbff Merge branch 'dev_trustie' into dev_devops 2020-07-17 14:24:48 +08:00
sylor_huang@126.com cdbe5396e2 change 2020-07-17 14:24:14 +08:00
sylor_huang@126.com 4ab24c581b Merge branch 'dev_trustie' into dev_devops 2020-07-17 11:55:04 +08:00
sylor_huang@126.com 66d851f566 change 2020-07-17 11:54:46 +08:00
sylor_huang@126.com 6357bf91cd change versions_count and check mirrors 2020-07-17 11:25:13 +08:00
sylor_huang@126.com 9372fcf6a4 change versions and check repository 2020-07-17 11:18:12 +08:00
sylor_huang@126.com a10a3768c9 Merge branch 'dev_trustie' into dev_devops 2020-07-16 13:55:48 +08:00
Jasder 463c1fe7a4 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-16 12:11:30 +08:00
Jasder e707eb5e2b FIX 去掉超级管理员不能访问别人私有项目的权限控制 2020-07-16 12:11:16 +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 98469f3e0a FIX merge 2020-07-15 23:32:35 +08:00
Jasder cdbca5c845 FIX merge 2020-07-15 23:31:48 +08:00
Jasder 1baeab14c2 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-15 23:30:20 +08:00
sylor_huang@126.com 1e96ecd440 chang 2020-07-15 23:28:24 +08:00
sylor_huang@126.com de5beb3e12 chagne 2020-07-15 23:27:20 +08:00
sylor_huang@126.com 099c24c2d5 change 2020-07-15 23:26:08 +08:00
sylor_huang@126.com e450188d47 change 2020-07-15 23:23:57 +08:00
sylor_huang@126.com dea2009270 change 2020-07-15 22:57:21 +08:00
sylor_huang@126.com d08ebb3012 change 2020-07-15 22:56:36 +08:00
sylor_huang@126.com d57fa2ea48 change 2020-07-15 22:55:27 +08:00
sylor_huang@126.com 7d8dd0babc change 2020-07-15 22:39:32 +08:00
sylor_huang@126.com b077d0c361 change 2020-07-15 22:38:58 +08:00
sylor_huang@126.com e478af2548 Change bugs 2020-07-15 22:02:26 +08:00
sylor_huang@126.com 289f4495b6 chang issues 2020-07-15 22:01:12 +08:00
sylor_huang@126.com 4411f469b0 Merge branch 'dev_trustie' into dev_devops 2020-07-15 21:31:18 +08:00
sylor_huang@126.com fd2d34834a change 2020-07-15 21:30:52 +08:00
sylor_huang@126.com fb54d57561 change 2020-07-15 21:29:59 +08:00
sylor_huang@126.com 02e6ecae9e Merge branch 'dev_devops' of http://gitea.trustie.net/jasder/forgeplus into dev_devops 2020-07-15 21:17:44 +08:00
sylor_huang@126.com c2f702eacd add users 2020-07-15 21:17:30 +08:00
sylor_huang@126.com b26059bf48 change bugs 2020-07-15 21:15:40 +08:00
Jasder 00cbb6ae37 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-15 20:35:04 +08:00
Jasder 00c0fa0eb4 Merge branch 'dev_devops' of http://gitea.trustie.net/jasder/forgeplus into dev_devops 2020-07-15 20:34:38 +08:00
Jasder 006ff7fd62 ADD devops builds's api 2020-07-15 20:34:01 +08:00
sylor_huang@126.com 4f0b10a3da Merge branch 'dev_trustie' into dev_devops 2020-07-15 20:31:39 +08:00
sylor_huang@126.com 650029fed8 test quesitons 2020-07-15 20:30:57 +08:00
sylor_huang@126.com f2df2e84cc Merge branch 'dev_trustie' into dev_devops 2020-07-15 18:33:36 +08:00
sylor_huang@126.com 626e40cb24 change bugs 2020-07-15 18:33:10 +08:00
sylor_huang@126.com a7f80a5dde Merge branch 'dev_trustie' into dev_devops 2020-07-15 18:28:16 +08:00
sylor_huang@126.com 55287cfa71 change bugs 2020-07-15 18:27:53 +08:00
sylor_huang@126.com d8ace90037 Merge branch 'dev_trustie' into dev_devops 2020-07-15 18:17:45 +08:00
sylor_huang@126.com 9b1f99cd17 change bugs 2020-07-15 18:17:22 +08:00
sylor_huang@126.com 90d5fb7276 Merge branch 'dev_trustie' into dev_devops 2020-07-15 18:04:29 +08:00
sylor_huang@126.com a11adfc41b change bugs 2020-07-15 18:03:50 +08:00
sylor_huang@126.com bc82451fcc Change 2020-07-15 18:02:43 +08:00
Jasder 8f96341679 FIX merge dev_trustie conflict 2020-07-15 17:16:41 +08:00
Jasder 0a2423e912 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-15 17:13:49 +08:00
Jasder b9abd6a152 FIX 插销掉dev_chain分支的合并 2020-07-15 17:13:16 +08:00
sylor_huang@126.com 6c116042f2 change bugs 2020-07-15 17:08:02 +08:00
Jasder 43b413706c Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-15 17:03:03 +08:00
Jasder c181abce81 FIX 完善devops流程 2020-07-15 16:53:38 +08:00
sylor_huang@126.com 09835dda24 change bugs 2020-07-15 16:25:31 +08:00
sylor_huang@126.com e97d66bf30 add exists check 2020-07-15 15:43:02 +08:00
Jasder 123e8d7659 FIX ucloud account bug 2020-07-15 10:22:41 +08:00
Jasder f358361b89 FIX bug 2020-07-15 09:59:12 +08:00
Jasder e0ae7b2aec Merge branch 'dev_trustie' into dev_devops 2020-07-15 09:44:55 +08:00
Jasder 56bd4f6503 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-15 09:44:25 +08:00
Jasder da0e45a3c6 ADD devops 2020-07-15 09:43:30 +08:00
sylor_huang@126.com d83f3c6f13 change bugs 2020-07-15 01:40:09 +08:00
sylor_huang@126.com ae037203e8 change bugs 2020-07-14 22:44:58 +08:00
sylor_huang@126.com 2e7d0abcbf change 2020-07-14 22:05:43 +08:00
sylor_huang@126.com 43d79bd04f change bugs 2020-07-14 21:20:43 +08:00
sylor_huang@126.com b48812bc79 change bugs 2020-07-14 21:11:53 +08:00
sylor_huang@126.com f8b781531e change bugs 2020-07-14 21:07:35 +08:00
sylor_huang@126.com e803a5ef1d change bugs 2020-07-14 20:44:12 +08:00
sylor_huang@126.com 5037f731aa change bugs 2020-07-14 20:36:11 +08:00
sylor_huang@126.com afbf8f337e change 2020-07-14 20:32:08 +08:00
sylor_huang@126.com e47a8f34c9 change 2020-07-14 20:20:12 +08:00
sylor_huang@126.com 5c28ad9c0a change trustie-proejcts 2020-07-14 19:27:36 +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 fbb7fa34e3 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-14 15:11:40 +08:00
Jasder 6527603e24 FIX 完善devops流程 2020-07-14 15:06:09 +08:00
sylor_huang@126.com 944e5de8c6 Merge branch 'dev_trustie' into dev_chain 2020-07-14 14:25:26 +08:00
sylor_huang@126.com f820250ad0 change branches 2020-07-14 14:25:02 +08:00
sylor_huang@126.com afd49eabdc Merge branch 'dev_trustie' into dev_chain 2020-07-14 14:15:49 +08:00
sylor_huang@126.com 5f4dc22625 change branches 2020-07-14 14:15:16 +08:00
sylor_huang@126.com b0e6646c8e Merge branch 'dev_trustie' into dev_chain 2020-07-14 13:57:02 +08:00
sylor_huang@126.com 753cc44518 change bugs 2020-07-14 13:56:41 +08:00
sylor_huang@126.com dd2c70fcee Merge branch 'dev_trustie' into dev_chain 2020-07-14 13:46:28 +08:00
sylor_huang@126.com 6220a3c05a change branches 2020-07-14 13:45:52 +08:00
sylor_huang@126.com 0eb1abf850 Merge branch 'dev_trustie' into dev_chain 2020-07-14 11:27:59 +08:00
sylor_huang@126.com e97f2e6444 change sync 2020-07-14 11:27:37 +08:00
sylor_huang@126.com eb46496fb1 Merge branch 'dev_trustie' into dev_chain 2020-07-13 21:01:33 +08:00
sylor_huang@126.com ef439aca5f change 2020-07-13 21:01:13 +08:00
sylor_huang@126.com d12fc65da5 chang 2020-07-13 20:58:48 +08:00
sylor_huang@126.com 2e8095af58 change bugs 2020-07-13 20:20:30 +08:00
sylor_huang@126.com 4417f8c070 Merge branch 'dev_trustie' into dev_chain 2020-07-13 13:54:48 +08:00
sylor_huang@126.com 49be881914 change bugs 2020-07-13 13:54:27 +08:00
sylor_huang@126.com 224b7c7cd4 Merge branch 'dev_trustie' into dev_chain 2020-07-13 11:49:25 +08:00
sylor_huang@126.com 4dd8ac5cd0 change bugs 2020-07-13 11:49:02 +08:00
sylor_huang@126.com 86c63e39a0 Merge branch 'dev_trustie' into dev_chain 2020-07-13 11:08:37 +08:00
sylor_huang@126.com e6d5d518f7 change bugs 2020-07-13 11:08:13 +08:00
sylor_huang@126.com 27ee469d24 Merge branch 'dev_trustie' into dev_chain 2020-07-13 10:58:53 +08:00
sylor_huang@126.com 83da924565 add member roles 2020-07-13 10:58:30 +08:00
sylor_huang@126.com aac959fc64 change bugs 2020-07-13 10:08:46 +08:00
sylor_huang@126.com 2ccf667f20 change bugs 2020-07-13 10:08:20 +08:00
sylor_huang@126.com 2632cbb010 Merge branch 'dev_trustie' into dev_chain 2020-07-13 09:50:52 +08:00
sylor_huang@126.com 22e624abce change bugs 2020-07-13 09:49:54 +08:00
sylor_huang@126.com 71edf8366d change error 2020-07-13 09:48:05 +08:00
sylor_huang@126.com 2941652375 Merge branch 'dev_trustie' into dev_chain 2020-07-10 21:13:44 +08:00
sylor_huang@126.com 684b1a46cb change bugs 2020-07-10 21:13:18 +08:00
sylor_huang@126.com 94cd6202a9 Merge branch 'dev_trustie' into dev_chain 2020-07-10 21:09:25 +08:00
sylor_huang@126.com 6c5133ca0a change bugs 2020-07-10 21:09:02 +08:00
sylor_huang@126.com 3fe0c4752f Merge branch 'dev_trustie' into dev_chain 2020-07-10 20:43:12 +08:00
sylor_huang@126.com b8de6a9d10 change bugs 2020-07-10 20:42:51 +08:00
sylor_huang@126.com 7bd053a9b2 change bugs 2020-07-10 20:40:28 +08:00
sylor_huang@126.com 9a1db03dca Merge branch 'dev_trustie' into dev_chain 2020-07-10 20:20:43 +08:00
sylor_huang@126.com f6a9d1f54a change bugs 2020-07-10 20:20:20 +08:00
sylor_huang@126.com ab2fe592ec Merge branch 'dev_trustie' into dev_chain 2020-07-10 20:10:48 +08:00
sylor_huang@126.com 4aeb79de1a change bugs 2020-07-10 20:10:16 +08:00
sylor_huang@126.com bb97f33732 Merge branch 'dev_trustie' into dev_chain 2020-07-10 20:04:03 +08:00
sylor_huang@126.com edcc6e07ee change bugs 2020-07-10 20:03:30 +08:00
sylor_huang@126.com bfb437ae3e Merge branch 'dev_trustie' into dev_chain 2020-07-10 19:56:24 +08:00
sylor_huang@126.com a772d919ce change bugs 2020-07-10 19:55:59 +08:00
sylor_huang@126.com 3c66b92e90 Merge branch 'dev_trustie' into dev_chain 2020-07-10 19:50:20 +08:00
sylor_huang@126.com 9ece830b00 change bugs 2020-07-10 19:49:58 +08:00
sylor_huang@126.com 9e310f992e Merge branch 'dev_trustie' into dev_chain 2020-07-10 19:44:21 +08:00
sylor_huang@126.com 5dafeb8103 change bugs 2020-07-10 19:43:59 +08:00
sylor_huang@126.com ce11dbba2e Merge branch 'dev_trustie' into dev_chain 2020-07-10 19:37:54 +08:00
sylor_huang@126.com 1e9a3e3012 change bugs 2020-07-10 19:37:34 +08:00
sylor_huang@126.com 6db500c0a6 Merge branch 'dev_trustie' into dev_chain 2020-07-10 19:25:39 +08:00
sylor_huang@126.com a6f67edd26 change bugs 2020-07-10 19:25:18 +08:00
sylor_huang@126.com 569a68e199 Merge branch 'dev_trustie' into dev_chain 2020-07-10 19:20:57 +08:00
sylor_huang@126.com b71de602e0 change bugs 2020-07-10 19:20:39 +08:00
sylor_huang@126.com ed80de25f3 Merge branch 'dev_trustie' into dev_chain 2020-07-10 18:44:25 +08:00
sylor_huang@126.com 29fd6be9b0 change bugs 2020-07-10 18:44:01 +08:00
sylor_huang@126.com 2e2b4a9469 Merge branch 'dev_trustie' into dev_chain 2020-07-10 18:12:28 +08:00
sylor_huang@126.com deaaed0527 change bugs 2020-07-10 18:12:10 +08:00
sylor_huang@126.com 4b8563db5d Merge branch 'dev_trustie' into dev_chain 2020-07-10 18:03:29 +08:00
sylor_huang@126.com 581f5b777a change bugs 2020-07-10 18:03:09 +08:00
sylor_huang@126.com b936e0a3e8 Merge branch 'dev_trustie' into dev_chain 2020-07-10 17:47:30 +08:00
sylor_huang@126.com bf61c0e5b3 change bugs 2020-07-10 17:46:56 +08:00
sylor_huang@126.com ee95464033 Merge branch 'dev_trustie' into dev_chain 2020-07-10 17:36:36 +08:00
sylor_huang@126.com f4be93c340 change bugs 2020-07-10 17:36:15 +08:00
sylor_huang@126.com 7415fa2b3c Merge branch 'dev_trustie' into dev_chain 2020-07-10 17:20:44 +08:00
sylor_huang@126.com e0d9bfab6d change bugs 2020-07-10 17:20:13 +08:00
sylor_huang@126.com f4e1414f2a Merge branch 'dev_trustie' into dev_chain 2020-07-10 17:05:16 +08:00
sylor_huang@126.com 65b03f7c71 change main 2020-07-10 17:04:53 +08:00
sylor_huang@126.com 3746db7fde Merge branch 'dev_trustie' into dev_chain 2020-07-10 17:00:17 +08:00
sylor_huang@126.com 147fdb0d05 change main 2020-07-10 16:59:54 +08:00
sylor_huang@126.com 06e914f398 Merge branch 'dev_trustie' into dev_chain 2020-07-10 16:51:51 +08:00
sylor_huang@126.com 7a0106578b change jobs 2020-07-10 16:51:29 +08:00
sylor_huang@126.com 7d76c6c85f Merge branch 'dev_trustie' into dev_chain 2020-07-10 16:32:33 +08:00
sylor_huang@126.com 661a7d5105 change sync 2020-07-10 16:32:08 +08:00
sylor_huang@126.com 1c482761cf Merge branch 'dev_trustie' into dev_chain 2020-07-10 16:25:27 +08:00
sylor_huang@126.com 6e31352f8d change sync 2020-07-10 16:25:03 +08:00
sylor_huang@126.com 4893edd6c1 Merge branch 'dev_trustie' into dev_chain 2020-07-10 15:56:16 +08:00
sylor_huang@126.com 8c1aedc6bd change sync 2020-07-10 15:54:04 +08:00
sylor_huang@126.com 61d8753b89 Merge branch 'dev_trustie' into dev_chain 2020-07-10 15:45:12 +08:00
sylor_huang@126.com 4e32d7b0a6 change project_score 2020-07-10 15:44:52 +08:00
sylor_huang@126.com 47c18cb218 Merge branch 'dev_trustie' into dev_chain 2020-07-10 15:36:13 +08:00
sylor_huang@126.com e9f93ddc20 change project_score 2020-07-10 15:35:51 +08:00
sylor_huang@126.com ad14aa758e Merge branch 'dev_trustie' into dev_chain 2020-07-10 15:24:40 +08:00
sylor_huang@126.com be1a80c163 change project_score 2020-07-10 15:24:19 +08:00
sylor_huang@126.com 90aa97c444 Merge branch 'dev_trustie' into dev_chain 2020-07-10 15:12:19 +08:00
sylor_huang@126.com e13e9f049d change project_score 2020-07-10 15:11:58 +08:00
sylor_huang@126.com 4fdb2c2221 Merge branch 'dev_trustie' into dev_chain 2020-07-10 15:11:00 +08:00
sylor_huang@126.com 84ba2c560d change project_score 2020-07-10 15:10:41 +08:00
sylor_huang@126.com 93b2872ad9 Merge branch 'dev_trustie' into dev_chain 2020-07-10 14:53:46 +08:00
sylor_huang@126.com abae5618f4 change project_score 2020-07-10 14:53:23 +08:00
sylor_huang@126.com 0323166499 Merge branch 'dev_trustie' into dev_chain 2020-07-10 14:45:10 +08:00
sylor_huang@126.com 30daf15862 change logs 2020-07-10 14:44:27 +08:00
sylor_huang@126.com 962a92eeca Merge branch 'dev_trustie' into dev_chain 2020-07-10 14:24:43 +08:00
sylor_huang@126.com 15f7383177 change bugs 2020-07-10 14:24:20 +08:00
sylor_huang@126.com 50b79ee3cf Merge branch 'dev_trustie' into dev_chain 2020-07-10 14:10:06 +08:00
sylor_huang@126.com 553f8fb23a change bugs 2020-07-10 14:09:31 +08:00
Jasder e74bba9092 ADD test devops 2020-07-10 14:08:16 +08:00
sylor_huang@126.com 05615500e6 change bugs 2020-07-10 14:06:26 +08:00
sylor_huang@126.com 6d6294419d chang bugs 2020-07-10 14:05:37 +08:00
sylor_huang@126.com 66beab3457 s 2020-07-10 11:54:30 +08:00
sylor_huang@126.com a20cb9eb5b Merge branch 'dev_trustie' into dev_chain 2020-07-10 11:53:49 +08:00
sylor_huang@126.com c2e1fa27df change bugs 2020-07-10 11:53:30 +08:00
sylor_huang@126.com aebaa7deda change bugs 2020-07-10 11:42:38 +08:00
sylor_huang@126.com 0db202585b change bugs 2020-07-10 11:15:04 +08:00
sylor_huang@126.com 2b7dec7f56 change bugs 2020-07-10 11:14:08 +08:00
sylor_huang@126.com 8860a584ca change bugs 2020-07-10 11:13:27 +08:00
sylor_huang@126.com 6395dad2f1 change bugs 2020-07-10 11:11:54 +08:00
sylor_huang@126.com 28f777f5eb Merge branch 'dev_trustie' into dev_chain 2020-07-10 10:58:58 +08:00
sylor_huang@126.com 77d0b89215 change bugs 2020-07-10 10:58:39 +08:00
sylor_huang@126.com 066a720525 Merge branch 'dev_trustie' into dev_chain 2020-07-10 10:53:15 +08:00
sylor_huang@126.com 087550797b change bugs 2020-07-10 10:52:44 +08:00
sylor_huang@126.com a6a65eb4c8 Merge branch 'dev_trustie' into dev_chain 2020-07-10 10:21:02 +08:00
sylor_huang@126.com 5aef64a928 change bugs 2020-07-10 10:20:37 +08:00
sylor_huang@126.com 2664be17f9 Merge branch 'dev_trustie' into dev_chain 2020-07-10 10:10:36 +08:00
sylor_huang@126.com 99947f17d1 change bugs 2020-07-10 10:09:59 +08:00
sylor_huang@126.com cd32b7e300 Merge branch 'dev_trustie' into dev_chain 2020-07-10 09:53:33 +08:00
sylor_huang@126.com 4aec62fc33 change bugs 2020-07-10 09:53:13 +08:00
sylor_huang@126.com ac2b8c9f65 Merge branch 'dev_trustie' into dev_chain 2020-07-09 20:58:11 +08:00
sylor_huang@126.com 804e971314 change bugs 2020-07-09 20:57:49 +08:00
sylor_huang@126.com dcbbf66e61 Merge branch 'dev_trustie' into dev_chain 2020-07-09 20:40:59 +08:00
sylor_huang@126.com 2916b1098e change bugs 2020-07-09 20:40:35 +08:00
sylor_huang@126.com c6c7f0968b change bugs 2020-07-09 20:37:43 +08:00