Commit Graph
37222 Commits
Author SHA1 Message Date
tianshujie f2aa066bdc * Fix bug #19261. 2022-04-11 13:19:18 +08:00
tianshujie 1a861ef225 * Fix bug #18710. 2022-04-11 13:15:41 +08:00
tianshujie c1232cef69 * Fix bug #21633. 2022-04-11 10:49:00 +08:00
孙广明 ccd84601f3 Merge branch 'sprint/tianshujie_bug21210' into 'master'
* Fix bug #21210.

See merge request easycorp/zentaopms!2843
2022-04-11 02:22:55 +00:00
孙广明 d561fb5dd4 Merge branch 'sprint/tianshujie_bug21631' into 'master'
* Fix bug #21631.

See merge request easycorp/zentaopms!2842
2022-04-11 02:22:00 +00:00
tianshujie edc9f9a75a * Fix bug #21631. 2022-04-11 10:17:52 +08:00
孙广明 08bbc2cb98 Merge branch 'mayue_fix_bug#16601' into 'master'
* Fix bug #16601.

See merge request easycorp/zentaopms!2840
2022-04-11 02:07:56 +00:00
mayue 7efe1e3726 * Fix bug #16601. 2022-04-11 10:05:00 +08:00
李玉春 8847f7863d Merge branch 'mayue_fix_bug#21616' into 'master'
* Fix bug #21616.

See merge request easycorp/zentaopms!2836
2022-04-11 01:47:15 +00:00
mayue 2cdf6f1e98 * Fix bug #21616. 2022-04-11 09:44:40 +08:00
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
tianshujie 4a80b55540 * Fix bug #21210. 2022-04-11 09:16:55 +08:00
孙广明 4655f8551d Merge branch 'autotest_ly' into 'master'
update build data

See merge request easycorp/zentaopms!2838
2022-04-11 01:14:11 +00:00
liyang 8e749be5d9 update build data 2022-04-11 09:13:11 +08:00
朱金勇 ec9aef0807 Merge branch 'sprint/scx_api' into 'master'
* Fix api format data bug.

See merge request easycorp/zentaopms!2835
2022-04-11 01:10:52 +00:00
mayue 327ff13564 * Fix bug #21616. 2022-04-11 09:07:38 +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
songchenxuan 0654bcc2ad * Fix api format data bug. 2022-04-08 16:03:03 +08:00
朱金勇 f18d965783 Merge branch 'autotest_ly' into 'master'
Autotest ly

See merge request easycorp/zentaopms!2834
2022-04-08 07:49:14 +00: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
liyang 38e147b334 update testtask data 2022-04-08 15:41:52 +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
liyang 4ff42a2f18 add design unittest 2022-04-08 15:37:26 +08: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 19d4f476f7 * fix bug #21424 2022-04-08 14:45:48 +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
朱金勇 ac66966bca Merge branch 'sprint/sunhao/bug21160' into 'master'
* bug #21160, optimize chosen UI.

See merge request easycorp/zentaopms!2808
2022-04-08 06:06:02 +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
孙广明 24b9cf3c46 Merge branch 'autotest_ly' into 'master'
update test data

See merge request easycorp/zentaopms!2826
2022-04-08 05:50:17 +00:00
Zongjun Lan 0145f5a790 * fix bug #21598 2022-04-08 13:50:09 +08:00
liyang 7afa047679 update test data 2022-04-08 13:47:55 +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