Commit Graph

4811 Commits

Author SHA1 Message Date
jasder c1ef39b262 Merge branch 'develop' into dev_trustie_server 2021-04-29 18:37:35 +08:00
jasder 03e54f9b3d Merge branch 'sync_develop' into develop 2021-04-29 18:37:09 +08:00
jasder 1277e717ff ADD github gitlab镜像加速器 2021-04-29 18:35:57 +08:00
vilet.yy 1a7b323120 fix: user info projects count 2021-04-29 18:09:39 +08:00
vilet.yy fffe57a211 fix: mirror project permission error 2021-04-29 18:09:39 +08:00
vilet.yy b673747475 fix: personal projects 2021-04-29 18:09:38 +08:00
jasder 51643dc02c Merge branch 'dev_trustie_server' into trustie_server 2021-04-29 10:42:12 +08:00
jasder a078c07b59 Merge branch 'develop' into dev_trustie_server 2021-04-29 10:41:59 +08:00
jasder a4555e2d10 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-04-29 10:41:40 +08:00
jasder c920994274 FIX bug
* 解决合并请求允许指派给开发者
* 开发者可以合并请求
* 更新仓库信息自动删除代码库模块
2021-04-29 10:41:30 +08:00
vilet.yy c14c92ac11 fix: pull_request permit develop create pr 2021-04-29 10:32:49 +08:00
jasder b984790d5c Merge branch 'develop' into trustie_server 2021-04-28 21:17:43 +08:00
jasder 876591100e Merge branch 'develop' into dev_trustie_server 2021-04-28 21:17:36 +08:00
jasder 8bf02b1ee5 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-04-28 21:16:52 +08:00
jasder 9876e84c17 FIX bug 2021-04-28 21:15:58 +08:00
vilet.yy ea42b0d6ed fix: pull_request can not select reporter and compare userinfo lose 2021-04-28 20:10:21 +08:00
jasder 660a48b257 FIX 易修、合并请求选择成员增加组织成员 2021-04-28 16:57:12 +08:00
vilet.yy 65d51e8578 add: project operate add organization team users 2021-04-28 15:15:45 +08:00
jasder ba9848ebe7 Merge branch 'develop' into dev_trustie_server 2021-04-27 18:24:41 +08:00
jasder c3d9e38e05 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-04-27 18:24:25 +08:00
jasder 7d612ea6b3 ADD 转移仓库功能以及待办事项 2021-04-27 18:24:10 +08:00
vilet.yy 120a33bc8a add: undo count 2021-04-27 15:43:37 +08:00
vilet.yy b68c9945e5 add: project edit transfer 2021-04-27 14:40:18 +08:00
vilet.yy 01360de423 fix: acceptor must exist 2021-04-27 13:56:12 +08:00
jasder 41c621cf55 Merge branch 'develop' into dev_trustie_server 2021-04-26 16:53:05 +08:00
jasder 5bd33c033c FIX bug 2021-04-26 16:52:48 +08:00
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
jasder 95a355b87c FIX admin projects api bug 2021-04-26 16:45:26 +08:00
vilet.yy 13768f9778 add: same repo condition 2021-04-26 15:28:49 +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 1d81548eb6 fix 2021-04-26 11:32:59 +08:00
vilet.yy 96238c2e13 fix 2021-04-26 11:04:10 +08:00
vilet.yy d532dc7cf5 fix: some bug and users api doc 2021-04-26 10:57:57 +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 b161b66d79 Merge branch 'develop' into standalone 2021-04-23 17:55:42 +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 2282c52efb FIX update README.md 2021-04-23 17:33:19 +08:00
jasder ee7acaaa82 FIX update README.md 2021-04-23 17:32:45 +08:00
jasder 34edd78ae7 Merge branch 'develop' into dev_trustie_server 2021-04-23 17:21:34 +08:00
jasder c1d4df6e06 FIX release show time bug 2021-04-23 17:21:17 +08:00
jasder 55f7beb22d FIX update CHANGELOG.md 2021-04-23 17:19:28 +08:00
jasder 8a536e83af FIX update CHANGELOG.md 2021-04-23 17:08:04 +08:00
jasder 016cf648da FIX merge develop 2021-04-23 17:07:46 +08:00
jasder 713e0bba18 Merge branch 'develop' into standalone 2021-04-23 16:18:31 +08:00
jasder 36fb5a118c Merge branch 'develop' into dev_trustie_server 2021-04-23 14:40:41 +08:00