Commit Graph
39740 Commits
Author SHA1 Message Date
王怡栋 10ca474547 Merge branch 'master_xieqiyu_23185' into 'master'
* Fix bug#23185.

See merge request easycorp/zentaopms!3707
2022-06-02 03:10:24 +00:00
王怡栋 c470517b65 Merge branch 'sprint/196_changelog' into 'master'
* Add the changelog.

See merge request easycorp/zentaopms!3704
2022-06-02 02:25:41 +00:00
王怡栋 d55ae34a7f Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of select main branch.

See merge request easycorp/zentaopms!3705
2022-06-02 02:25:23 +00:00
hufangzhou a01ab08649 * Add the changelog. 2022-06-02 10:07:16 +08:00
孙广明 c2791dbb4c Merge branch 'sprint/196_leiyong_task_55622' into 'master'
Sprint/196 leiyong task 55622

See merge request easycorp/zentaopms!3697
2022-06-02 01:59:24 +00:00
王怡栋 e6d33a31b4 Merge branch 'sprint/196_hufangzhou_package' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!3702
2022-06-02 01:14:05 +00:00
hufangzhou b4fd618491 * Add the new version. 2022-06-02 09:10:04 +08:00
zhujinyong 9a2933df72 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-02 08:33:12 +08:00
zhujinyong cc42a0e685 Merge branch 'sprint/sunhao/fix_picker' 2022-06-02 08:33:01 +08:00
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
李玉春 8ec70e4495 Merge branch 'sprint/197_sunhao/fix_kanban_virtual_render' into 'sprint/197'
* fix kanban virtual render not work as expected.

See merge request easycorp/zentaopms!3698
2022-06-02 00:26:24 +00:00
xieqiyu 1a24cdbc80 * Fix bug#23185. 2022-06-01 21:29:30 +08:00
xieqiyu c1bc3c7d41 * Fix bug of select main branch. 2022-06-01 20:44:31 +08:00
Hao Sun d20d2b15bc * fix kanban virtual render not work as expected. 2022-06-01 09:44:58 +00:00
leiyong 449d092eb2 * Update language items. 2022-06-01 09:31:17 +00:00
李玉春 d3a2dfa0c7 Merge branch 'fixbug_sunjun_22531' into 'master'
fixbug_sunjun_22531

See merge request easycorp/zentaopms!3696
2022-06-01 09:24:50 +00:00
孙广明 302f449334 Merge branch 'sprint/197_zhouxin_23168' into 'sprint/197'
* Fix bug #23168.

See merge request easycorp/zentaopms!3695
2022-06-01 09:18:35 +00:00
Hao Sun c9febeb72b * fix picker not work in page story-create. 2022-06-01 09:14:49 +00:00
sunjun 1c8db1da3a fixbug_sunjun_22531 2022-06-01 09:14:12 +00:00
zhouxin fd6fe986ad * Fix bug #23168. 2022-06-01 09:14:08 +00:00
孙广明 c671cc3186 Merge branch 'sprint/197_zhouxin_55674' into 'sprint/197'
Sprint/197 zhouxin 55674

See merge request easycorp/zentaopms!3691
2022-06-01 08:57:31 +00:00
zhouxin cda4d7e809 * Adjust code. 2022-06-01 08:56:49 +00:00
王怡栋 b0e97a47e0 Merge branch 'master_xieqiyu_55631' into 'master'
* Finish task#55631.

See merge request easycorp/zentaopms!3686
2022-06-01 08:47:08 +00:00
王怡栋 2186a1cff9 Merge branch 'sprint/tianshujie_bug23117' into 'master'
* Fix bug #23117.

See merge request easycorp/zentaopms!3692
2022-06-01 08:41:20 +00:00
孙广明 235a08a377 Merge branch 'sprint/liumengyi_50321' into 'master'
* Fix bug #50321, #23110, #23109.

See merge request easycorp/zentaopms!3693
2022-06-01 08:34:48 +00:00
孙广明 f2ede17de4 Merge branch 'sprint/sunhao/fix_min_burn' into 'master'
* limit min width for mini burn chart.

See merge request easycorp/zentaopms!3689
2022-06-01 08:32:51 +00:00
liumengyi 06a0bb6f03 * Fix bug #23110, #23109. 2022-06-01 16:27:03 +08:00
liumengyi 873df65437 * Fix bug #50321. 2022-06-01 16:23:25 +08:00
tianshujie c8a4fdd798 * Fix bug #23117. 2022-06-01 16:11:30 +08:00
zhouxin 2fcd623c62 * Adjust code. 2022-06-01 07:48:32 +00:00
Hao Sun ba1bef29e0 * limit min width for mini burn chart. 2022-06-01 15:40:27 +08:00
zhouxin bc803e56c8 * Finish task #55676. 2022-06-01 07:34:04 +00:00
leiyong 967861a589 * Finish task#55622. 2022-06-01 07:22:32 +00:00
孙广明 266cf3c0c9 Merge branch 'sprint/tianshujie_55681' into 'sprint/197'
Sprint/tianshujie 55681

See merge request easycorp/zentaopms!3688
2022-06-01 07:10:11 +00:00
tianshujie 095c9b5501 * Finish task #55681. 2022-06-01 15:07:35 +08:00
孙广明 7da0bea1d6 Merge branch 'sprint/197_liumengyi_55677' into 'master'
* Finish tash #55677.

See merge request easycorp/zentaopms!3684
2022-06-01 06:51:37 +00:00
孙广明 a8e0efeaf2 Merge branch 'sprint/197_tianshujie_55675' into 'sprint/197'
Sprint/197 tianshujie 55675

See merge request easycorp/zentaopms!3680
2022-06-01 06:50:23 +00:00
孙广明 270c56cb96 Merge branch 'sprint/master_zhouxudong_23108' into 'master'
* Fix bug #23129 #23126 #23108.

See merge request easycorp/zentaopms!3685
2022-06-01 06:49:09 +00:00
tianshujie aec74869fe * Finish task #55675. 2022-06-01 14:47:21 +08:00
liumengyi d93d30e2d7 * Optimize code for task #55677. 2022-06-01 14:39:11 +08:00
zhouxudong 5c3ac663e6 * Fix bug #23129 #23126 #23108. 2022-06-01 06:30:45 +00:00
liumengyi 07bebde892 * Fix bug for #task #55677. 2022-06-01 14:28:51 +08:00
liumengyi 61ef8e945f * Fix bug for #task #55677. 2022-06-01 14:27:56 +08:00
tianshujie 3e10f3d0c9 * Finish task #55675. 2022-06-01 14:25:44 +08:00
tianshujie 78d38d7723 Merge branch 'sprint/197_tianshujie_55675' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/197_tianshujie_55675 2022-06-01 13:51:08 +08:00
tianshujie 7a70ae8481 * Finish task #55675. 2022-06-01 13:50:53 +08:00
liumengyi 384240bb75 * Finish task #55681. 2022-06-01 13:47:27 +08:00
tianshujie b076635c79 * Finish task #55675. 2022-06-01 13:32:34 +08:00
tianshujie 5d62ed5900 * Finish task #55675. 2022-06-01 13:06:26 +08:00
tianshujie b9a37d04a2 * Finish task #55675. 2022-06-01 11:08:51 +08:00