Commit Graph
36843 Commits
Author SHA1 Message Date
Zongjun Lan 1542533e44 * fix bug #21455#21413 2022-04-02 14:36:13 +08:00
Zongjun Lan 8c09028685 * fix bug #21422 2022-04-02 13:13:35 +08:00
Zongjun Lan f61cdef8d0 * fix bug #21424 2022-04-02 10:56:10 +08:00
Zongjun Lan b3c861aa05 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-02 09:59:54 +08:00
孙广明 03bd3c1d0f Merge branch 'autotest_ly' into 'master'
Autotest ly

See merge request easycorp/zentaopms!2721
2022-04-02 01:56:29 +00:00
liyang 69936fdde5 add test by my 2022-04-02 09:54:04 +08:00
Zongjun Lan 875db6213f * fix bug #19905 2022-04-02 09:45:58 +08:00
李玉春 d993fe3734 Merge branch 'sunhuawei_fixbug_21235' into 'master'
Sunhuawei fixbug 21235

See merge request easycorp/zentaopms!2665
2022-04-01 09:22:07 +00:00
李玉春 bff38426e0 Merge branch 'sunhuawei_fixbug_20272' into 'master'
*Fix bug#20272.

See merge request easycorp/zentaopms!2703
2022-04-01 09:21:12 +00:00
liyang 21f921ee76 update data 2022-04-01 17:20:59 +08:00
李玉春 82647a8138 Merge branch 'sunhuawei_fixbug_19073' into 'master'
*Fix bug#19073.

See merge request easycorp/zentaopms!2707
2022-04-01 09:20:25 +00:00
孙广明 2aa0fb72b8 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #12208.

See merge request easycorp/zentaopms!2719
2022-04-01 07:53:07 +00:00
李玉春 31447671cb Merge branch 'sprint/scx_getBuilds' into 'master'
* Fix product.php builds bug.

See merge request easycorp/zentaopms!2717
2022-04-01 07:52:07 +00:00
tianshujie 4503f0b9d8 * Fix bug #12208. 2022-04-01 15:50:34 +08:00
songchenxuan 88fb85c27b * Fix product.php builds bug. 2022-04-01 15:47:02 +08:00
Zongjun Lan 7773a8a530 * fix bug kanban prev 2022-04-01 15:32:36 +08:00
Zongjun Lan 0ad0b1938c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-01 15:32:11 +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
Zongjun Lan 06f066f45d * fix bug #18722 2022-04-01 14:15:11 +08:00
孙华伟 2c5a94c243 *Fix bug#19073. 2022-04-01 14:12:09 +08: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
孙华伟 05a4805660 *Fix bug#20272. 2022-04-01 11:27:47 +08: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