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

1709 Commits

Author SHA1 Message Date
jasder b22330d146 Merge branch 'sync_develop' into develop 2021-04-29 23:23:25 +08:00
jasder b2e338732d FIX 解决合并请求的权限问题 2021-04-29 23:23:16 +08:00
jasder dae5c9690f Merge branch 'develop' into dev_trustie_server 2021-04-29 23:19:17 +08:00
jasder d71272146f Merge branch 'sync_develop' into develop 2021-04-29 23:18:56 +08:00
jasder c56f0ca7fc FIX 解决合并请求的权限问题 2021-04-29 23:17:55 +08:00
jasder 246b6b52ec Merge branch 'develop' into dev_trustie_server 2021-04-29 19:27:36 +08:00
jasder 744f857f20 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-04-29 19:24:49 +08:00
jasder f222cc6e4f FIX bug 
个人名下所有仓库加载接口调整
 2021-04-29 19:18:58 +08:00
jasder 7cf2c6021f Merge branch 'develop' into dev_trustie_server 2021-04-29 19:13:12 +08:00
jasder e87413f8a0 FIX migrate repo api bug 2021-04-29 19:12:48 +08:00
jasder e0f9a3d43d Merge branch 'develop' into dev_trustie_server 2021-04-29 18:50:11 +08:00
jasder 0133ec24ca FIX pr merge bug 2021-04-29 18:48:54 +08:00
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 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
vilet.yy c14c92ac11 fix: pull_request permit develop create pr 2021-04-29 10:32:49 +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
vilet.yy ea42b0d6ed fix: pull_request can not select reporter and compare userinfo lose 2021-04-28 20:10:21 +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 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 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 36fb5a118c Merge branch 'develop' into dev_trustie_server 2021-04-23 14:40:41 +08:00
jasder aa314c141c ADD some url with in hovercoard api 2021-04-23 14:40:26 +08:00
jasder b756be1d6a Merge branch 'develop' into dev_trustie_server 2021-04-22 18:10:32 +08:00
jasder 37e1704897 ADD location column for user hovercard api 2021-04-22 18:10:20 +08:00
jasder 348c2244f7 Merge branch 'develop' into dev_trustie_server 2021-04-22 16:45:40 +08:00
jasder ddacf2a733 FIX get organzition's name bug 2021-04-22 16:45:26 +08:00
jasder 31738fc227 Merge branch 'develop' into dev_trustie_server 2021-04-22 16:43:04 +08:00
jasder d07543111a FIX code bug 2021-04-22 16:42:50 +08:00
jasder 39193324e9 Merge branch 'develop' into dev_trustie_server 2021-04-22 16:38:58 +08:00
jasder 908cda56f3 ADD users/hovercard api 2021-04-22 16:36:40 +08:00
jasder 841778900c FIX code review 2021-04-22 16:35:54 +08:00
jasder 6a3d297b30 FIX code bug 2021-04-20 19:07:48 +08:00
jasder 002c773746 FIX code bug 2021-04-20 19:06:31 +08:00
jasder 45f05c9fc4 FIX render commmiter and author avatar bug 2021-04-20 18:58:14 +08:00
jasder 84e48d25c1 FIX render user bug with pull‘s commits and repo's commits api 2021-04-20 18:35:41 +08:00
jasder db476a1a9b Merge branch 'develop' into dev_trustie_server 2021-04-20 11:37:08 +08:00
vilet.yy da98efe04f add: org project field 2021-04-20 10:50:06 +08:00
jasder 0d7a11f3ab Merge branch 'develop' into dev_trustie_server 2021-04-19 18:41:18 +08:00
vilet.yy 2976742b29 fix: org team nickname change error 2021-04-19 18:37:30 +08:00
vilet.yy 55e081ba2b fix 2021-04-19 18:37:30 +08:00
vilet.yy a3c49b3d5f add: org valid 2021-04-19 18:37:30 +08:00
vilet.yy 5a9f29c25f fix 2021-04-19 18:37:30 +08:00
vilet.yy f75827bcf0 fix: org not need create member 2021-04-19 18:37:30 +08:00
vilet.yy f0c4d1226b fix: org not need create member 2021-04-19 18:37:30 +08:00
vilet.yy 3a47c61010 add: team nickname 2021-04-19 18:37:30 +08:00
jasder 1f0388c1a1 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-04-19 18:36:07 +08:00
jasder de6ae5b720 Upate models Schema Information 2021-04-19 18:36:02 +08:00
jasder f055fed7d0 ADD 创建团队支持中文名称 
创建组织团队使用中文名称报错、组织项目下创建issue报错
 2021-04-19 18:10:31 +08:00
