Commit Graph

604 Commits

Author SHA1 Message Date
sylor_huang@126.com 8c466aeb21 change numerical_for_project_type 2020-06-05 11:03:13 +08:00
sylor_huang@126.com bfdba8ee64 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-05 11:01:14 +08:00
sylor_huang@126.com b26f54b33d 修改numerical_for_project_type for nil 2020-06-05 11:00:55 +08:00
Jasder f683f10e51 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-05 10:58:01 +08:00
Jasder 56c8b1ae68 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-05 10:57:52 +08:00
sylor_huang@126.com c5c3294bda 上传文件返回pull_request_id 2020-06-05 10:57:46 +08:00
Jasder d66a5e5b42 FIX type column 2020-06-05 10:57:41 +08:00
sylor_huang@126.com ba93347df8 修改bug 2020-06-05 10:07:50 +08:00
sylor_huang@126.com d17d3dd84c 修改branch 2020-06-05 10:01:04 +08:00
sylor_huang@126.com 6b44b28c60 修改数量 2020-06-03 18:31:26 +08:00
sylor_huang@126.com fe8ad87c51 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-03 18:24:08 +08:00
sylor_huang@126.com c977b9350c 修改个人主页 2020-06-03 18:23:53 +08:00
Jasder cec2995438 ADD mirror_status column for repository's show view 2020-06-03 17:26:49 +08:00
Jasder 783f872a86 FIX update_column bug 2020-06-03 15:59:53 +08:00
Jasder 731ddd6fce ADD zip、tar url with entries api 2020-06-03 14:20:59 +08:00
Jasder acc0bfb7aa Update reposotiry's sub entries api 2020-06-03 11:41:14 +08:00
Jasder 96ed75f6b0 Update get repo entries dir api 2020-06-03 11:21:43 +08:00
Jasder 9f9cec34b6 FIX coder review forr branches view 2020-06-03 11:20:11 +08:00
Jasder 34984d12cb Update get branches api 2020-06-03 11:18:46 +08:00
Jasder f1cb2acc3b FIX sync repo job 2020-06-02 19:06:28 +08:00
Jasder 38dd7b87d8 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-02 17:30:06 +08:00
Jasder 5c7c235ed9 FIX jobs 2020-06-02 17:29:49 +08:00
sylor_huang@126.com e8e3a45227 change is_watch 2020-06-02 17:28:21 +08:00
sylor_huang@126.com 7506cb2c3f get_user_info add is_watch 2020-06-02 17:24:37 +08:00
sylor_huang@126.com 03e549e1e4 还原测试的任务job 2020-06-02 17:20:15 +08:00
sylor_huang@126.com ad700a7faa change4 2020-06-02 17:11:19 +08:00
sylor_huang@126.com 7b45859fa5 change 2020-06-02 17:09:37 +08:00
sylor_huang@126.com 0c09000582 test job 2020-06-02 17:05:57 +08:00
sylor_huang@126.com fa17a2eb7f change commits committer 2020-06-02 16:06:51 +08:00
sylor_huang@126.com 858ead3464 change2 2020-06-02 16:02:18 +08:00
sylor_huang@126.com 0098ddcbd8 change 2020-06-02 16:00:37 +08:00
sylor_huang@126.com 226f611bc8 修改commit 2020-06-02 15:58:30 +08:00
sylor_huang@126.com f54c374c78 修改commit返回的用户 2020-06-02 15:57:06 +08:00
sylor_huang@126.com d1089a4a4b 修改commits报错 2020-06-02 15:48:31 +08:00
sylor_huang@126.com 9784564c01 修改commits报错 2020-06-02 15:45:56 +08:00
Jasder cfc83e3152 FIX job bug 2020-06-02 15:28:43 +08:00
Jasder f7978b9b32 FIX sync repo operate 2020-06-02 15:13:52 +08:00
Jasder 2d9b2cd942 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-02 15:00:16 +08:00
Jasder 15e90e95cc FIX sync mirror api bug 2020-06-02 15:00:05 +08:00
sylor_huang@126.com 8b21ed18b8 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-02 14:13:53 +08:00
sylor_huang@126.com 569c5309ce 修改is_mirror 2020-06-02 14:13:40 +08:00
sylor_huang@126.com 3212908859 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-06-01 18:27:31 +08:00
sylor_huang@126.com 5c4daaeed2 工单的一些参数修改 2020-06-01 18:27:17 +08:00
Jasder ffa4a948ee FIX get repository api bug 2020-06-01 15:33:40 +08:00
Jasder 03448c76f3 FIX code review 2020-06-01 15:29:00 +08:00
Jasder f64243d188 FIX commits api bug 2020-06-01 15:28:46 +08:00
Jasder 37fa25d57d FIX git single commit api bug 2020-06-01 14:40:51 +08:00
Jasder 5a887fdd66 ADD repo_id column for projects api 2020-06-01 10:12:10 +08:00
Jasder c018e79b88 FIX update git commit api for gitea platform 2020-05-29 19:24:55 +08:00
Jasder e7c4668f63 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-29 19:07:41 +08:00
Jasder 391b77b23c FIX bug 2020-05-29 19:07:33 +08:00
sylor_huang@126.com b4615c645e Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-29 19:07:05 +08:00
sylor_huang@126.com 3a9f0509fb 修改项目创建的问题 2020-05-29 19:06:50 +08:00
Jasder 172c6da443 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-29 19:04:25 +08:00
Jasder f47456f540 FIX bug 2020-05-29 19:04:14 +08:00
sylor_huang@126.com 3616e84548 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-29 18:13:45 +08:00
sylor_huang@126.com f4a31cc84a 删除父评论,也删除子评论 2020-05-29 18:13:32 +08:00
Jasder d391972b8b FIX image download with in reposotiroy entries 2020-05-29 17:56:52 +08:00
Jasder a239025a94 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-29 17:35:13 +08:00
Jasder f609b711c2 FIX get user info with branches api 2020-05-29 17:35:02 +08:00
sylor_huang@126.com b34be88d62 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-29 15:37:38 +08:00
sylor_huang@126.com 09f10ff653 修改创建评论返回的id 2020-05-29 15:37:18 +08:00
Jasder 507f276596 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-29 15:33:46 +08:00
Jasder 79a97b4a02 ADD get commit diff api 2020-05-29 15:33:17 +08:00
sylor_huang@126.com da1b56d858 add total_journals 2020-05-29 12:36:19 +08:00
sylor_huang@126.com b9c12d8f5d 修改issues返回count 2020-05-29 12:32:01 +08:00
sylor_huang@126.com 1e9716b84a 修改问题 2020-05-28 18:32:36 +08:00
sylor_huang@126.com bed4d93493 修改 子评论 2020-05-28 18:30:22 +08:00
sylor_huang@126.com c141e510b8 添加children_journals 2020-05-28 18:11:38 +08:00
sylor_huang@126.com dd871ba481 修改负责人 2020-05-28 11:28:42 +08:00
sylor_huang@126.com 7ca4433a91 chang params 2020-05-28 11:18:04 +08:00
sylor_huang@126.com 19404c217b change update_hash 2020-05-28 11:09:10 +08:00
sylor_huang@126.com a02ae6d06a change bug5 2020-05-28 11:06:41 +08:00
sylor_huang@126.com 3445722093 change bug4 2020-05-28 11:05:29 +08:00
sylor_huang@126.com 78ff06a41e change 2020-05-28 10:59:42 +08:00
sylor_huang@126.com ea2074386b change bug4 2020-05-28 10:50:14 +08:00
sylor_huang@126.com 444c2706f9 change bug3 2020-05-28 10:45:49 +08:00
sylor_huang@126.com ddf3c4f75e change bug2 2020-05-28 10:44:13 +08:00
sylor_huang@126.com 6f9975de04 change bug 2020-05-28 10:42:05 +08:00
sylor_huang@126.com 22e26a96bd change bug 2020-05-28 10:37:49 +08:00
sylor_huang@126.com 145c028df0 change bug 2020-05-28 10:31:20 +08:00
sylor_huang@126.com a4d8ef79b5 修改update_params 2020-05-28 10:23:00 +08:00
sylor_huang@126.com 97dc523052 change update bug 2020-05-28 10:07:31 +08:00
sylor_huang@126.com e42e9f262a 修改批量操作错误 2020-05-28 10:05:07 +08:00
sylor_huang@126.com d87f44e939 工单的批量修改/删除的接口 2020-05-27 18:25:32 +08:00
sylor_huang@126.com b266085e56 修改编辑和新建的问题 2020-05-26 18:55:41 +08:00
sylor_huang@126.com 634408363e 修改字节数 2020-05-26 15:35:21 +08:00
sylor_huang@126.com 81191b59c2 修改仓库大小的显示 2020-05-26 14:17:50 +08:00
sylor_huang@126.com 9c8f5f0073 修改issues的所有的条件过滤 2020-05-26 14:11:03 +08:00
sylor_huang@126.com 259142c59b 修改issues的问题 2020-05-25 16:20:34 +08:00
sylor_huang@126.com 0a5752b5ed 修改bug 2020-05-25 14:41:16 +08:00
sylor_huang@126.com 569c33b254 修改bug 2020-05-25 14:25:46 +08:00
sylor_huang@126.com 0b3683b99e 修改部分bug 2020-05-25 14:22:57 +08:00
sylor_huang@126.com efad719de0 change bug 2020-05-25 13:46:08 +08:00
sylor_huang@126.com a50470b14b 修改bug 2020-05-25 12:01:21 +08:00
sylor_huang@126.com bc5f695094 修改后端bug 2020-05-25 11:19:59 +08:00
Jasder cc9e86f010 FIX coder review 2020-05-22 17:34:39 +08:00
Jasder c0a4a4855b FIX bug 2020-05-22 16:54:18 +08:00
Jasder 18b7320582 FIX merge 2020-05-22 16:51:52 +08:00
Jasder 5d3505ec7c FIX commit time format 2020-05-22 16:50:33 +08:00
sylor_huang@126.com 7ca8dcbebd 修改协作者筛选方式 2020-05-22 16:25:59 +08:00
sylor_huang@126.com 9b302875ed 修改project 的managers 2020-05-22 15:41:30 +08:00
sylor_huang@126.com 6dcd325031 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-22 14:51:39 +08:00
sylor_huang@126.com 6f062f1c4e 修改member返回的值 2020-05-22 14:51:08 +08:00
Jasder 212d8f8f60 FIX bug 2020-05-22 12:32:45 +08:00
Jasder 19bb95b1a4 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-22 12:10:37 +08:00
Jasder bad1985b3d ADD last message with entries api 2020-05-22 12:10:26 +08:00
Jasder e14e6230c7 FIX sync update closed issues count 2020-05-21 18:37:32 +08:00
sylor_huang@126.com 11535bc459 修改repositories的show页面 2020-05-21 18:02:53 +08:00
sylor_huang@126.com cdc913328a 修改repositories的tags_count数量 2020-05-21 18:01:39 +08:00
sylor_huang@126.com 0c01e114bf 修改issues_count 2020-05-21 17:53:09 +08:00
sylor_huang@126.com dbe9cfc879 修改项目show页面的数量 2020-05-21 17:46:17 +08:00
sylor_huang@126.com d167c5c736 修改任务的默认排序为更新时间 2020-05-21 17:18:13 +08:00
sylor_huang@126.com 73bbec7c9d 修改tags和version_release的报错 2020-05-21 17:01:30 +08:00
sylor_huang@126.com 465594eaaf 修改version_releases中version_id为空的时候出现的错误 2020-05-20 15:22:23 +08:00
sylor_huang@126.com f197f41839 add version_releases attachments 2020-05-20 14:43:14 +08:00
sylor_huang@126.com ef1023d0f5 修改hooks_controller 2020-05-20 10:01:03 +08:00
sylor_huang@126.com 1171afee50 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-20 09:57:25 +08:00
sylor_huang@126.com 2151c764c7 add hooks user_permission 2020-05-20 09:57:01 +08:00
Jasder d5c41d69bf FIX bug 2020-05-20 09:41:47 +08:00
Jasder 339f0b5517 ADD repo_id with get repository api 2020-05-20 09:30:56 +08:00
Jasder 6d39adfa08 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-19 18:34:53 +08:00
Jasder 5a0b3c8f80 FIX 完善 项目标签api 2020-05-19 18:34:25 +08:00
Jasder b02efc3609 FIX bug 2020-05-19 14:41:45 +08:00
sylor_huang@126.com 7033bccca9 change hook create and update params 2020-05-19 13:56:17 +08:00
sylor_huang@126.com 0b89372eef add hooks controler and related services 2020-05-19 11:57:55 +08:00
sylor_huang@126.com 63cf2f0dc8 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-18 18:37:36 +08:00
sylor_huang@126.com f3de6e5fa0 添加协作者的筛选和中文名称 2020-05-18 18:37:21 +08:00
Jasder f309ec997d Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-05-18 18:28:39 +08:00
Jasder 0e390ca912 ADD sync mirror repo api 2020-05-18 18:25:50 +08:00
Jasder d464ab3891 FIX 根据gitea接口更新创建镜像项目api 2020-05-18 18:25:01 +08:00
Jasder e8ac921aa9 FIX 重新定义项目权限控制的相关方法 2020-05-18 18:22:50 +08:00
Jasder 3158a879a4 ADD [gitea] sync mirrored repo service 2020-05-18 18:20:06 +08:00
Jasder 02b384fa2f ADD [gitea] get repository by id 2020-05-18 18:19:23 +08:00
Jasder 4ff7009645 FIX 处理gitea client 返回信息 2020-05-18 18:18:53 +08:00
sylor_huang@126.com 6256bc68b9 change watch_users/praise_users/fork_users return params 2020-05-18 15:18:00 +08:00
sylor_huang@126.com b48fea51ca add watchers_count to user 2020-05-18 14:58:23 +08:00
sylor_huang@126.com 8bc503e9e6 change follow watched 2020-05-18 14:50:18 +08:00
sylor_huang@126.com 6c113d43f9 change follow and unfollow render json 2020-05-18 14:49:21 +08:00
sylor_huang@126.com a8aae3618b change watchers controller and related routes 2020-05-18 14:28:45 +08:00
sylor_huang@126.com 3a14106cfd change watch_users params count 2020-05-18 13:46:47 +08:00
sylor_huang@126.com d75b9dd04c 修改用户关注列表的总数问题 2020-05-18 12:06:00 +08:00
sylor_huang@126.com 4b3f45bcce 添加排序及部分修改 2020-05-15 18:00:34 +08:00
sylor_huang@126.com dbc0d3eabb 修改bug 2020-05-15 17:47:48 +08:00
sylor_huang@126.com 84ed5bb06c 修改fork_user.json.jbuilder 2020-05-15 17:45:44 +08:00
sylor_huang@126.com e67831df77 修改路由 2020-05-15 17:31:53 +08:00
sylor_huang@126.com 46c929a394 关注列表/点赞列表/fork列表的后端 2020-05-15 17:05:53 +08:00
sylor_huang@126.com cf20cc3a0b 修改admins页面的sidekiq 2020-05-14 18:25:11 +08:00
sylor_huang@126.com 5d770c14a7 修改sidekiq为admins才能看 2020-05-14 18:13:07 +08:00
sylor_huang@126.com ac2e3ae730 admins 页面的修改 2020-05-14 18:08:27 +08:00
sylor_huang@126.com 96e03ac249 修改已发行版本的数量问题 2020-05-13 17:15:22 +08:00
sylor_huang@126.com 3e6ee91f9a 部分修改 2020-05-13 17:10:29 +08:00
sylor_huang@126.com 8aed492dae 项目的列表页修改数量参数 2020-05-13 17:07:41 +08:00
sylor_huang@126.com e3d0904e2c 修改chain命令及返回内容 2020-05-13 15:44:55 +08:00
sylor_huang@126.com d6d333d3e2 添加测试上链的log 2020-05-13 14:27:24 +08:00
sylor_huang@126.com eec28fa054 创建项目上链后的操作已完成 2020-05-13 14:19:14 +08:00
sylor_huang@126.com 1c73e982ba 添加chain_params的log日志 2020-05-13 11:27:17 +08:00
sylor_huang@126.com 0ac94f0532 创建sl操作时添加log 2020-05-13 11:15:52 +08:00
sylor_huang@126.com 66b6942ba9 修改问题 2020-05-13 11:06:50 +08:00
sylor_huang@126.com 82114942ab 修改上链操作的reponame为id 2020-05-13 10:55:55 +08:00
sylor_huang@126.com 6436dcff9c 修改create_service的错误 2020-05-13 10:01:15 +08:00
sylor_huang@126.com a6e499c892 修改repositories_controller中的错误 2020-05-13 09:58:17 +08:00
sylor_huang@126.com fd7cea4f91 修改issues_controller中的错误 2020-05-13 09:55:46 +08:00
sylor_huang@126.com b1553b13b0 暂时隐藏gitea创建hook的功能 2020-05-13 09:20:57 +08:00
sylor_huang@126.com 30a8367d09 增加chain的积分操作和上链操作 2020-05-12 18:15:55 +08:00
sylor_huang@126.com 27cc8ab96d 增加上链操作及修改webhook 2020-05-11 18:33:15 +08:00
sylor_huang@126.com 4595cac2d9 修改ignore/category/license/language的index筛选问题 2020-05-09 17:14:23 +08:00
Jasder d97dd700a0 FIX merge 2020-05-09 15:53:35 +08:00
Jasder 1e0811006b FIX query projects list 2020-05-09 15:51:40 +08:00
sylor_huang@126.com f0da03ef94 修改参数名称错误 2020-05-09 15:46:52 +08:00
sylor_huang@126.com 2f98684324 测试projects_index的search问题 2020-05-09 15:44:51 +08:00
sylor_huang@126.com da3a89c20c 测试projects列表页的筛选 2020-05-09 15:38:14 +08:00
sylor_huang@126.com 8faaf7ac3a 项目列表页的搜索修改 2020-05-09 15:29:47 +08:00
sylor_huang@126.com e0423b9cc8 测试项目列表页的搜索 2020-05-08 18:33:37 +08:00
sylor_huang@126.com a14b0b2eb1 修改issues的列表错误 2020-05-08 15:29:01 +08:00
sylor_huang@126.com a5be19f3a3 修改issues的列表页的错误 2020-05-08 15:05:53 +08:00
sylor_huang@126.com ce0e3754eb 修改issues order 2020-05-08 14:54:32 +08:00
sylor_huang@126.com fe32adee16 issues添加includes 2020-05-08 14:48:53 +08:00
sylor_huang@126.com 700537f4e2 分页的部分修改 2020-05-08 14:45:25 +08:00
sylor_huang@126.com 9073165cf3 简化issue的代码 2020-05-08 14:33:19 +08:00
sylor_huang@126.com 594da4dc8a 修改判断用户是否登录 2020-05-07 18:29:29 +08:00
sylor_huang@126.com ad9874dff0 修改projects的错误 2020-05-07 18:27:19 +08:00
sylor_huang@126.com 83eb672cc7 settings增加old_projects_url 2020-05-07 18:25:58 +08:00
sylor_huang@126.com 3f7ef8cc0a 修改上传md上传附件的attachments_controller 2020-04-29 14:03:35 +08:00
sylor_huang@126.com 33c3ecb562 修改md编辑器上传图片的问题 2020-04-29 11:49:39 +08:00
Jasder a3bb343690 Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie 2020-04-28 16:01:29 +08:00
Jasder 0d2eeea62f ADD profiler Middleware quality analysis 2020-04-28 15:43:09 +08:00
sylor_huang@126.com 7466ceb7dd 修改添加协作者非项目创建者报错的问题 2020-04-28 15:24:31 +08:00
sylor_huang@126.com c35156e487 工单修改后,创建的为工单用户的bug 2020-04-28 10:41:20 +08:00
sylor_huang@126.com 5eb2942c9d 修改projects的n+1问题 2020-04-27 11:15:00 +08:00
sylor_huang@126.com 616448d8c3 修改issue的排序 2020-04-24 16:22:18 +08:00
sylor_huang@126.com 21b279d551 删除attachment关联的attachment_histories 2020-04-24 15:52:32 +08:00
Jasder a510fb94d4 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus into develop 2020-04-24 10:15:08 +08:00
Jasder 260e6f8932 FIX 更改云上实验室主站配置 2020-04-24 10:15:02 +08:00
sylor_huang@126.com 98a055db69 修改附件及搜索协作者的bug 2020-04-24 09:45:42 +08:00
Jasder 9a39f2ad7a FIX gitea create file bug 2020-04-23 23:02:57 +08:00
Jasder 495a8dd48e FIX coder review 2020-04-23 23:02:37 +08:00
sylor_huang@126.com 1e1e13898b 修改项目列表的筛选 2020-04-23 14:32:56 +08:00
sylor_huang@126.com 02df9fbe0f 项目首页的排序修改 2020-04-23 14:28:04 +08:00
sylor_huang@126.com 77c9b8805f 修改项目首页的筛选 2020-04-23 14:16:00 +08:00