Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
37,631 Commits 2 Branches 292 Tags
88a121686f5d02713702e6267794c1aa305dfd58
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
孙广明 88a121686f Merge branch 'fixbugs_zhouxin' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!2996
 2022-04-18 08:58:38 +00:00
孙广明 878f310f3d Merge branch 'liyuchun_fixbug_21518' into 'master' 
* Fix bug #21518.

See merge request easycorp/zentaopms!2979
 2022-04-18 07:55:45 +00:00
孙广明 922f06724d Merge branch 'dht_personnel' into 'master' 
add productsonplan.ymal and personnel|projectstory unittest

See merge request easycorp/zentaopms!2987
 2022-04-18 07:35:17 +00:00
孙广明 f14b947f2d Merge branch 'sprint/mastr_zhouxudong_20867' into 'master' 
* Fix bug #20867.

See merge request easycorp/zentaopms!2992
 2022-04-18 07:35:03 +00:00
孙广明 10d95940b6 Merge branch 'master_xieqiyu_14454' into 'master' 
* Fix bug#14454.

See merge request easycorp/zentaopms!2981
 2022-04-18 07:12:34 +00:00
孙广明 46e367c455 Merge branch 'master_xieqiyu_19379' into 'master' 
* Fix bug#19379.

See merge request easycorp/zentaopms!2989
 2022-04-18 07:12:12 +00:00
孙广明 317b12da7b Merge branch 'sprint/master_zhouxudong_20178' into 'master' 
Sprint/master zhouxudong 20178

See merge request easycorp/zentaopms!2982
 2022-04-18 06:49:50 +00:00
孙广明 af6b44bd5b Merge branch 'autotest_ly' into 'master' 
Autotest ly

See merge request easycorp/zentaopms!2986
 2022-04-18 06:49:16 +00:00
孙广明 226ccc8c69 Merge branch 'autotest_ly' into 'master' 
update branch data

See merge request easycorp/zentaopms!2980
 2022-04-18 05:21:56 +00:00
孙广明 6703d17651 Merge branch 'fixbug_sunjun_qijian' into 'master' 
Fixbug sunjun qijian

See merge request easycorp/zentaopms!2970
 2022-04-18 05:20:23 +00:00
孙广明 df7235355c Merge branch 'sunhuawei_fixbug_20316' into 'master' 
* Fix bug #20316.

See merge request easycorp/zentaopms!2976
 2022-04-18 02:59:35 +00:00
孙广明 ae094b7350 Merge branch 'sprint/unitTest_liumengyi_bug' into 'master' 
* FIx bug of bug unit test.

See merge request easycorp/zentaopms!2971
 2022-04-18 00:44:43 +00:00
孙广明 a5cb540de9 Merge branch 'master_xieqiyu_19318' into 'master' 
* Fix bug#19318.

See merge request easycorp/zentaopms!2961
 2022-04-15 07:46:54 +00:00
孙广明 ae2f0bad83 Merge branch 'fixbugs_zhouxin_21801' into 'master' 
* Fix bug #21801.

See merge request easycorp/zentaopms!2969
 2022-04-15 07:42:23 +00:00
孙广明 762a8e065c Merge branch 'fixbug_sunjun_19732' into 'master' 
*Fixbug_sunjun_19732

See merge request easycorp/zentaopms!2963
 2022-04-15 06:48:23 +00:00
孙广明 0b71ec6380 Merge branch 'sprint/unitTest_liumengyi_tree' into 'master' 
* Add unit test of tree.

See merge request easycorp/zentaopms!2964
 2022-04-15 06:47:25 +00:00
孙广明 27a70ba3e7 Merge branch 'sunhuawei_fixbug_21689' into 'master' 
*Fix bug#21689.

See merge request easycorp/zentaopms!2952
 2022-04-14 09:25:19 +00:00
孙广明 88cdfe304d Merge branch 'master_xieqiyu_6959' into 'master' 
* Fix bug#6959.

See merge request easycorp/zentaopms!2939
 2022-04-14 08:59:30 +00:00
