Commit Graph
49978 Commits
Author SHA1 Message Date
xieqiyu bc620ef34d * Code for task#81779. 2023-01-03 17:36:33 +08:00
xieqiyu 62070301f4 * Code for task#81779. 2023-01-03 17:04:09 +08:00
孙广明 57c4f5329d Merge branch 'bug_liuhong_30537' into 'zentaopms_281'
Bug liuhong 30537

See merge request easycorp/zentaopms!6664
2023-01-03 05:54:30 +00:00
孙广明 f5f9b93684 Merge branch '281_liuhong_81781' into 'zentaopms_281'
* Finish task #81781.

See merge request easycorp/zentaopms!6665
2023-01-03 05:54:16 +00:00
liuhong b922f85ecd * Finish task #81781. 2023-01-03 04:50:20 +00:00
xieqiyu 5a2b75d24f * Finish task#81780. 2023-01-03 10:59:35 +08:00
liuhong da18b4b7f0 * Adjust code for bug #30537. 2023-01-03 02:33:48 +00:00
liuhong 9bd8f21ac6 * Fix bug #30537. 2023-01-03 02:22:37 +00:00
wangyidong ccec9bcc16 Merge branch 'zentaopms279' 2023-01-03 08:39:33 +08:00
朱金勇 96871c4f38 Merge branch 'lyk_31251' into 'master'
* Fix bug #31251.

See merge request easycorp/zentaopms!6660
2022-12-30 11:28:26 +00:00
liuyongkai 43e79f8809 * Fix bug #31251. 2022-12-30 19:18:38 +08:00
孙广明 8f632d7de8 Merge branch 'zenops_46' into 'master'
Merge zenops 46 into master

See merge request easycorp/zentaopms!6656
2022-12-30 09:50:44 +00:00
zhaoke 064f241de0 * Add clear interval. 2022-12-30 09:42:19 +00:00
liugang 6c16d840d5 * Optimize the display label of story of the program statistic. 2022-12-30 15:41:10 +08:00
王怡栋 99470be30e Merge branch 'cyy_optimize' into 'master'
* Modify text style.

See merge request easycorp/zentaopms!6658
2022-12-30 07:19:05 +00:00
caoyanyi 597b11524f * Modify text style. 2022-12-30 15:09:44 +08:00
wangyidong be81b08952 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-30 14:48:49 +08:00
wangyidong 6a27d4d272 Merge branch 'feedback_1796' 2022-12-30 14:48:08 +08:00
wangyidong f85db70c20 * adjust for save weekly. 2022-12-30 14:46:20 +08:00
孙广明 b34e312e86 * Fix bug #31353. 2022-12-30 14:18:50 +08:00
tanghucheng d837ce9ac4 * Fix code style. 2022-12-30 14:09:00 +08:00
liugang de8f9e6372 * Update the count of closed projects of each year. 2022-12-30 14:08:25 +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
曾刚 c6cfa19dd9 Merge branch 'master' into 'feedback_1796'
# Conflicts:
#   module/testcase/js/browse.js
2022-12-30 05:45:51 +00:00
王怡栋 913eb916f2 Merge branch 'feekback#1865' into 'master'
* Resolved feedback #1865, create project error when chose no sprint type and...

See merge request easycorp/zentaopms!6655
2022-12-30 05:32:15 +00:00
孔令茂 69a916745a * Resolved feedback #1865, create project error when chose no sprint type and multiple product's main branch. 2022-12-30 05:29:10 +00: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
liugang e172271882 * Display chinese month label on x-axis. 2022-12-30 11:26:14 +08:00
孙广明 0627d5b46b Merge branch 'zenops_46' into 'master'
Merge branch zenops_46 into 'master'

See merge request easycorp/zentaopms!6653
2022-12-30 02:54:13 +00:00
孙广明 b2a41c76d6 * Fix locate bug. 2022-12-30 10:50:36 +08: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
zenggang 5aa6762e18 * Adjust code 2022-12-30 02:15:31 +00:00
zenggang 3e1c744945 * Resolve feedback#1796 2022-12-30 02:12:57 +00: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