Commit Graph
1093 Commits
Author SHA1 Message Date
王怡栋 7013e19604 Merge branch 'sprint/feedback1403' into 'master'
Sprint/feedback1403

See merge request easycorp/zentaopms!6428
2022-12-01 07:54:50 +00:00
chaideqing 6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
chaideqing bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
wangyidong b2f9f3460b * fix bug #29637. 2022-11-30 16:19:15 +08:00
王怡栋 67a0be29e7 * fix bug. 2022-11-25 13:59:22 +08:00
wangyuting 6a445b8a42 * Fix bug #29566. 2022-11-25 01:48:56 +00:00
lanzongjun 675891f136 * Fix Bug #30028 2022-11-24 14:26:27 +08:00
王怡栋 db4bd4ebd6 * fix bug #29996. 2022-11-23 13:12:53 +08:00
Yagami a9bc199c38 * Finish task #77279. 2022-11-22 13:53:40 +08:00
xieqiyu c35c8bbcad * Fix bug#30036. 2022-11-21 14:20:03 +08:00
王怡栋 223546510d Merge branch 'zentaopms_263_bug#29561' into 'master'
* Fix bug #29561.

See merge request easycorp/zentaopms!6270
2022-11-21 05:27:16 +00:00
王怡栋 d9e22f5976 * fix bug #29670. 2022-11-21 10:48:07 +08:00
wangyuting bddf9e6602 * Fix bug #29561. 2022-11-21 02:37:08 +00:00
xieqiyu bdb570c00e * Fix bug#29461. 2022-11-21 09:43:56 +08:00
王怡栋 40e9827d45 Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6260
2022-11-18 08:29:41 +00:00
王怡栋 28f7de276c Merge branch 'master_xieqiyu_76490' into 'master'
* Fix bug#29677.

See merge request easycorp/zentaopms!6252
2022-11-18 07:22:17 +00:00
xieqiyu de8cfb9fec * Fix bug#29997. 2022-11-18 15:19:18 +08:00
lanzongjun 35fd254797 * Fix bug create execution 2022-11-18 14:57:52 +08:00
tianshujie 6faaaf865c * Fix bug #29847. 2022-11-18 14:24:41 +08:00
lanzongjun ccbf2ee9eb * Fix task #76414 2022-11-18 09:59:39 +08:00
lanzongjun 85a5d00a53 * Fix bug #29947 2022-11-17 16:03:27 +08:00
caoyanyi 4d90d01042 * Fix bug #29835. 2022-11-16 09:38:27 +08:00
王怡栋 ab5e0d9b4a Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   module/execution/control.php
2022-11-15 08:26:48 +00:00
王怡栋 1890c90011 Merge branch 'zentaopms_258_bug#29694' into 'master'
* Fix bug #29694.

See merge request easycorp/zentaopms!6161
2022-11-15 08:18:56 +00:00
孙广明 093069f5eb Merge branch 'master_xieqiyu_75910' into 'master'
* Fix bug#29440.

See merge request easycorp/zentaopms!6148
2022-11-15 08:13:37 +00:00
lanzongjun df7841c7b7 * finish task #75920 2022-11-15 15:50:05 +08:00
wangyuting aed6871cd8 * Fix bug #29694. 2022-11-15 05:20:46 +00:00
xieqiyu e2d3a349cc * Fix bug#29531. 2022-11-15 10:55:39 +08:00
xieqiyu 6534d1b7ef * Fix bug#29531. 2022-11-15 10:27:50 +08:00
lanzongjun 4d4b1565f4 * finish task #75923#75924 2022-11-15 10:23:54 +08:00
lanzongjun 9cc5139a08 * finish task #75919 2022-11-15 09:53:24 +08:00
xieqiyu f86b9b0b17 * Fix bug#29440. 2022-11-15 09:51:31 +08:00
mayue 72ed3ae227 * Fix bug #28832. 2022-11-14 17:22:03 +08:00
wangyuting 9627f33b3b * Fix bug #29711. 2022-11-14 08:37:07 +00:00
wangyidong b32f2af9b7 * code for task #75236. 2022-11-09 10:30:30 +08:00
wangyidong 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie 0c3e7b8c70 * Fix bug #27978. 2022-11-07 09:33:24 +08:00
tianshujie f7a1df8da4 * Change the minimum range of kanban columns. 2022-11-02 15:34:02 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyidong 4f824f9410 * code for task #73994. 2022-11-01 15:02:20 +08:00
daitingting 0bacaf044c * Fix bug #28928, #28930. 2022-10-28 06:09:33 +00:00
caoyanyi 542ca7e7f0 * Fix bug #29079. 2022-10-28 09:48:29 +08:00
caoyanyi 6c7e3e0253 * Modify project and execution view page style. 2022-10-28 09:31:09 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
唐胡成 122a34b4a5 Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Fix bug #29016,#29006,#29020.

See merge request easycorp/zentaopms!5909
2022-10-27 03:19:48 +00:00
tanghucheng ae7589b5e4 * Fix bug #29016,#29006,#29020. 2022-10-27 10:44:59 +08:00
Yagami 172a207410 Merge branch 'zentaopms_252' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_252 2022-10-27 09:07:11 +08:00
Yagami bf4f3c3dcc * Finish task #73240. 2022-10-27 09:06:55 +08:00
tanghucheng ba55e70ae2 * Code for task #73242. 2022-10-27 08:50:42 +08:00