Commit Graph
32185 Commits
Author SHA1 Message Date
mayue 512a7dcf78 * Fix bug #21616. 2022-04-11 09:29:24 +08:00
mayue a8d114fe3c * Fix bug #21616. 2022-04-11 09:19:19 +08:00
zhouxin 50fe51a2e5 * Fix bug #21320. 2022-04-11 01:18:40 +00:00
tianshujie 4a80b55540 * Fix bug #21210. 2022-04-11 09:16:55 +08:00
mayue 327ff13564 * Fix bug #21616. 2022-04-11 09:07:38 +08:00
xieqiyu ee5d43bea9 * Fix bug#18080. 2022-04-11 08:53:28 +08:00
孙广明 bc910099e5 Merge branch 'fixbugs_zhouxin_20812' into 'master'
* Fix bug #20812.

See merge request easycorp/zentaopms!2832
2022-04-11 00:40:25 +00:00
mayue a9c203b866 * Fix bug #21616. 2022-04-11 08:38:13 +08:00
孙广明 93fc1c2617 Merge branch 'master_xieqiyu_19709' into 'master'
* Fix bug#19709.

See merge request easycorp/zentaopms!2831
2022-04-11 00:30:00 +00:00
李玉春 18645df3f2 Merge branch 'devops25_52088' into 'master'
Fix bug#20630

See merge request easycorp/zentaopms!2829
2022-04-11 00:26:38 +00:00
孙广明 9d8df16da8 * Add testtask. 2022-04-09 15:58:16 +08:00
朱金勇 43c2eafac9 Merge branch 'sprint/autoTest_liumengyi_testcase' into 'master'
* Add auto test of testcase and fix bug.

See merge request easycorp/zentaopms!2833
2022-04-08 07:47:07 +00:00
liumengyi 8b2a7bee76 * Add auto test of testcase and fix bug. 2022-04-08 15:44:22 +08:00
王怡栋 c336a9fa38 Merge branch 'sprint/tianshujie_bug21210' into 'master'
* Fix bug #21210.

See merge request easycorp/zentaopms!2821
2022-04-08 07:40:00 +00:00
王怡栋 269ec99ade Merge branch 'sprint/fixbug_hufangzhou_21372' into 'master'
* Fix bug #21372.

See merge request easycorp/zentaopms!2830
2022-04-08 07:38:19 +00:00
王怡栋 22adeeba0e Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21598#21419#21424#21577

See merge request easycorp/zentaopms!2827
2022-04-08 07:34:19 +00:00
zhouxin 30af3cd8ee * Fix bug #20812. 2022-04-08 07:33:19 +00:00
Zongjun Lan b9ba152440 * fix bug #21577 2022-04-08 15:24:17 +08:00
xieqiyu d31aeedc89 * Fix bug#19709. 2022-04-08 15:02:08 +08:00
Zongjun Lan 4a0897daf5 * fix bug #21419 2022-04-08 14:31:28 +08:00
hufangzhou 664ed9bda8 * Fix bug #21372. 2022-04-08 14:30:57 +08:00
zenggang f69222b56e * Fix bug#20630 2022-04-08 06:24:00 +00:00
朱金勇 a56b1a77c9 Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest

See merge request easycorp/zentaopms!2813
2022-04-08 06:06:55 +00:00
tianshujie 63946bb238 * Fix bug #18781. 2022-04-08 14:06:42 +08:00
朱金勇 0c23ddd5f7 Merge branch 'sprint/sunhao/bug16555' into 'master'
* bug #16555, remove scrollbar when drag item to outside of kanban.

See merge request easycorp/zentaopms!2799
2022-04-08 06:06:13 +00:00
朱金勇 08f9f8e1e6 Merge branch 'sprint/sunhao/optimize_ajax_dropmenu' into 'master'
* fix search and redirect in ajax dropmenu not work as expected sometimes.

See merge request easycorp/zentaopms!2823
2022-04-08 06:05:50 +00:00
朱金勇 1518796b03 Merge branch 'app_zry' into 'master'
* Fix bug 21591.

See merge request easycorp/zentaopms!2828
2022-04-08 06:05:36 +00:00
zhengrunyu a7d7cca753 * Fix bug 21591. 2022-04-08 14:03:21 +08:00
王怡栋 d78a7aeb2a Merge branch '165_package' 2022-04-08 13:55:52 +08:00
tianshujie ce869a399b * Fix bug #12474. 2022-04-08 13:53:05 +08:00
孙广明 fcb173bc92 Merge branch 'fixbugs_zhouxin_16635' into 'master'
* Fix bug #16635.

See merge request easycorp/zentaopms!2825
2022-04-08 05:34:57 +00:00
zhouxin 56f05dd70c * Fix bug #16635. 2022-04-08 05:27:16 +00:00
王怡栋 b8730570f2 Merge branch 'sprint/xuanxuan_97' into 'master'
* fix show ... when text too long in xuanxuan card

See merge request easycorp/zentaopms!2822
2022-04-08 05:09:40 +00:00
Hao Sun 281ad7e876 * fix search and redirect in ajax dropmenu not work as expected sometimes. 2022-04-08 11:43:35 +08:00
孙广明 b32fe697fa Merge branch 'master_xieqiyu_19196' into 'master'
* Fix bug#19196.

See merge request easycorp/zentaopms!2817
2022-04-08 03:28:32 +00:00
王怡栋 53b0cd0c57 * code for bug #20133. 2022-04-08 11:27:23 +08:00
王怡栋 afe486b631 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-08 11:17:46 +08:00
王怡栋 168a6d88e6 * fix bug #21217. 2022-04-08 11:17:31 +08:00
zhouxudong d60ce0159c * Fix bug #17994. 2022-04-08 11:15:16 +08:00
tianshujie dc8d65045b * Fix bug #21210. 2022-04-08 11:14:13 +08:00
李玉春 d6c50c10af Merge branch 'fixbug_sunjun_17344' into 'master'
*Fixbug_sunjun_17344

See merge request easycorp/zentaopms!2820
2022-04-08 03:06:16 +00:00
sunjun 43f398b9e2 *Fixbug_sunjun_17344 2022-04-08 11:04:24 +08:00
李玉春 a3328cb76a Merge branch 'cyy_bug' into 'master'
* Fix bug #17175.

See merge request easycorp/zentaopms!2814
2022-04-08 03:03:55 +00:00
李玉春 5499e1a20e Merge branch 'fixbug_sunjun_17344' into 'master'
*Fixbug_sunjun_17344

See merge request easycorp/zentaopms!2816
2022-04-08 03:00:58 +00:00
sunjun 854da450be *Fixbug_sunjun_17344 2022-04-08 10:58:29 +08:00
孙华伟 ebae3177ba *Fix bug#21488. 2022-04-08 10:40:19 +08:00
王怡栋 0ebf3671d1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-08 10:18:12 +08:00
孙广明 e2d5fe33e1 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #20986.

See merge request easycorp/zentaopms!2818
2022-04-08 02:17:04 +00:00
王怡栋 63761f3d23 * adjust for icon-version. 2022-04-08 10:13:35 +08:00
sunjun 95b2c3317a *Fixbug_sunjun_17344 2022-04-08 10:11:16 +08:00