Commit Graph
44742 Commits
Author SHA1 Message Date
wangyidong a8a703bf16 * finish task #68203. 2022-09-07 11:08:48 +08:00
王怡栋 72dad72c13 Merge branch 'sprint/237_liumengyi_67768' into 'master'
* Fix bug #27186.

See merge request easycorp/zentaopms!5281
2022-09-07 02:35:29 +00:00
王怡栋 e6885c26ac Merge branch 'sprint/237_liumengyi_67774' into 'master'
* Fix bug #26648.

See merge request easycorp/zentaopms!5278
2022-09-07 02:35:15 +00:00
王怡栋 ceeda8a41e Merge branch 'master_xieqiyu_67693' into 'master'
* Add delay label.

See merge request easycorp/zentaopms!5277
2022-09-07 02:34:47 +00:00
王怡栋 9be46b416f Merge branch 'max_45' into 'master'
* Finish task #67793.

See merge request easycorp/zentaopms!5282
2022-09-07 02:32:06 +00:00
wangyidong b389d7ea97 Merge branch 'importExport' 2022-09-07 10:30:33 +08:00
王怡栋 17aec51cbe Merge branch 'master' into 'importExport'
# Conflicts:
#   module/port/model.php
2022-09-07 02:30:00 +00:00
tanghucheng a2946b28af * Finish task #67793. 2022-09-07 10:11:23 +08:00
wangyidong 2a7d73ef55 * fix for upgrade for effort order. 2022-09-07 10:06:23 +08:00
wangyidong 9648f86221 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-07 09:20:39 +08:00
liumengyi 72591c381e * Fix bug #27186. 2022-09-07 09:20:35 +08:00
wangyidong aa9e733921 * fix bug #27286. 2022-09-07 09:20:26 +08:00
李玉春 4c3e796891 Merge branch 'sprint/wangzemei/zuicss' into 'master'
* ZUI: remove ellipsis

See merge request easycorp/zentaopms!5280
2022-09-07 00:49:02 +00:00
wangzemei 1166c0747e * ZUI: remove ellipsis 2022-09-07 00:40:56 +00:00
王怡栋 76447025a4 Merge branch 'sprint/237_tianshujie_bug' into 'master'
Sprint/237 tianshujie bug

See merge request easycorp/zentaopms!5279
2022-09-07 00:29:42 +00:00
liumengyi 66f95f43ab * Optimize code for bug #26648. 2022-09-06 17:11:24 +08:00
liumengyi e551fa25e8 * Fix bug #26648. 2022-09-06 17:06:26 +08:00
唐胡成 25613fe0c6 Update model.php 2022-09-06 09:05:22 +00:00
xieqiyu bb38728a54 * Add delay label. 2022-09-06 16:01:45 +08:00
王怡栋 c7024eee3c Merge branch 'master_xieqiyu_27006' into 'master'
* Fix bug#27006.

See merge request easycorp/zentaopms!5275
2022-09-06 07:56:04 +00:00
王怡栋 887e405c1c Merge branch 'master_xieqiyu_27276' into 'master'
* Fix bug#27276,#27280.

See merge request easycorp/zentaopms!5271
2022-09-06 07:55:02 +00:00
王怡栋 f71df64f64 Merge branch 'sprint/workflow_fixbug#26826' into 'master'
* Finish task #67872. Fix bug #26826.

See merge request easycorp/zentaopms!5274
2022-09-06 07:54:41 +00:00
王怡栋 c13f57e39e Merge branch 'sprint/daitingting_bug_67888' into 'master'
* Fix bug #67888.

See merge request easycorp/zentaopms!5272
2022-09-06 07:53:57 +00:00
王怡栋 20852c3bc7 Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #27020, #27004.

See merge request easycorp/zentaopms!5273
2022-09-06 07:53:08 +00:00
朱金勇 c8d127ac3f Merge branch 'sprint/master_zhaoke_67308' into 'master'
Finish task 67308

See merge request easycorp/zentaopms!5211
2022-09-06 07:52:47 +00:00
王怡栋 e5bd16f5b6 Merge branch 'sprint/237_liumengyi_67702' into 'master'
* Fix bug #26193.

See merge request easycorp/zentaopms!5276
2022-09-06 07:52:27 +00:00
xieqiyu 4f9128b9c1 * Fix bug#27288. 2022-09-06 15:51:03 +08:00
xieqiyu 4275f13884 * Fix bug#27006. 2022-09-06 15:37:55 +08:00
liumengyi b7fa4bd754 * Fix bug #26193. 2022-09-06 15:30:21 +08:00
wangyuting2 2fa3bb0892 * Finish task #67872. Fix bug #26826. 2022-09-06 15:26:21 +08:00
wangyidong 358e54302d * fix bug #27292. 2022-09-06 15:26:01 +08:00
liumengyi 2bf626bc9f * Fix bug #27004. 2022-09-06 15:24:07 +08:00
liumengyi ed78e77035 * Fix bug #27020. 2022-09-06 15:04:00 +08:00
liumengyi ea3071279b * Fix bug #27020. 2022-09-06 14:52:24 +08:00
zhaoke c01ea66816 - Remove test code. 2022-09-06 14:36:26 +08:00
zhaoke 9d5f645870 * Add do not change case title when submit unit result. 2022-09-06 14:34:20 +08:00
xieqiyu 9dedf90d27 * Fix bug#27276,#27280. 2022-09-06 14:20:39 +08:00
wangyidong 249913cd5a * code for bug #68205. 2022-09-06 14:01:41 +08:00
daitingting a09269de36 * Fix bug #67888. 2022-09-06 05:59:31 +00:00
李玉春 ae32e44f5b Merge branch 'sprint/wangzemei/25515' into 'master'
* Fix datatable bug about bug#25515

See merge request easycorp/zentaopms!5270
2022-09-06 05:54:30 +00:00
王怡栋 19d5097ff3 Merge branch 'sprint/daitingting_optimize' into 'master'
* Optimize codes.

See merge request easycorp/zentaopms!5269
2022-09-06 05:44:51 +00:00
wangzemei f2c8790dbb * Fix datatable bug about bug#25515 2022-09-06 05:37:01 +00:00
daitingting dc0ecc890e * Optimize codes. 2022-09-06 05:26:47 +00:00
tianshujie 562c4569cb * Fix bug #27007. 2022-09-06 13:11:29 +08:00
tianshujie 45269fb54b * Optimize the test report page. 2022-09-06 11:20:04 +08:00
sunguangming 6e6f1b0800 * Alter recordestimate view to 5 lines. 2022-09-06 11:08:28 +08:00
tianshujie 7629e345e5 * Fix bug #26842. 2022-09-06 11:01:26 +08:00
liumengyi 6e118674b9 * Fix bug #26193. 2022-09-06 10:57:20 +08:00
王怡栋 a1e31e99e3 Merge branch 'master_xieqiyu_66957' into 'master'
* Code for task#68109.

See merge request easycorp/zentaopms!5266
2022-09-06 02:57:03 +00:00
王怡栋 fabd055dc1 Merge branch 'master_xieqiyu_67693' into 'master'
* Finish task#67693.

See merge request easycorp/zentaopms!5267
2022-09-06 02:52:14 +00:00