孙广明 8a8377733b Merge branch 'master_xieqiyu_14454' into 'master' 
Master xieqiyu 14454

See merge request easycorp/zentaopms!2950
 2022-04-14 08:55:38 +00:00
孙广明 4ddc0f62cd Merge branch 'master_xieqiyu_21382' into 'master' 
* Fix bug#21382.

See merge request easycorp/zentaopms!2944
 2022-04-14 08:54:50 +00:00
孙广明 3cd615cdab Merge branch 'master_xieqiyu_15988' into 'master' 
* Fix bug#15988.

See merge request easycorp/zentaopms!2930
 2022-04-14 08:49:50 +00:00
孙广明 8fc8c8ec21 Merge branch 'sprint/unitTest_liumengyi_tree' into 'master' 
* Add unit test of tree.

See merge request easycorp/zentaopms!2949
 2022-04-14 08:17:26 +00:00
孙广明 fce1e79aa8 Merge branch 'sunhuawei_bug_18295' into 'master' 
Sunhuawei bug 18295

See merge request easycorp/zentaopms!2945
 2022-04-14 07:41:43 +00:00
孙广明 a8384ee291 Merge branch 'fixbug_sunjun__21501' into 'master' 
*Fixbug_sunjun__21501

See merge request easycorp/zentaopms!2936
 2022-04-14 07:27:27 +00:00
孙广明 3b4e55626a Merge branch 'fixbug_sunjun#21630' into 'master' 
*Fixbug_sunjun#21630

See merge request easycorp/zentaopms!2935
 2022-04-14 07:26:24 +00:00
孙广明 15266af89b Merge branch 'autotest_feilun' into 'master' 
Add auto test of testsuite.

See merge request easycorp/zentaopms!2918
 2022-04-14 07:22:15 +00:00
孙广明 508f3e2a2c Merge branch 'fixbugs_zhouxin_21637' into 'master' 
* Fix bug #21637.

See merge request easycorp/zentaopms!2938
 2022-04-14 06:41:04 +00:00
孙广明 b2907d1cef Merge branch 'fixbug_sunjun_21582' into 'master' 
*Fixbug_sunjun_21582

See merge request easycorp/zentaopms!2937
 2022-04-14 06:04:34 +00:00
孙广明 123bad60f1 Merge branch 'fixbugs_zhouxin_18086' into 'master' 
* Fix bug #18086.

See merge request easycorp/zentaopms!2932
 2022-04-14 02:37:31 +00:00
孙广明 38e842991c Merge branch 'master' into 'sunhuawei_bug_18295' 
# Conflicts:
#   module/tree/lang/en.php
 2022-04-14 02:36:40 +00:00
孙广明 486f7a35ce Merge branch 'sprint/unitTest_liumengyi_tree' into 'master' 
* Add unit test of tree.

See merge request easycorp/zentaopms!2924
 2022-04-13 09:08:09 +00:00
孙广明 ec238a9b4e Merge branch 'master_xieqiyu_20006' into 'master' 
* Fix bug#20006.

See merge request easycorp/zentaopms!2917
 2022-04-13 08:22:44 +00:00
孙广明 96aac66684 Merge branch 'master_xieqiyu_13127' into 'master' 
* Fix bug#13127.

See merge request easycorp/zentaopms!2914
 2022-04-13 08:22:07 +00:00
孙广明 ec3d957536 Merge branch 'master_xieqiyu_21382' into 'master' 
* Fix bug#21382.

See merge request easycorp/zentaopms!2911
 2022-04-13 08:21:38 +00:00
孙广明 64df7ac5c0 Merge branch 'sunhuawei_fixbug_21668' into 'master' 
*Fix bug#21668

See merge request easycorp/zentaopms!2903
 2022-04-13 02:07:02 +00:00
孙广明 e172ea39b6 Merge branch 'fixbug_zhouxin_18307' into 'master' 
* Fix bug #18307.

See merge request easycorp/zentaopms!2527
 2022-04-13 01:34:42 +00:00
