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

4988 Commits

Author SHA1 Message Date
yystopf 6c4d17bed8 Merge branch 'develop' into trustie_server 2021-07-22 18:31:44 +08:00
yystopf e68c13f1a2 Merge branch 'develop' into dev_trustie_server 2021-07-22 18:30:59 +08:00
yystopf 0db334217e fix 2021-07-22 15:19:53 +08:00
yystopf 32fe6958df fix: create public key return error 2021-07-22 14:53:57 +08:00
yystopf 15eb1f4a17 Merge branch 'develop' into dev_trustie_server 2021-07-21 21:32:38 +08:00
yystopf a1cb9a11d6 Merge branch 'develop' into trustie_server 2021-07-21 21:32:18 +08:00
yystopf e4fda9243b fix: create project add login 2021-07-21 09:43:35 +08:00
yystopf 0884a0de1b Merge branch 'develop' into dev_trustie_server 2021-07-16 16:46:28 +08:00
yystopf 900fdd2691 Merge branch 'develop' into trustie_server 2021-07-16 16:46:08 +08:00
yystopf aeaa5d4366 完成public_keys模块、修复pr查看比较的时候传token，修复无法正确读取仓库图片 2021-07-16 16:45:46 +08:00
yystopf d4b9881f2d fix 2021-07-16 16:42:30 +08:00
yystopf a543c3e08f fix: write image filepath error 2021-07-16 16:10:20 +08:00
viletyy 998381585a add: user public keys controller 2021-07-14 15:38:14 +08:00
viletyy 2ddf1dbd01 add: gitea user keys api 2021-07-14 11:48:52 +08:00
viletyy fd3fab99ae fix: compare code need token 2021-07-14 09:55:12 +08:00
viletyy 4520055de2 Merge branch 'dev_trustie_server' into trustie_server 2021-07-12 18:38:03 +08:00
viletyy 193d1b21df Merge branch 'develop' into dev_trustie_server 2021-07-12 18:10:50 +08:00
viletyy de2b54c39e add: compare code return can merge status 2021-07-12 18:10:26 +08:00
viletyy ed8e079595 Merge branch 'develop' into dev_trustie_server 2021-07-12 17:57:51 +08:00
viletyy 4929734a1a fix 2021-07-12 17:57:42 +08:00
viletyy 55a0bcfb82 fix 2021-07-12 17:33:10 +08:00
viletyy 8f1aa3f4b1 fix: merge from develop 2021-07-12 17:28:47 +08:00
yystopf 1c6d8fc2f3 创建合并请求比较代码时返回是否可以创建的信息 2021-07-12 17:27:53 +08:00
viletyy d271a684fa add: compare code return can merge message 2021-07-12 17:24:35 +08:00
jasder b054094798 FIX conflicts 2021-07-12 16:20:14 +08:00
jasder 2d648e516e FIX merge develop branch 2021-07-12 16:19:03 +08:00
jasder 34c3a83df4 fix some bug 
FIX 解决私有版本库库不能访问、下载图片的问题
FIX show realname for create project
FIX 解决标签列表和发行版列表中下周zip包、tar包导致的404问题
ADD conflicts file for pull api
 2021-07-12 16:16:44 +08:00
jasder 71e039efb8 FIX merge develop branch 2021-07-12 16:14:51 +08:00
jasder 9ac21938e6 pr合并问题 2021-07-12 12:10:06 +08:00
viletyy fa8594d2ab add: merge pr check status 2021-07-12 12:02:34 +08:00
jasder 3614f3e15b FIX 解决私有版本库库不能访问、下载图片的问题 2021-07-09 16:57:11 +08:00
yystopf 7c23b40661 易修权限、用户更改昵称、fork项目修改项目私有性 2021-07-09 13:55:22 +08:00
viletyy ff21916f18 fix: merge from develop 2021-07-09 13:48:48 +08:00
viletyy d9162cb3bf fix: merge from develop 2021-07-09 13:47:21 +08:00
jasder e76d475fef FIX show realname for create project 2021-07-06 11:04:00 +08:00
jasder 1392024657 FIX migrate data 2021-07-02 16:08:55 +08:00
viletyy 312fca7e2b fix: update shell simple 2021-07-01 17:55:48 +08:00
jasder ca1fd3cd4f FIX 解决标签列表和发行版列表中下周zip包、tar包导致的404问题 2021-07-01 16:57:52 +08:00
vilet.yy d1939116a3 fix: authorize 2021-07-01 13:58:36 +08:00
vilet.yy 2a72fc56a4 fix: copy issue author id 2021-07-01 13:56:15 +08:00
jasder 913bc45a9f Merge branch 'dev_trustie_server' of https://git.trustie.net/jasder/forgeplus into dev_trustie_server 2021-07-01 10:09:28 +08:00
jasder 8131d8cd48 Merge branch 'sync_develop' into dev_trustie_server 2021-07-01 10:08:58 +08:00
jasder 87049b74ef Merge branch 'develop' into sync_develop 2021-07-01 10:06:00 +08:00
jasder f19219a467 FIX 解决标签列表和发行版列表中下周zip包、tar包导致的404问题 2021-06-30 14:30:01 +08:00
vilet.yy 4cc46f4cb4 fix 2021-06-29 18:05:37 +08:00
vilet.yy 8331d849d5 fix: forked projects private set 2021-06-29 17:36:15 +08:00
vilet.yy 0e7f3a8905 fix: project permission and update user lastname 2021-06-29 10:36:58 +08:00
viletyy b45ab12279 Merge branch 'dev_trustie_server' into trustie_server 2021-06-28 21:11:13 +08:00
viletyy 259090b8e3 fix 2021-06-28 21:07:10 +08:00
jasder c3bc4166d9 FIX pr bug 
ADD conflict files list
 2021-06-28 10:09:40 +08:00