Commit Graph
283 Commits
Author SHA1 Message Date
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
caoyanyi c8bbeb43e4 * Remove extra. 2022-08-11 16:59:20 +08:00
caoyanyi 690901bc16 * Modify repo unique check. 2022-08-11 14:40:50 +08:00
liyuchun 273698d8e6 * Finish task #64269. 2022-08-10 06:54:20 +00:00
李玉春 73077e76bc Merge branch 'cyy_optimize' into 'zenops_41'
* Modify server delete tip.

See merge request easycorp/zentaopms!4827
2022-08-08 09:23:07 +00:00
caoyanyi 0679729a7e * Modify server delete tip. 2022-08-05 15:39:24 +08:00
caoyanyi 4cb029c9ff * Fix bug for bug detail linked commit. 2022-08-05 13:51:15 +08:00
caoyanyi 59a1377e5a * Adjust codes. 2022-08-03 13:52:51 +08:00
caoyanyi 78c4226f3a * Add repo action log. 2022-08-03 10:24:00 +08:00
caoyanyi 506f028c11 * Remove test data. 2022-08-02 13:34:02 +08:00
caoyanyi bded54ba44 * Modify git clone for Gitea and Gogs. 2022-08-02 13:28:29 +08:00
caoyanyi 4b1dde8c7e * Modify gogs repo. 2022-08-01 15:40:55 +08:00
caoyanyi 558412c237 * Modify repo pull in tmp. 2022-07-28 09:47:10 +08:00
caoyanyi 87badf85e5 * Optimize pages. 2022-07-27 13:57:27 +08:00
caoyanyi 228898dd1b * Modify repo url. 2022-07-26 16:22:10 +08:00
caoyanyi 4c8474d335 * Modify gitea use git command. 2022-07-26 14:40:17 +08:00
caoyanyi aaeebc1abd * Adjust codes. 2022-07-21 17:01:39 +08:00
caoyanyi 328a91abc5 * Add repo unique. 2022-07-20 16:39:11 +08:00
caoyanyi 3d98baf24d * Modify mr create. 2022-07-18 17:23:37 +08:00
caoyanyi 9037038690 * Modify data name. 2022-07-18 10:36:26 +08:00
caoyanyi e8951a847a Merge branch 'master' into zenops_38 2022-07-18 10:11:16 +08:00