孙广明 e17188285c Merge branch 'master_xieqiyu_19625' into 'master' 
* Fix bug#19625.

See merge request easycorp/zentaopms!2890
 2022-04-12 08:33:15 +00:00
孙广明 6ef66fd6ef Merge branch 'master_xieqiyu_21385' into 'master' 
* Fix bug#21385.

See merge request easycorp/zentaopms!2885
 2022-04-12 08:32:47 +00:00
孙广明 ee9aaa85b8 Merge branch 'master_xieqiyu_13127' into 'master' 
* Fix bug#13127.

See merge request easycorp/zentaopms!2884
 2022-04-12 08:32:31 +00:00
孙广明 b309300da4 Merge branch 'mayue_fix_bug#18065' into 'master' 
* Fix bug#18065.

See merge request easycorp/zentaopms!2886
 2022-04-12 07:58:45 +00:00
孙广明 c55f5d8110 Merge branch 'sprint/unitTest_liumengyi_stage' into 'master' 
* Add unit test of stage.

See merge request easycorp/zentaopms!2895
 2022-04-12 07:56:32 +00:00
孙广明 d82b552898 Merge branch 'fixbugs_zhouxin_21374' into 'master' 
* Fix bug #21374.

See merge request easycorp/zentaopms!2893
 2022-04-12 07:52:52 +00:00
孙广明 92eb57d9ef Merge branch 'shunhuawei_fixbug_21488' into 'master' 
*Beautify the interface.

See merge request easycorp/zentaopms!2894
 2022-04-12 07:50:54 +00:00
孙广明 5ef02a51af Merge branch 'autotest_ly' into 'master' 
add stage data

See merge request easycorp/zentaopms!2892
 2022-04-12 07:46:53 +00:00
孙广明 0e676c281a Merge branch 'mayue_fix_bug#17864' into 'master' 
* Fix bug#17864.

See merge request easycorp/zentaopms!2880
 2022-04-12 07:02:41 +00:00
孙广明 2f5a7dccef Merge branch 'fixbugs_zhouxin_21636' into 'master' 
* Fix bug #21636.

See merge request easycorp/zentaopms!2877
 2022-04-12 06:47:00 +00:00
孙广明 1e86d0872a Merge branch 'shunhuawei_fixbug_21488' into 'master' 
Shunhuawei fixbug 21488

See merge request easycorp/zentaopms!2879
 2022-04-12 06:44:47 +00:00
孙广明 22fe70ec4e Merge branch 'sprint/autoTest_liumengyi_programplan' into 'master' 
* Add unit test of programplan.

See merge request easycorp/zentaopms!2888
 2022-04-12 06:31:13 +00:00
孙广明 a3858d1512 Merge branch 'master_xieqiyu_14595' into 'master' 
* Fix bug#14595.

See merge request easycorp/zentaopms!2871
 2022-04-12 01:41:18 +00:00
孙广明 2b02f4dd38 Merge branch 'fixbug_sunjun_21618' into 'master' 
Fixbug sunjun 21618

See merge request easycorp/zentaopms!2859
 2022-04-12 01:40:59 +00:00
孙广明 71ce874dc3 Merge branch 'fixbugs_zhouxin_21654' into 'master' 
* Fix bug #21654.

See merge request easycorp/zentaopms!2873
 2022-04-12 01:40:47 +00:00
孙广明 46d3ac142f Merge branch 'fixbugs_zhouxin_17354' into 'master' 
* Fix bug #17354.

See merge request easycorp/zentaopms!2870
 2022-04-11 09:25:29 +00:00
孙广明 6ea181d050 Merge branch 'fixbugs_zhouxin_21320' into 'master' 
* Fix bug #21320.

See merge request easycorp/zentaopms!2839
 2022-04-11 09:25:00 +00:00
孙广明 bccf6e5248 Merge branch 'master_xieqiyu_18080' into 'master' 
* Fix bug#18080.

See merge request easycorp/zentaopms!2837
 2022-04-11 09:24:46 +00:00
