Commit Graph
36818 Commits
Author SHA1 Message Date
mayue d6a3a38d0a * Optimize code. 2022-04-02 09:08:39 +08:00
mayue 215595c36b * Fix bug #21359. 2022-04-01 15:35:38 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
朱金勇 39df077d60 Merge branch 'sprint/sunhao/bug18283' into 'master'
* bug #18283, prevent go prev/next item by hotkey when page has focused form control.

See merge request easycorp/zentaopms!2706
2022-04-01 07:26:24 +00:00
孙广明 cba8bf356a Merge branch 'sprint/tianshujie_bug20789' into 'master'
Sprint/tianshujie bug20789

See merge request easycorp/zentaopms!2714
2022-04-01 06:46:02 +00:00
tianshujie 7cc5ae09e2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-01 14:42:43 +08:00
孙广明 8f7c929c4a Merge branch 'fixbugs_zhouxin_20288' into 'master'
* Fix bug #20288.

See merge request easycorp/zentaopms!2709
2022-04-01 06:36:42 +00:00
孙广明 f0760ea0f6 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2712
2022-04-01 06:36:24 +00:00
zhouxin b980998c42 * Fix bug 20288. 2022-04-01 06:35:26 +00:00
tianshujie 7407aabc00 * Fix bug #19104. 2022-04-01 14:32:00 +08:00
zhouxin 4f195dceba * Fix bug #20288. 2022-04-01 06:31:52 +00:00
孙广明 38e5c5d2f5 Merge branch 'fixbugs_zhouxin_11804' into 'master'
* Fix bug #11804.

See merge request easycorp/zentaopms!2710
2022-04-01 06:23:23 +00:00
zhouxin 52f8024543 * Fix bug #20288. 2022-04-01 06:17:30 +00:00
Hao Sun f1be1d87bb * bug #18283, prevent go prev/next item by hotkey when page has focused form control. 2022-04-01 14:09:02 +08:00
孙广明 3c502198a8 Merge branch 'mayue_fix_bug#16601' into 'master'
* Fix bug #16601.

See merge request easycorp/zentaopms!2705
2022-04-01 06:05:55 +00:00
tianshujie b9dc9b118e * Fix bug #19676. 2022-04-01 14:05:06 +08:00
孙广明 c29914b58b Merge branch 'mayue_fix_bug#20316' into 'master'
* Fix bug #20316.

See merge request easycorp/zentaopms!2674
2022-04-01 06:04:15 +00:00
mayue d4eb0ef746 * Fix bug #16601. 2022-04-01 14:02:22 +08:00
tianshujie 6efb224b7b * Fix bug #18033. 2022-04-01 13:39:36 +08:00
tianshujie f7fd08aaa3 * Fix bug #20789. 2022-04-01 13:27:26 +08:00
孙广明 8e826135a6 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Add auto test of kanban.

See merge request easycorp/zentaopms!2704
2022-04-01 05:02:55 +00:00
liumengyi 9526170961 * Add auto test of kanban. 2022-04-01 13:02:02 +08:00
王怡栋 e052b84ac4 Merge branch 'sprint/fixbug_hufangzhou_15961' into 'master'
Sprint/fixbug hufangzhou 15961

See merge request easycorp/zentaopms!2701
2022-04-01 03:30:53 +00:00
王怡栋 dec6eba5b2 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21336,21296.

See merge request easycorp/zentaopms!2700
2022-04-01 03:29:18 +00:00
王怡栋 6952a16e84 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20256

See merge request easycorp/zentaopms!2692
2022-04-01 03:28:18 +00:00
zhouxin b09c75a026 * Fix bug #11804. 2022-04-01 03:11:21 +00:00
hufangzhou c74f8f2b5a * Modify the checkbox style of api edit page. 2022-04-01 11:01:30 +08:00
tanghucheng b8aec834dd * Fix bug #21296,21336. 2022-04-01 10:56:35 +08:00
hufangzhou b2543e022f * Fix bug #15961. 2022-04-01 10:56:30 +08:00
孙广明 55040695e4 Merge branch 'sprint/tianshujie_upgrade' into 'master'
* Fixed the issue of missing project whitelist when upgrading to classic mode.

See merge request easycorp/zentaopms!2696
2022-04-01 02:54:32 +00:00
李玉春 ca26374c57 Merge branch 'sprint/master_zhouxudong_13765' into 'master'
Sprint/master zhouxudong 13765

See merge request easycorp/zentaopms!2699
2022-04-01 02:51:56 +00:00
孙广明 67e3a3b4c4 Merge branch 'sunhuawei_fixbug_15989' into 'master'
Sunhuawei fixbug 15989

See merge request easycorp/zentaopms!2681
2022-04-01 02:50:22 +00:00
李玉春 d5101149e9 Merge branch 'devops24_51065' into 'master'
Fix bug#11161

See merge request easycorp/zentaopms!2693
2022-04-01 02:49:15 +00:00
zhouxudong bd13abc6b4 * Fix bug #13765. 2022-04-01 10:47:35 +08:00
李玉春 4e4cdac991 Merge branch 'sprint/scx_storybug' into 'master'
* Fix change story bug .

See merge request easycorp/zentaopms!2698
2022-04-01 02:47:18 +00:00
李玉春 1a5e64aea0 Merge branch 'app_zry' into 'master'
* Fix bug 21353.

See merge request easycorp/zentaopms!2697
2022-04-01 02:45:07 +00:00
songchenxuan d424737aff * Fix change story bug . 2022-04-01 10:42:05 +08:00
zhengrunyu 1a1437be02 * Fix bug 21353. 2022-04-01 10:38:21 +08:00
tianshujie 54e5865653 * Fixed the issue of missing project whitelist when upgrading to classic mode. 2022-04-01 10:29:29 +08:00
孙广明 1d7982f458 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2694
2022-04-01 02:15:55 +00:00
tianshujie 37bfaafccc * Fixed the issue that the product whitelist was lost when upgrading to classic mode. 2022-04-01 10:13:37 +08:00
zenggang d63710351c * Fix bug#11161 2022-04-01 02:06:20 +00:00
孙广明 0698a68ff2 Merge branch 'autotest_feilun' into 'master'
caselib and projectrelease

See merge request easycorp/zentaopms!2691
2022-04-01 02:05:58 +00:00
Zongjun Lan bbea31bd09 * fix bug #20256 2022-04-01 10:01:48 +08:00
王怡栋 c618f0e616 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20310

See merge request easycorp/zentaopms!2689
2022-04-01 01:55:39 +00:00
王怡栋 f5c9b94b82 Merge branch 'sprint/xuanxuan_96' into 'master'
Sprint/xuanxuan 96

See merge request easycorp/zentaopms!2687
2022-04-01 01:54:46 +00:00
zhangxuwen 8b5cdecb62 caselib and projectrelease 2022-04-01 09:39:40 +08:00
zhouxudong 0e710b9f82 * Fix bug #13765. 2022-04-01 09:36:18 +08:00
李玉春 6e699c4561 Merge branch 'sprint/scx_fixstoryapi' into 'master'
* Fix a bug where requirements could not be created under a project or execution.

See merge request easycorp/zentaopms!2688
2022-04-01 01:20:20 +00:00
李玉春 8e433952a2 Merge branch 'mayue_fix_bug#17360' into 'master'
* Fix bug #17360.

See merge request easycorp/zentaopms!2690
2022-04-01 01:17:48 +00:00