Commit Graph
49442 Commits
Author SHA1 Message Date
zenggang 3e1c744945 * Resolve feedback#1796 2022-12-30 02:12:57 +00:00
liugang 7ebad95bcd * Remove the tooltip of pie circle chart. 2022-12-30 09:31:27 +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
孙广明 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
孙广明 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
兰宗俊 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
田淑杰 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
孙广明 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
孙广明 b41cae08a0 Merge branch 'zentaopms_277_tanghucheng' into 'zentaopms_277'
* Fix issue for gantt icon.

See merge request easycorp/zentaopms!6647
2022-12-29 06:25:35 +00:00
tanghucheng ad83873794 * Fix issue for gantt icon. 2022-12-29 14:22:59 +08:00
孙广明 9b3d6387a5 * Finish task #81192. 2022-12-29 10:55:03 +08:00
xieqiyu cb75585308 * Fix bug#30697. 2022-12-29 10:24:04 +08:00
liugang b3a1c696b2 * Optimize the title of the screen page. zentaopms_18.0.beta3 2022-12-29 09:56:13 +08:00
王怡栋 fc1964e8a8 Merge branch 'sprint/feedback1843' into 'master'
* Fix feedback1843.

See merge request easycorp/zentaopms!6646
2022-12-29 00:17:45 +00:00
王怡栋 c44ac23c73 Merge branch 'sprint/bi_liumengyi_fixbug' into 'master'
* Fix bug #31276.

See merge request easycorp/zentaopms!6644
2022-12-29 00:17:16 +00:00
王怡栋 ddb801568b Merge branch 'feedback_1704' into 'master'
* Resolve feedback#1704

See merge request easycorp/zentaopms!6643
2022-12-29 00:16:39 +00:00
liugang 971f07bfcc * Replace the absolute paths with relative ones. 2022-12-28 17:49:11 +08:00
liugang 3c157f01c4 * Update the builtin screens. 2022-12-28 17:48:55 +08:00
liugang c7dc89a5f2 * Update go view static files. 2022-12-28 17:47:02 +08:00
zhujinyong 32b766bd29 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-28 17:09:48 +08:00
zhujinyong 639caa4fc6 * Fix path of goview. 2022-12-28 17:09:06 +08:00
孙广明 067eb064de Merge branch 'lyk_feedback_1849' into 'master'
* Resolve feedback #1849.

See merge request easycorp/zentaopms!6645
2022-12-28 08:32:12 +00:00
liuyongkai 4d20218f56 * Resolve feedback #1849. 2022-12-28 16:28:59 +08:00
liugang 9c46441f98 * Update the builtin charts and screens. 2022-12-28 16:03:30 +08:00
zenggang bdaaac29fa * Resolve feedback#1704 2022-12-28 07:47:03 +00:00
xieqiyu 4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +08:00
chaideqing c5790ca6e0 * Fix feedback1843. 2022-12-28 14:33:50 +08:00
xieqiyu bb0c7167c9 * Code for task#81187. 2022-12-28 14:20:57 +08:00
liumengyi 5ce56de271 * Fix bug #31276. 2022-12-28 13:57:03 +08:00
xieqiyu 260e043338 * Code for task#81187. 2022-12-28 13:40:27 +08:00
刘洪 5cfe9f1418 Merge branch '280_liuhong_81189' into 'zentaopms_277'
* Finish task 81189.

See merge request easycorp/zentaopms!6642
2022-12-28 03:02:01 +00:00
liuhong 970dc71b2e * Finish task 81189. 2022-12-28 01:33:35 +00:00
朱金勇 ff45544bd9 Merge branch 'sprint/scx_anual' into 'master'
* Fromfeedback and fromticket convert to opened.

See merge request easycorp/zentaopms!6641
2022-12-28 01:06:49 +00:00
xieqiyu 05f2d7665b * Finish task#81193. 2022-12-27 20:22:32 +08:00
王怡栋 4af7ffbfa9 Merge branch 'sprint/konglinmao_optimize_code2' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6640
2022-12-27 08:48:41 +00:00
孔令茂 610e22f948 * Optimize code. 2022-12-27 08:45:32 +00:00
朱金勇 d562a9cf29 Merge branch 'sprint/bi_liumengyi_fixbug' into 'master'
* Fix bug #31236,#31241.

See merge request easycorp/zentaopms!6638
2022-12-27 08:14:03 +00:00