Commit Graph

674 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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
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
Jasder 082c3b05b3 FIX repositories controller bug 2020-08-12 14:51:12 +08:00
Jasder 066dede6e3 FIX bug 2020-08-12 11:18:14 +08:00
Jasder e2926acd2f FIX some routes bug 2020-08-12 11:14:57 +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 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 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 cf244390ef FIX git drone logs api params's bug 2020-07-21 17:13:15 +08:00
Jasder 0f92aa7981 FIX test devops 2020-07-21 17:08:07 +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
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 884a0a3823 FIX 解决点赞、关注、fork用户访问列表的权限问题 2020-07-17 18:17:51 +08:00
Jasder 69425d6d0a FIX . 2020-07-17 16:02:54 +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 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 e707eb5e2b FIX 去掉超级管理员不能访问别人私有项目的权限控制 2020-07-16 12:11:16 +08:00
Jasder cdbca5c845 FIX merge 2020-07-15 23:31:48 +08:00
sylor_huang@126.com de5beb3e12 chagne 2020-07-15 23:27:20 +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 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 e478af2548 Change bugs 2020-07-15 22:02:26 +08:00
sylor_huang@126.com b26059bf48 change bugs 2020-07-15 21:15:40 +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 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 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 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 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 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 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 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 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 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 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 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
Jasder e74bba9092 ADD test devops 2020-07-10 14:08:16 +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 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
sylor_huang@126.com 97844c47d7 Merge branch 'dev_trustie' into dev_chain 2020-07-09 20:36:49 +08:00
sylor_huang@126.com 9e15f2c733 Change bugs 2020-07-09 20:36:27 +08:00
sylor_huang@126.com 265562a260 change bugs 2020-07-09 20:33:18 +08:00
sylor_huang@126.com 7724c1bcce Merge branch 'dev_trustie' into dev_chain 2020-07-09 20:24:53 +08:00
sylor_huang@126.com e06a2ec0f0 change bugs 2020-07-09 20:24:02 +08:00
sylor_huang@126.com 946a5cc44a Merge branch 'dev_trustie' into dev_chain 2020-07-09 20:18:44 +08:00
sylor_huang@126.com f3392e0aeb change bugs 2020-07-09 20:17:49 +08:00
sylor_huang@126.com a78ba32923 Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:57:50 +08:00
sylor_huang@126.com 43f39b6a01 change bugs 2020-07-09 19:57:24 +08:00
sylor_huang@126.com 704dda3a1c Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:47:03 +08:00
sylor_huang@126.com 55b4ec2aa7 change bugs 2020-07-09 19:46:42 +08:00
sylor_huang@126.com 7fdc61040c Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:43:39 +08:00
sylor_huang@126.com dbfef20434 change bugs 2020-07-09 19:43:17 +08:00
sylor_huang@126.com 7df67ebca6 Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:33:27 +08:00
sylor_huang@126.com 20ac55a323 change bugs 2020-07-09 19:33:02 +08:00
sylor_huang@126.com bf85203a25 Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:30:43 +08:00
sylor_huang@126.com 98ec2d0b3c change bugs 2020-07-09 19:30:15 +08:00
sylor_huang@126.com 62ab4805a2 Merge branch 'dev_trustie' into dev_chain 2020-07-09 19:27:55 +08:00
sylor_huang@126.com 7ee556cd6c change bugs 2020-07-09 19:27:36 +08:00
sylor_huang@126.com 9e2181392b Merge branch 'dev_trustie' into dev_chain 2020-07-09 17:52:09 +08:00
sylor_huang@126.com 4fa545c681 add sync logs 2020-07-09 17:51:38 +08:00
sylor_huang@126.com bcd6ffdfda Merge branch 'dev_trustie' into dev_chain 2020-07-09 16:47:55 +08:00
sylor_huang@126.com b340de89c7 qianyi datas 2020-07-09 16:46:57 +08:00
sylor_huang@126.com 8a1abaed8a change 2020-07-06 16:35:03 +08:00
sylor_huang@126.com 153496c089 Merge branch 'dev_trustie' into dev_chain 2020-07-03 17:37:33 +08:00
sylor_huang@126.com d92c57c1b9 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-03 17:36:38 +08:00
sylor_huang@126.com 3594ea01d2 show commmits 2020-07-03 17:35:35 +08:00
Jasder 3cae1d4eb7 FIX merge pr bug for gitea platform 2020-07-03 17:35:34 +08:00
sylor_huang@126.com c96dcb14e7 Merge branch 'dev_trustie' into dev_chain 2020-07-03 17:15:15 +08:00
sylor_huang@126.com 2ecb227c30 change error 2020-07-03 17:14:20 +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
Jasder 385abd53b7 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-07-03 16:23:21 +08:00
Jasder 795e06f6c5 FIX merge pr's bug 2020-07-03 16:23:06 +08:00