Commit Graph
39613 Commits
Author SHA1 Message Date
李玉春 a4b7149497 Merge branch 'sunhuawei_fixbug_22873' into 'master'
*Fix bug #22873.

See merge request easycorp/zentaopms!3650
2022-05-30 01:18:09 +00:00
孙华伟 34b536605a Update action.html.php 2022-05-30 01:14:45 +00:00
李玉春 a29aa19cf6 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix the display style of the task card.

See merge request easycorp/zentaopms!3654
2022-05-30 01:07:30 +00:00
tianshujie 5fe9641ce9 * Fix the display style of the task card. 2022-05-30 09:04:53 +08:00
孙广明 747e83db18 Merge branch 'sprint/192_leiyong_bug_22948' into 'master'
* Fix bug#22948.

See merge request easycorp/zentaopms!3638
2022-05-29 06:01:24 +00:00
王怡栋 87ea05d48c Merge branch 'master_xieiqyu_54988' into 'master'
* Restore code for task#54988.

See merge request easycorp/zentaopms!3651
2022-05-27 07:57:56 +00:00
孙华伟 dc2ba1c238 *Fix bug #22873. 2022-05-27 15:41:16 +08:00
李玉春 5cc0364563 Merge branch 'sprint/194_tianshujie_fixbug' into 'master'
* Fix bug #23010.

See merge request easycorp/zentaopms!3649
2022-05-27 06:55:49 +00:00
tianshujie a9021ec5a3 * Fix bug #23010. 2022-05-27 14:15:59 +08:00
孙广明 f8b4af39a8 Merge branch 'sprint/194_tianshujie_issue' into 'master'
* Finish issue #649.

See merge request easycorp/zentaopms!3644
2022-05-27 05:51:37 +00:00
tianshujie bc85c85a9c * Add testcase of task module. 2022-05-27 13:50:19 +08:00
孙广明 a85512f73c Merge branch 'sprint/194_liumengyi_23012' into 'master'
* Fix bug #22533.

See merge request easycorp/zentaopms!3642
2022-05-27 05:35:39 +00:00
孙广明 9e58f8e412 Merge branch 'sprint/193_hufangzhou_23032' into 'master'
* Fix bug #23032.

See merge request easycorp/zentaopms!3645
2022-05-27 05:35:08 +00:00
朱金勇 3e53fed7b7 Merge branch 'sprint/sunhao/bug22690' into 'master'
* bug #22690, optimize style for custom pri labels.

See merge request easycorp/zentaopms!3636
2022-05-27 05:34:56 +00:00
hufangzhou 08affe0373 * Fix bug #23032. 2022-05-27 13:32:08 +08:00
王怡栋 8739de2a7f Merge branch 'sprint/193_hufangzhou_22992' into 'master'
* Fix bug #22992.

See merge request easycorp/zentaopms!3643
2022-05-27 05:27:56 +00:00
tianshujie 93943c76dc * Finish issue #649. 2022-05-27 13:26:12 +08:00
hufangzhou 02e6680d05 * Fix bug #22992. 2022-05-27 13:25:44 +08:00
王怡栋 2bdca017ca Merge branch 'sprint/189_package_lanzongjun' into 'master'
* fix bug #23002

See merge request easycorp/zentaopms!3633
2022-05-27 05:12:18 +00:00
liumengyi 6a61aa3500 * Fix bug #22533. 2022-05-27 11:08:15 +08:00
李玉春 84fe5b847e Merge branch 'sprint/194_liumengyi_23012' into 'master'
* Fix bug #23012.

See merge request easycorp/zentaopms!3641
2022-05-27 03:02:02 +00:00
liumengyi 62445ea7b0 * Code format. 2022-05-27 10:59:23 +08:00
liumengyi f889692b40 * Remove empty line. 2022-05-27 10:47:19 +08:00
liumengyi 87ef728908 * Fix bug #23012. 2022-05-27 10:46:02 +08:00
李玉春 c96ae16062 Merge branch 'sprint/194_liumengyi_23012' into 'master'
* Fix bug #23022.

See merge request easycorp/zentaopms!3637
2022-05-27 01:54:16 +00:00
liumengyi ecdbeb4e0a * Fix bug #23022. 2022-05-27 09:51:32 +08:00
leiyong 2370066590 * Fix bug#22948. 2022-05-27 01:51:14 +00:00
Hao Sun f5214adedb * bug #22690, optimize style for custom pri labels. 2022-05-27 01:27:40 +00:00
李玉春 50f48a4c7e Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #22979.

See merge request easycorp/zentaopms!3634
2022-05-27 00:36:34 +00:00
tianshujie bee7fe5ae4 * Export tasks Add task mode. 2022-05-27 05:38:05 +08:00
xieqiyu a9ce5f8e01 * Restore code for task#54988. 2022-05-27 02:17:08 +08:00
tianshujie ae096f635c * Fix bug #22979. 2022-05-26 21:32:07 +08:00
tianshujie 53e95069e4 * Fix bug #22979. 2022-05-26 21:08:37 +08:00
王怡栋 a0af734e79 Merge branch 'sprint/master_zhouxudong_54991' into 'master'
Sprint/master zhouxudong 54991

See merge request easycorp/zentaopms!3626
2022-05-26 09:28:41 +00:00
lanzongjun c86bf9d730 * fix bug #23002 2022-05-26 17:23:32 +08:00
zhouxudong 715527fd59 * Finish task #54991. 2022-05-26 09:19:50 +00:00
王怡栋 76c5d782a4 Merge branch 'sprint/193_hufangzhou_xuansql' into 'master'
* Add the xuanxuan upgrade sql.

See merge request easycorp/zentaopms!3625
2022-05-26 09:19:48 +00:00
hufangzhou 9fe7cf8aee * Delete the check of international. 2022-05-26 17:18:56 +08:00
王怡栋 532d006835 Merge branch 'sprint/193_hufangzhou_23006' into 'master'
* Fix bug #23006.

See merge request easycorp/zentaopms!3630
2022-05-26 09:15:58 +00:00
王怡栋 d08e7c06d4 Merge branch 'sprint/193_hufangzhou_upgrade' into 'master'
* Add the version correspondence.

See merge request easycorp/zentaopms!3620
2022-05-26 09:14:45 +00:00
王怡栋 65d94782aa Merge branch 'fixbug' into 'master'
* Fix bug #23001,23005.

See merge request easycorp/zentaopms!3628
2022-05-26 09:14:26 +00:00
孙广明 765ed6b21b Merge branch 'sprint/194_liumengyi_23000' into 'master'
* Fix bug #23000, #23007,#22995.

See merge request easycorp/zentaopms!3627
2022-05-26 09:11:09 +00:00
李玉春 03d7b05aa8 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3631
2022-05-26 09:10:25 +00:00
liumengyi ab2294d0a4 * Fix bug #23007. 2022-05-26 17:08:15 +08:00
hufangzhou a3ac4fd428 * Fix bug #23006. 2022-05-26 17:04:27 +08:00
tanghucheng fa823c4c32 * Fix bug #23001,23005. 2022-05-26 08:44:23 +00:00
liumengyi 5df98760ae * Fix bug #22995. 2022-05-26 16:38:06 +08:00
hufangzhou 1b33d7a105 * Add the xuanxuan upgrade sql. 2022-05-26 16:32:02 +08:00
liumengyi fc838b26a5 * Fix bug #23000. 2022-05-26 16:09:46 +08:00
tianshujie 79d7990c21 * Fix bug #22994. 2022-05-26 16:00:47 +08:00