jasder 21befb6486 FIX auto generate avatar bug 2021-04-19 17:28:57 +08:00
jasder b6e8a135f0 FIX url_to_avatar bug 2021-04-19 15:42:54 +08:00
jasder 9cddda7fd4 Update render user avatar url in projects api 2021-04-19 15:38:51 +08:00
jasder 002ae9f327 ADD auto generate user avatar 2021-04-19 15:06:56 +08:00
vilet.yy 8055ae2c07 fix: org team nickname change error 2021-04-19 12:14:11 +08:00
vilet.yy 01f32ae2d7 fix 2021-04-19 12:09:38 +08:00
vilet.yy 1c6982d15b add: org valid 2021-04-19 12:07:12 +08:00
vilet.yy 9300483c1a fix 2021-04-19 11:40:38 +08:00
vilet.yy 1920cb5ce3 fix: org not need create member 2021-04-19 11:35:12 +08:00
vilet.yy 5a20842edb fix: org not need create member 2021-04-19 11:26:30 +08:00
vilet.yy 506ab1722d add: team nickname 2021-04-19 10:54:36 +08:00
jasder 879e45e106 Merge branch 'develop' into trustie_server 2021-04-13 16:40:23 +08:00
jasder 07d11737e9 组织权限问题 
组织权限问题
 2021-04-13 16:39:50 +08:00
