Commit Graph
49946 Commits
Author SHA1 Message Date
tanghucheng 3239f63739 * Fix bug #31351. 2023-01-03 08:49:28 +08:00
tanghucheng d837ce9ac4 * Fix code style. 2022-12-30 14:09:00 +08:00
tanghucheng e6a17511b9 * Update button name. 2022-12-30 14:03:42 +08:00
tanghucheng 720365e1e2 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2022-12-30 14:03:21 +08:00
zhaoke e095b605f5 * Fix bug. 2022-12-30 05:54:20 +00:00
tanghucheng 511d82eb97 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2022-12-30 13:50:44 +08:00
zhaoke 77fe088717 * Fix bug 31350. 2022-12-30 03:58:27 +00:00
zhaoke 06150f10a8 Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng 2022-12-30 03:49:31 +00:00
zhaoke a28da0a6b9 * Remove vnc. 2022-12-30 03:49:24 +00:00
tanghucheng c04a1207d0 * Fix bug. 2022-12-30 10:40:41 +08:00
tanghucheng 58c87b20ed * Add help button for zahost. 2022-12-30 10:37:34 +08:00
tanghucheng 7ca5883d60 * Fix merge issue. 2022-12-30 10:18:13 +08:00
tanghucheng 1e6e94753b * Fix bug. 2022-12-30 09:57:03 +08:00
tanghucheng 4ce729067c Merge branch 'master' into zenops_46 2022-12-30 09:49:34 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
liugang 7ebad95bcd * Remove the tooltip of pie circle chart. 2022-12-30 09:31:27 +08:00
tanghucheng b8331ea6f1 * Fix issue. 2022-12-30 09:01:55 +08:00
孙广明 c1091e4a34 Merge branch 'sprint/272' into 'master'
Sprint/272

See merge request easycorp/zentaopms!6652
2022-12-30 00:50:02 +00:00
田淑杰 b790198243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-30 08:46:01 +08:00
孙广明 137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
tanghucheng 49cb8a7bcb * Fix bug #31328. 2022-12-29 19:28:02 +08:00
tanghucheng 63779ca808 * Finish story #41213. 2022-12-29 19:21:40 +08:00
zhaoke ab54a86aac * Fix bug. 2022-12-29 09:54:58 +00:00
zhaoke 4c4e3e3cf3 * Fix bug 31333. 2022-12-29 09:07:47 +00:00
zhaoke 85a6ec4b91 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2022-12-29 08:28:20 +00:00
zhaoke 6233c7ccd5 * Fix bug. 2022-12-29 08:28:14 +00:00
孙广明 d43c6ea13f Merge branch 'sprint_bug_30923' into 'zentaopms_277'
* Fix bug #30923.

See merge request easycorp/zentaopms!6649
2022-12-29 08:27:38 +00:00
liuhong 421d0b5eaa * Adjust code for bug 30923. 2022-12-29 08:26:22 +00:00
tanghucheng ebf7f1edb8 * Fix bug. 2022-12-29 16:25:34 +08:00
孙广明 a14f2d6fda Merge branch '280_liuhong_task' into 'zentaopms_277'
* Finish task #80189 for Closed plans are not shown in Kanban.

See merge request easycorp/zentaopms!6651
2022-12-29 08:21:31 +00:00
liuhong 06e00bfa61 * Finish task #80189 for Closed plans are not shown in Kanban. 2022-12-29 08:03:56 +00:00
xieqiyu 63149fd719 * Finish task#81540. 2022-12-29 15:53:34 +08:00
tanghucheng 8f96b6da84 * Fix bug #31323. 2022-12-29 15:47:34 +08:00
兰宗俊 9f857c92f3 Merge branch 'sprint/zentaopms277_lanzongjun' into 'zentaopms_277'
* Finish Task #81166

See merge request easycorp/zentaopms!6650
2022-12-29 07:45:56 +00:00
lanzongjun b3c3ca18ad * Finish Task #81166 2022-12-29 15:43:47 +08:00
tanghucheng 4d6e127f4e * Fix bug. 2022-12-29 15:42:07 +08:00
tanghucheng ce733f18f7 Merge branch 'zenops_46_tanghucheng' into zenops_46 2022-12-29 15:38:13 +08:00
tanghucheng e1162e3582 * Fix bug . 2022-12-29 15:37:36 +08:00
田淑杰 866b4086e8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-29 15:22:13 +08:00
孙广明 eb7dce8e88 * Fix code style. 2022-12-29 15:21:59 +08:00
tianshujie a1fe18b99d * code for bug #81093 2022-12-29 15:17:18 +08:00
liuhong 4b5d820e71 * Fix bug #30923. 2022-12-29 07:15:10 +00:00
tianshujie 2ed3974bc6 * code for bug #81093 2022-12-29 15:14:34 +08:00
孙广明 6df3f17c89 * Exec for dm db. 2022-12-29 14:56:03 +08:00
zhaoke b49579e153 Merge branch 'zenops_46_tanghucheng' into zenops_46 2022-12-29 06:55:36 +00:00
zhaoke 7c2cbd2a79 * Fix bug. 2022-12-29 06:50:26 +00:00
zhaoke 51877249ba * Fix bug. 2022-12-29 06:47:43 +00:00
孙广明 4f8435978d Merge branch 'zhouxin_feedback_843' into 'master'
* Resolve feedback #843.

See merge request easycorp/zentaopms!6648
2022-12-29 06:44:29 +00:00
朱金勇 3cbc18f277 Merge branch 'fix_feishu_webhook' into 'master'
* Fix feishu webhook missing msg_type when no secret.

See merge request easycorp/zentaopms!6623
2022-12-29 06:42:49 +00:00
zhouxin bf3ef7a9ab * Resolve feedback #843. 2022-12-29 06:41:40 +00:00