Commit Graph
2455 Commits
Author SHA1 Message Date
tanghucheng 3d3ffe9348 * Fix bug #21403,21474,21410,21414,21417,21456. 2022-04-07 15:27:54 +08:00
王怡栋 adb3a7ea72 Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/project/model.php
2022-04-02 07:33:24 +00:00
王怡栋 c18710567b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-02 14:44:44 +08:00
王怡栋 6edb5fe805 * fix bug #21413. 2022-04-02 14:44:18 +08:00
tanghucheng 8c81661d37 * Fix bug #21431. 2022-04-02 14:30:25 +08:00
tianshujie b2e99c8dd4 * Modify the jump link mode. 2022-04-02 10:37:43 +08:00
tianshujie b9dc9b118e * Fix bug #19676. 2022-04-01 14:05:06 +08:00
xieqiyu 2a57f4fd28 * Fix bug#19665. 2022-03-31 16:08:33 +08:00
孙广明 4e2f0a3d86 Merge branch 'master_xieqiyu_19273' into 'master'
* Fix bug#19273.

See merge request easycorp/zentaopms!2666
2022-03-31 07:24:15 +00:00
孙广明 1746814316 Merge branch 'sprint/master_zhouxudong_17123' into 'master'
* Fix bug #17123.

See merge request easycorp/zentaopms!2672
2022-03-31 07:18:02 +00:00
zhouxudong 2b69acf643 * Fix bug #17123. 2022-03-31 14:55:04 +08:00
孙广明 5e8b3f2249 Merge branch 'fixbugs_zhouxin_21333' into 'master'
* Fix bug #21333.

See merge request easycorp/zentaopms!2668
2022-03-31 06:33:31 +00:00
zhouxin 3c1789a534 * Fix bug #21333. 2022-03-31 06:29:45 +00:00
zhouxin bb47bfa04c * Fix bug #21333. 2022-03-31 06:02:31 +00:00
xieqiyu 2ed1eedfcf * Fix bug#19273. 2022-03-31 13:42:28 +08:00
孙广明 3d2de17fff Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #11348.

See merge request easycorp/zentaopms!2648
2022-03-31 03:08:50 +00:00
孙广明 df2cda6e8b Merge branch 'sprint/master_zhouxudong_18083' into 'master'
Sprint/master zhouxudong 18083

See merge request easycorp/zentaopms!2653
2022-03-31 03:06:37 +00:00
zhouxudong 8efcc37f4b * Fix bug #18083. 2022-03-31 11:02:59 +08:00
xieqiyu 0983c30e8d * Fix bug#18083. 2022-03-30 17:26:17 +08:00
李玉春 a680dd14e7 Merge branch 'cyy_fixbug' into 'master'
* Fix bug #6971.

See merge request easycorp/zentaopms!2638
2022-03-30 09:12:48 +00:00
liyuchun 74d2ed5ea6 * Fix bug #11348. 2022-03-30 17:01:15 +08:00
caoyanyi c2bc48fc38 * Fix bug #6971. 2022-03-30 13:29:38 +08:00
zenggang 5ceeb72655 * Finish task#51117 2022-03-30 02:43:34 +00:00
zhouxudong a42d621269 * Fix bug #18083. 2022-03-30 09:13:13 +08:00
zhouxudong e97eab6f68 * Fix bug #18083. 2022-03-30 08:50:14 +08:00
zhouxudong a7f9fdca86 * Fix bug #18083. 2022-03-29 14:03:53 +08:00
xieqiyu 01a7b6391b * Fix bug#11308,#20582. 2022-03-29 08:22:45 +08:00
李玉春 382e4493f1 Merge branch 'sprint/master_zhouxudong_11919' into 'master'
Sprint/master zhouxudong 11919

See merge request easycorp/zentaopms!2582
2022-03-28 08:12:30 +00:00
zhouxudong 5607b4f6c8 * Fix bug #11919. 2022-03-28 15:12:12 +08:00
xieqiyu f72da77a5d * Code for bug#20875. 2022-03-28 13:52:42 +08:00
zhouxudong d689db05a7 * Fix bug #11919. 2022-03-28 13:10:11 +08:00
zhouxudong 5129df89d2 * Fix bug #11919. 2022-03-28 11:11:31 +08:00
zhouxudong 0f999761c9 * Fix bug #11919. 2022-03-28 11:10:21 +08:00
zhouxudong 92648cadc8 * Fix bug #11919. 2022-03-25 15:23:15 +08:00
tianshujie c9c1573a2d * Fix bug #20523. 2022-03-24 14:40:38 +08:00
王怡栋 39c46536f1 * code for task #51327. 2022-03-23 11:05:58 +08:00
王怡栋 d71568e98d * code for task #51327. 2022-03-23 10:55:05 +08:00
zenggang 784e153159 * Finish task#51115,51116,51120,51121,51133 2022-03-22 07:11:57 +00:00
zhouxudong a643044137 * Fix bug #16070. 2022-03-22 14:53:08 +08:00
王怡栋 890b8a39c6 Merge branch 'sprint/lite6_lwr_filter_deleted_lanes' into 'master'
* filter out deleted lanes, task #51311, bug #20972.

See merge request easycorp/zentaopms!2426
2022-03-22 03:14:12 +00:00
Wenrui LI 56053267c1 * fix where deleted condition of query. 2022-03-22 11:07:49 +08:00
zhujinyong 0cf390702c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 10:55:21 +08:00
zhujinyong 0c39542c38 Merge branch 'Zentao_app1.1' 2022-03-22 10:55:09 +08:00
王怡栋 ff30f9fa2f * adjust for init story for batch create task. 2022-03-22 10:53:26 +08:00
Wenrui LI b232bd54fe * filter out deleted lanes, task #51311, bug #20972. 2022-03-22 10:39:28 +08:00
王怡栋 25b0c39dcc * fix bug #21029. 2022-03-22 10:31:47 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
caoyanyi bd8dfd8269 Merge branch 'Zentao_app1.1' of https://gitlab.zcorp.cc/easycorp/zentaopms into Zentao_app1.1 2022-03-21 14:41:49 +08:00
caoyanyi f2d6299356 * Fix bug #20662. 2022-03-21 10:39:41 +08:00
zhouxudong fb7176359b * Fix bug #11985. 2022-03-21 09:55:33 +08:00