vilet.yy 1fe9ea126a fix: permission with organization 2021-04-13 11:53:06 +08:00
jasder b3b0f75e9b Merge branch 'develop' into trustie_server 2021-04-13 10:18:52 +08:00
jasder dcd4457cf5 FIX 开放平台管理员可以访问所有团队信息 2021-04-13 10:16:18 +08:00
jasder 5c8e561bd8 Merge branch 'develop' into trustie_server 2021-04-08 18:36:27 +08:00
vilet.yy 04a1376820 add: project's lesson_url 2021-04-08 15:20:34 +08:00
jasder 2b0c987558 Merge branch 'develop' into trustie_server 2021-04-07 11:35:09 +08:00
vilet.yy cf224bc9fe add: project menulist resources 2021-04-07 11:29:44 +08:00
vilet.yy d6c3bcfaf1 add: org add nickname 2021-04-07 11:29:44 +08:00
vilet.yy a66e5b876d fix 2021-04-07 11:29:44 +08:00
vilet.yy b11fd350da fix: project permission 2021-04-07 11:29:44 +08:00
vilet.yy c417fa7369 add: project list author type 2021-04-07 11:29:44 +08:00
jasder 6796805b21 Merge branch 'develop' into trustie_server 2021-04-02 18:58:08 +08:00
jasder e9a4370adc pull bug 2021-04-02 18:57:49 +08:00
jasder e6b8435037 FIX gug 2021-04-02 18:57:13 +08:00
jasder 5752f19b2f FIX gug 2021-04-02 18:56:44 +08:00
vilet.yy c175fa1339 fix: commit author and fork create units 2021-04-02 18:53:53 +08:00
vilet.yy 786629dbff fix 2021-04-02 18:41:48 +08:00
vilet.yy 7a00541375 Merge branch 'develop' into hh_develop 2021-04-02 18:41:37 +08:00
jasder 6ce4b26047 FIX api bug 2021-04-02 18:40:26 +08:00
vilet.yy 1d832a1723 fix 2021-04-02 18:38:08 +08:00
vilet.yy 80ce40e492 fix 2021-04-02 18:33:31 +08:00
vilet.yy 91f6dae56a fix 2021-04-02 18:24:20 +08:00
vilet.yy 8c5a834b14 Merge branch 'develop' into hh_develop 2021-04-02 18:22:32 +08:00
jasder e022e429d4 FIX code bug 2021-04-02 18:22:21 +08:00
vilet.yy 57f420848e Merge branch 'develop' into hh_develop 2021-04-02 18:20:41 +08:00
jasder 50fb8d3983 ADD sync user info api 2021-04-02 18:18:52 +08:00
vilet.yy fba58800a7 fix 2021-04-02 18:08:36 +08:00
vilet.yy c4a43c4392 add: need edit user password 2021-04-02 16:44:36 +08:00
jasder 02d26df172 FIX query builds api bug 2021-04-02 15:53:17 +08:00
vilet.yy 1153bd5ab6 fix: set redirect_uri 2021-04-02 09:43:18 +08:00
vilet.yy f732b0374c fix: ceshi 2021-04-02 09:23:11 +08:00
vilet.yy 0d97d7d4f0 add: educoder third party 2021-04-01 18:01:51 +08:00
jasder 0b6ebb7b36 FIX get site url bug with setting api 2021-04-01 15:04:17 +08:00
jasder b89501822f FIX code bug 2021-03-31 14:53:50 +08:00
jasder 5f5b380514 FIX conflict 2021-03-31 13:35:40 +08:00
jasder d2293a2778 FIX setting api bug 2021-03-31 12:44:40 +08:00
jasder 860b46685a fix bug 2021-03-31 10:24:37 +08:00
jasder 3869529620 Update setting api 2021-03-31 09:49:05 +08:00
vilet.yy 9394d15752 fix: menu manager allow visit 2021-03-30 17:27:50 +08:00
vilet.yy 8952f6a944 fix: menu manager allow visit 2021-03-30 17:13:58 +08:00
vilet.yy ffa2782637 fix: detail release version limit 2021-03-30 16:34:31 +08:00
vilet.yy d0a65775aa fix: not show commiter avatar 2021-03-30 16:34:12 +08:00
jasder 69bf30d482 Merge branch 'develop' into trustie_server 2021-03-28 20:05:34 +08:00
jasder c4560ebb66 FIX tags api bug 2021-03-28 20:05:13 +08:00
jasder 0211d6152e fix conflict 2021-03-28 20:00:28 +08:00
jasder 12f1aba07e Merge branch 'develop' into trustie_server 2021-03-28 19:44:36 +08:00
jasder 63d91919ae FIX repo detail api bug 2021-03-28 19:44:23 +08:00
jasder 06c851d22f Merge branch 'develop' into trustie_server 2021-03-27 23:54:32 +08:00
jasder ad4617288d FIX repositories detail api bug 2021-03-27 23:54:14 +08:00
jasder 7c0a2aa89e Merge branch 'develop' into trustie_server 2021-03-25 14:31:45 +08:00
vilet.yy 7f28f07665 fix: readme error 2021-03-25 11:31:43 +08:00
vilet.yy 66608b3baa add: detail project description 2021-03-24 13:59:24 +08:00
vilet.yy 9ee42e805b fix: update error 2021-03-24 13:50:17 +08:00
vilet.yy 15f9004f63 add: edit permit website 2021-03-24 10:50:47 +08:00
jasder 0f67944911 FIX code bug 2021-03-23 15:58:12 +08:00
jasder 8b656fd409 FIX bug 2021-03-23 15:47:01 +08:00
jasder 815b364428 ADD common url with setting api 2021-03-23 15:42:56 +08:00
jasder 18ae3853d7 FIX update setting api 2021-03-23 11:42:22 +08:00
jasder ce18cc380a Merge branch 'develop' into trustie_server 2021-03-22 21:02:17 +08:00
jasder cbc6f4e7d1 fix bug 2021-03-22 20:53:39 +08:00
jasder aa23762b2f FIX update setting api for nav bar url 2021-03-22 18:02:12 +08:00
vilet.yy 5c864acb64 fix: create repo not use website 2021-03-22 15:50:08 +08:00
vilet.yy 8bbfea2079 fix 2021-03-22 11:18:04 +08:00
vilet.yy 8c2a543e61 fix: project code change to default 2021-03-22 11:16:35 +08:00
jasder 0909223867 FIX get readme api method 2021-03-21 11:24:34 +08:00
vilet.yy 223755a965 fix: languages filter 0.0% 2021-03-19 18:36:55 +08:00
vilet.yy f1ed61c687 add: menu permission control 2021-03-19 18:01:29 +08:00
vilet.yy 553a584121 fix: migrate create unit 
fix
 2021-03-19 17:38:14 +08:00
