Commit Graph
36856 Commits
Author SHA1 Message Date
zhujinyong 9a97e8d11d + Add submodule qucheng. 2022-04-02 10:53:40 +08:00
王怡栋 b799261c19 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2725
2022-04-02 02:39:23 +00:00
tianshujie b2e99c8dd4 * Modify the jump link mode. 2022-04-02 10:37:43 +08:00
tianshujie a9b0b2127a * Fix bug #21401. 2022-04-02 10:26:41 +08:00
孙广明 19c7ce9a37 Merge branch 'mayue_fix_bug#21435' into 'master'
* Fix bug #21435.

See merge request easycorp/zentaopms!2724
2022-04-02 02:23:21 +00:00
孙广明 e04242a2b9 Merge branch 'master_xieqiyu_21382' into 'master'
* Fix bug#21382.

See merge request easycorp/zentaopms!2715
2022-04-02 02:19:19 +00:00
孙广明 3718a90a21 Merge branch 'master_xieqiyu_21383' into 'master'
* Fix bug#21383.

See merge request easycorp/zentaopms!2713
2022-04-02 02:19:05 +00:00
孙广明 3e8175b22e Merge branch 'master_xieqiyu_21385' into 'master'
* Fix bug#21385.

See merge request easycorp/zentaopms!2711
2022-04-02 02:18:37 +00:00
朱金勇 29609debae Merge branch 'sgm_programtest' into 'master'
Sgm programtest

See merge request easycorp/zentaopms!2723
2022-04-02 02:15:35 +00:00
mayue f54b38b241 * Fix bug #21435. 2022-04-02 10:15:33 +08:00
tianshujie bb6581b99a * Fix bug #18273. 2022-04-02 10:14:26 +08:00
tianshujie a1eb251907 * Fix bug #15460,17587. 2022-04-02 10:13:13 +08:00
孙广明 254bd17765 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master'
* Add auto test of kanban.

See merge request easycorp/zentaopms!2722
2022-04-02 02:11:31 +00:00
liumengyi 00df2c288a * Add auto test of kanban. 2022-04-02 10:10:28 +08:00
liumengyi e1681277d6 * Add auto test of kanban. 2022-04-02 10:09:13 +08:00
孙广明 e3e050f3e3 * Add program test. 2022-04-02 09:58:00 +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
李玉春 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
王怡栋 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
xieqiyu 964e484f09 * Fix bug#21382. 2022-04-01 14:47:00 +08: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
xieqiyu 638d4bd8b8 * Fix bug#21383. 2022-04-01 14:40:38 +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
xieqiyu c5eb774fdd * Fix bug#21385. 2022-04-01 14:24:05 +08: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
孙华伟 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