孙广明 4a1d446587 Merge branch 'fixbug_sunjun_21521' into 'master' 
*Fixbug_sunjun_21521

See merge request easycorp/zentaopms!2856
 2022-04-11 09:23:14 +00:00
孙广明 1eb763eb04 Merge branch 'master_xieqiyu_19197' into 'master' 
* Fix bug#19197.

See merge request easycorp/zentaopms!2868
 2022-04-11 09:22:54 +00:00
孙广明 39fd0e4700 Merge branch 'master_xieqiyu_15697' into 'master' 
* Fix bug#15697.

See merge request easycorp/zentaopms!2864
 2022-04-11 09:22:36 +00:00
孙广明 c7dc63ff11 Merge branch 'master_xieqiyu_18072' into 'master' 
* Fix bug#18072.

See merge request easycorp/zentaopms!2852
 2022-04-11 09:21:34 +00:00
孙广明 74af01c97a Merge branch 'fixbugs_zhouxin_21434' into 'master' 
* Fix bug #21434.

See merge request easycorp/zentaopms!2854
 2022-04-11 06:05:17 +00:00
孙广明 4cc6f833e1 Merge branch 'sprint/185_fixbug_zhangzilong_19365' into 'master' 
* Fix bug #19365.

See merge request easycorp/zentaopms!2850
 2022-04-11 03:22:16 +00:00
孙广明 0981d23bcc Merge branch 'dht_personnel' into 'master' 
add new personnel unittest

See merge request easycorp/zentaopms!2846
 2022-04-11 03:03:47 +00:00
孙广明 de73e8d2eb Merge branch 'sprint/autoTest_liumengyi_testcase' into 'master' 
* Add auto test of testcase.

See merge request easycorp/zentaopms!2845
 2022-04-11 02:53:41 +00: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
孙广明 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
孙广明 4655f8551d Merge branch 'autotest_ly' into 'master' 
update build data

See merge request easycorp/zentaopms!2838
 2022-04-11 01:14:11 +00: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
孙广明 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
孙广明 24b9cf3c46 Merge branch 'autotest_ly' into 'master' 
update test data

See merge request easycorp/zentaopms!2826
 2022-04-08 05:50:17 +00: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
孙广明 29f67c4095 Merge branch 'autotest_feilun' into 'master' 
Add auto test of custom.

See merge request easycorp/zentaopms!2815
 2022-04-08 03:29:38 +00: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
孙广明 e2d5fe33e1 Merge branch 'liyuchun_fixbug' into 'master' 
* Fix bug #20986.

See merge request easycorp/zentaopms!2818
 2022-04-08 02:17:04 +00:00
孙广明 803ed24768 Merge branch 'autotest_ly' into 'master' 
add design test

See merge request easycorp/zentaopms!2811
 2022-04-08 00:30:27 +00:00
孙广明 6df9232062 Merge branch 'sprint/autoTest_liumengyi_testcase' into 'master' 
* Add auto test of testcase.

See merge request easycorp/zentaopms!2804
 2022-04-08 00:28:59 +00:00
孙广明 d9345f6a62 Merge branch 'master_xieqiyu_21550' into 'master' 
* Fix bug#21550.

See merge request easycorp/zentaopms!2807
 2022-04-07 09:23:31 +00:00
孙广明 475c0d7dd7 Merge branch 'sprint/autoTest_liumengyi_testcase' into 'master' 
* Add auto test of testcase.

See merge request easycorp/zentaopms!2802
 2022-04-07 08:47:33 +00:00
孙广明 16877a9733 Merge branch 'autotest_feilun' into 'master' 
auto test testreport model

See merge request easycorp/zentaopms!2800
 2022-04-07 08:47:15 +00:00
孙广明 af9545b817 Merge branch 'sprint/master_fixbug' into 'master' 
* Fix bug #21403,21474,21410,21414,21417.

See merge request easycorp/zentaopms!2756
 2022-04-07 07:57:51 +00:00
孙广明 cad1bd8c6e Merge branch 'autotest_ly' into 'master' 
Autotest ly

