Commit Graph
39635 Commits
Author SHA1 Message Date
孙广明 4e913acb10 Merge branch 'sprint/master_zhiuxudong_55626' into 'sprint/196'
Sprint/master zhiuxudong 55626

See merge request easycorp/zentaopms!3664
2022-05-31 07:01:18 +00:00
王怡栋 375444f16e Merge branch 'sprint/master_zhouxudong_22936' into 'master'
* Fix bug #29936.

See merge request easycorp/zentaopms!3658
2022-05-31 06:18:51 +00:00
王怡栋 47ab52884d Merge branch 'sprint/193_hufangzhou_23093' into 'master'
* Fix bug #23093.

See merge request easycorp/zentaopms!3663
2022-05-31 06:14:01 +00:00
zhouxudong 93e753b39e * Finish task #55619 #55626. 2022-05-31 06:03:37 +00:00
hufangzhou 2e494852df * Fix bug #23093. 2022-05-31 13:58:25 +08:00
王怡栋 2f5befb470 Merge branch 'sgm_fixbug' into 'master'
* Fix upgrade bug.

See merge request easycorp/zentaopms!3661
2022-05-31 03:57:32 +00:00
孙广明 ef40b0e3c5 * Fix upgrade bug. 2022-05-31 11:41:20 +08:00
朱金勇 4410f1fb0b Merge branch 'master_liwenrui_bugfix_xuan' into 'master'
* fix client related issues.

See merge request easycorp/zentaopms!3653
2022-05-31 03:35:32 +00:00
Wenrui LI 2a98caf35a * fix langName not set for web client. 2022-05-31 11:32:47 +08:00
Wenrui LI 96d4a06f35 * fix client notification. 2022-05-31 11:29:31 +08:00
李玉春 1020c941bf Merge branch 'cyy_fixbug' into 'master'
* Modify editor saved bug.

See merge request easycorp/zentaopms!3660
2022-05-31 02:22:40 +00:00
caoyanyi 55fe921331 * Modify editor saved bug. 2022-05-31 10:20:37 +08:00
zhouxudong d67617d5ce * Fix bug #29936. 2022-05-31 00:17:10 +00:00
xieqiyu 037a010a6f * Code for task#55626. 2022-05-31 00:11:29 +08:00
zhouxudong afa9003035 * Finisha task #55626 #55619. 2022-05-31 05:09:49 +00:00
王怡栋 cf8fcb2c39 Merge branch 'sprint/193_hufangzhou_23058' into 'master'
* Fix bug #23058.

See merge request easycorp/zentaopms!3656
2022-05-30 09:15:10 +00:00
wangyidong a899fad671 * check $_SERVER['REQUEST_URI'] var. 2022-05-30 17:06:18 +08:00
hufangzhou 48b0d60744 * Fix bug #23058. 2022-05-30 10:26:37 +08:00
李玉春 ba24d53a03 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3655
2022-05-30 02:05:18 +00:00
tianshujie 240cefb5df * Fixed kanban card style issues. 2022-05-30 09:21:39 +08:00
李玉春 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
tianshujie e037b9c102 * Fixed kanban card avatar style. 2022-05-30 09:14:58 +08: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
Wenrui LI b627bab5a0 * filter out all xuan actions. 2022-05-29 13:46:24 +08: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