vilet.yy db2ba95e24 fadd: repo edit unit 2021-03-19 15:05:09 +08:00
vilet.yy 39f0811f0a fix:simple unit 2021-03-19 14:58:25 +08:00
vilet.yy 6a7ef2a1a7 add: repo contributors 2021-03-18 16:35:46 +08:00
vilet.yy 25186b4e81 fix 2021-03-18 09:55:58 +08:00
vilet.yy a627ab4d82 fix 2021-03-18 09:51:56 +08:00
vilet.yy 8f98a83379 add: project unit list 2021-03-17 13:50:26 +08:00
vilet.yy a14459da50 add: project menu list 2021-03-17 11:52:36 +08:00
vilet.yy f17e436d62 add: doc 2021-03-16 11:10:58 +08:00
vilet.yy 34d95451b5 add: get project all files 2021-03-16 10:25:37 +08:00
vilet.yy b43926f69f add: new project detail 2021-03-15 19:01:35 +08:00
jasder 899e7ccab8 FIX CI 修复参数设置的bug 2021-03-05 15:48:08 +08:00
victor d3df04fb97 参数管理修改 2021-03-05 15:43:42 +08:00
jasder 50928f82c0 FIX valid user before register action 2021-03-05 15:36:26 +08:00
victor 33984e16d0 参数管理修改 2021-03-05 15:26:29 +08:00
jasder 8942c694c4 Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-03-05 11:38:45 +08:00
victor d7bc309d49 参数管理删除 2021-03-04 09:33:04 +08:00
victor cb90dc1f51 参数管理 2021-03-03 15:36:59 +08:00
jasder 347af1a8ad Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-03-02 15:21:50 +08:00
vilet.yy ccbaa8efe5 [FIX]pull_request create and update error 2021-03-01 16:43:09 +08:00
jasder 11350bb76f Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus into develop 2021-03-01 10:02:35 +08:00
jasder b6b3cb0825 fix bug 2021-02-26 17:51:42 +08:00
jasder fc680b5372 fix notice api 2021-02-26 14:38:32 +08:00
vilet.yy c299c9fa69 [FIX]repository setting entry error 2021-02-26 13:49:29 +08:00
vilet.yy 70922b81db [FIX]watcher type error 2021-02-25 11:52:24 +08:00
vilet.yy 93fa02bd7b [FIX] 
[FIX]

[FIX]
 2021-02-22 10:53:01 +08:00
vilet.yy ef0c44f29c [ADD]fix error script 2021-02-22 10:10:22 +08:00
vilet.yy 9681a1a491 [FIX]sync mirror project 2021-02-21 17:14:51 +08:00
vilet.yy f7b7122d60 [FIX]join projects add org projects and update project private bug 2021-02-21 15:20:04 +08:00
Gitea 11471b1520 [FIX]transfer need to save clone_url 2021-02-21 10:02:47 +08:00
jasder 50d81b2490 FIX schema 2021-02-09 11:49:47 +08:00
jasder 9f4c2bd673 FIX repo setting api for forbidden 2021-02-09 11:48:05 +08:00
viletyy 2b898b0d1f [FIX]remove description 2021-02-06 16:43:41 +08:00
viletyy f06a1f63dd [ADD]project transfer 
[FIX]

[FIX]
 2021-02-06 15:49:59 +08:00
viletyy d85075f951 [FIX]org sync gitea_uid 
[FIX]
 2021-02-06 15:49:56 +08:00
viletyy ec1acde99a [FIX]show teams, org name valid message 2021-02-06 15:49:56 +08:00
viletyy 55528950f1 [FIX]owner text 2021-02-06 15:49:56 +08:00
viletyy 54204d4db8 [ADD]org team search, project teams add\remove, org can create field 
[FIX]
 2021-02-06 15:49:55 +08:00
viletyy 4f6f257b37 [FIX]concat change to concat_ws, org render 403, normal team leave 2021-02-06 15:49:54 +08:00
viletyy 629f3fbbe1 [FIX]little vliad about team_user 2021-02-06 15:49:54 +08:00
viletyy ddaca5bafc [ADD]organization add num_teams 2021-02-06 15:49:54 +08:00
viletyy 1e70764d63 [FIX]teams add user info 2021-02-06 15:49:54 +08:00
viletyy 152e301bf3 [ADD]search is_member is_admin 2021-02-06 15:49:54 +08:00