See merge request easycorp/zentaopms!2795
 2022-04-07 07:32:40 +00:00
孙广明 65132d2517 Merge branch 'master_xieqiyu_21552' into 'master' 
* Fix bug#21552.

See merge request easycorp/zentaopms!2789
 2022-04-07 06:42:19 +00:00
孙广明 55832ef09f Merge branch 'master_xieqiyu_21468' into 'master' 
* Fix bug#21468.

See merge request easycorp/zentaopms!2787
 2022-04-07 06:41:25 +00:00
孙广明 6c7711949e Merge branch 'sprint/fixbug_hufangzhou_21525' into 'master' 
* Fix bug #21525.

See merge request easycorp/zentaopms!2792
 2022-04-07 06:40:20 +00:00
孙广明 18a269ea60 Merge branch 'master' into 'autotest_ly' 
# Conflicts:
#   test/data/zentao/processor.php
 2022-04-07 06:36:06 +00:00
孙广明 c286e44d55 Merge branch 'liyuchun_fixbug' into 'master' 
* Fix bug #16610.

See merge request easycorp/zentaopms!2773
 2022-04-07 02:44:02 +00:00
孙广明 14bd6bc03b Merge branch 'sprint/autoTest_liumengyi_action' into 'master' 
* Add auto test of action.

See merge request easycorp/zentaopms!2777
 2022-04-07 00:22:17 +00:00
孙广明 62656bde9e Merge branch 'master_xieqiyu_17296' into 'master' 
* Fix bug#17296.

See merge request easycorp/zentaopms!2763
 2022-04-06 09:10:52 +00:00
孙广明 170393a33a Merge branch 'master_xieqiyu_20278' into 'master' 
* Fix bug#20278.

See merge request easycorp/zentaopms!2774
 2022-04-06 09:07:45 +00:00
孙广明 650ea1a463 Merge branch 'master_xieqiyu_21290' into 'master' 
* Fix bug#21290.

See merge request easycorp/zentaopms!2765
 2022-04-06 09:06:57 +00:00
孙广明 8c4f6de97e Merge branch 'master' into 'dht_productsonplan' 
# Conflicts:
#   test/data/zentao/processor.php
 2022-04-06 08:00:23 +00:00
孙广明 32ef589b42 Update processor.php 2022-04-06 07:59:30 +00:00
孙广明 7cac3e87e0 Merge branch 'autotest_feilun' into 'master' 
Autotest feilun

See merge request easycorp/zentaopms!2757
 2022-04-06 05:26:00 +00:00
孙广明 2da5d460cf Update ztest 2022-04-06 05:25:14 +00:00
孙广明 e7b10d4c3d Merge branch 'autotest_ly' into 'master' 
update action data

See merge request easycorp/zentaopms!2758
 2022-04-06 02:49:15 +00:00
孙广明 6a5231b013 Merge branch 'master_xieqiyu_13881' into 'master' 
* Fix bug#13881.

See merge request easycorp/zentaopms!2754
 2022-04-06 01:53:08 +00:00
孙广明 56dc995d61 Merge branch 'master_xieqiyu_6948' into 'master' 
* Fix bug#6948.

See merge request easycorp/zentaopms!2751
 2022-04-06 00:51:24 +00:00
孙广明 918fd9af30 Merge branch 'autotest_ly' into 'master' 
update action data

See merge request easycorp/zentaopms!2752
 2022-04-06 00:50:13 +00:00
孙广明 d355805659 Merge branch 'autotest_ly' into 'master' 
add history data

See merge request easycorp/zentaopms!2750
 2022-04-06 00:45:05 +00:00
孙广明 ed276fb0fe Merge branch 'master_xieqiyu_20882' into 'master' 
* Fix bug#20882.

See merge request easycorp/zentaopms!2743
 2022-04-02 08:10:56 +00:00
孙广明 30645ffbff Merge branch 'master_xieqiyu_21334' into 'master' 
* Fix bug#21334.

See merge request easycorp/zentaopms!2729
 2022-04-02 08:10:36 +00:00