Commit Graph
303 Commits
Author SHA1 Message Date
朱金勇 75a3485f47 * Fix order in dmdb. 2023-04-10 03:13:24 +00:00
Yagami 83e09932e2 * Code for https://www.zentao.net/ask/596328.html. 2023-03-28 08:58:57 +08:00
zenggang e5c4bec3ed * Adjust deleted branch 2023-03-14 02:29:17 +00:00
曾刚 2da060b171 Gitlab optimize 2023-03-09 08:05:10 +00:00
liuyongkai 94d1f20de5 * Add the not passed parameter. 2023-02-22 09:56:16 +08:00
liuyongkai f6ddcb39c3 * Resolve ticket #388. bug #32309. 2023-02-21 09:12:30 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
liuyongkai 088962b4f3 * Fix bug #32163. feedback #2170. 2023-02-15 13:54:01 +08:00
caoyanyi 15f9047883 * Modify commit link object error. 2023-02-15 09:10:26 +08:00
tianshujie ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
孙广明 c824a0a053 Merge branch 'fix_devops_bug' into 'master'
Fix devops bug

See merge request easycorp/zentaopms!6910
2023-02-10 01:46:38 +00:00
liuyongkai a4fdf693cd * Fix some bugs. 2023-02-09 13:37:58 +08:00
caoyanyi cb96d6b017 * Modify array defined. 2023-02-09 12:07:35 +08:00
liumengyi 4436a912aa * Finish task #83952. 2023-02-08 14:36:15 +08:00
liumengyi e3473f4f11 * Fitler executions of task #83953. 2023-02-08 10:02:29 +08:00
liumengyi 64292d5711 * Finish task #83953. 2023-02-07 14:09:55 +08:00
liuyongkai 101456df7c * Fix bugs. 2023-02-07 09:18:27 +08:00
wangyidong bf1130cff7 * fix bug for create linked2revision action. 2023-01-13 17:39:02 +08:00
caoyanyi b64e88f4d2 * Fix bug to repo client. 2023-01-10 15:26:10 +08:00
caoyanyi 42aea64d75 * Fix bug #30947. 2022-12-26 10:58:56 +08:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
caoyanyi 05d9cef073 * Fix bug #29957. 2022-11-17 16:52:31 +08:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
liyuchun 53421d6093 * Add unit test. 2022-10-27 13:48:51 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangjianhua 31b013007c * Rebuild linking repo and project without product. 2022-10-19 00:28:21 +08:00
wangjianhua c5e48077d4 * Adjust comments format. 2022-10-18 11:10:07 +08:00
wangjianhua 70cbc979dc * Fix bug: dese not show linked projects in Repo edit page. 2022-10-17 17:51:01 +08:00
liyuchun 41bddc2893 Merge branch 'master' into zenops_46 2022-10-08 15:22:35 +08:00
李玉春 743595ea83 Merge branch 'master' into 'devops19'
# Conflicts:
#   test/model/mr/create.php
2022-10-08 03:21:38 +00:00
wangjianhua 9004734f5c * Change variable name projectList to projects. 2022-09-28 20:51:15 +08:00
wangjianhua b9954010ba * Link project and repo. 2022-09-28 16:59:32 +08:00
曹延义 ffb789376d * Modify php error. 2022-09-09 09:09:11 +08:00
孙广明 1c5ddf59b1 Merge branch 'liyuchun_fixbug' into 'zenops_44'
* Fix bug when save commit.

See merge request easycorp/zentaopms!5256
2022-09-08 01:03:45 +00:00
caoyanyi 77081214f5 * Add diff editor page. 2022-09-05 16:56:06 +08:00
liyuchun a85bf1af4c * Fix bug when save commit. 2022-09-02 14:39:49 +08:00
caoyanyi 5fab9113bd * Fix bug for repo view. 2022-09-02 10:44:48 +08:00
liyuchun d9642d657f * Finish task #65984. 2022-08-30 16:58:48 +08:00
孙广明 1fc1eb600e Merge branch 'liyuchun_65976' into 'zenops_44'
Liyuchun 65976

See merge request easycorp/zentaopms!5186
2022-08-30 01:26:11 +00:00
liyuchun 39dddce524 * Fix bug #26980. 2022-08-30 09:13:34 +08:00
liyuchun 088c55f390 * Add history log. 2022-08-29 16:09:22 +08:00
liyuchun 61c88f627c * Finish task #65979,65978,65977. 2022-08-26 14:06:01 +08:00
liyuchun 79c1fe014a * Code for task #65983. 2022-08-26 08:44:28 +08:00
caoyanyi 37bce52f02 * Modify relation fields. 2022-08-24 15:24:33 +08:00
caoyanyi 006dc90afb * Code for task #65980. 2022-08-24 14:42:39 +08:00
liyuchun 4c5c2aff37 * Finish task #65982. 2022-08-24 10:40:27 +08:00
caoyanyi 7d130c6bf3 * Adjust codes. 2022-08-23 08:26:52 +08:00
caoyanyi 98fe25b85a * Add monaco editor to repo view. 2022-08-22 16:31:58 +08:00