Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
36,962 Commits 2 Branches 292 Tags
43f398b9e29ef28e559530bda1239d8e8db18500
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
孙广明 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
孙广明 1b7c01606a Merge branch 'master_xieqiyu_19711' into 'master' 
Master xieqiyu 19711

See merge request easycorp/zentaopms!2742
 2022-04-02 08:10:22 +00:00
孙广明 1c8f929a0d Merge branch 'liyuchun_fixbug' into 'master' 
* Fix bug #13324.

See merge request easycorp/zentaopms!2684
 2022-04-02 06:49:30 +00:00
孙广明 51499d6b8c Merge branch 'sprint/master_zhouxudong_21378' into 'master' 
* Fix bug #21378.

See merge request easycorp/zentaopms!2737
 2022-04-02 06:48:47 +00:00
孙广明 0bffcc0b85 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master' 
* Add auto test of kanban.

See merge request easycorp/zentaopms!2734
 2022-04-02 05:45:47 +00:00
孙广明 a1726a54dc Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master' 
* Add auto test of kanban.

See merge request easycorp/zentaopms!2732
 2022-04-02 05:03:48 +00:00
孙广明 8de6d91871 Merge branch 'autotest_ly' into 'master' 
update kanbancolumn data

See merge request easycorp/zentaopms!2728
 2022-04-02 03:14:18 +00: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
孙广明 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
孙广明 03bd3c1d0f Merge branch 'autotest_ly' into 'master' 
Autotest ly

See merge request easycorp/zentaopms!2721
 2022-04-02 01:56:29 +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
孙广明 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
孙广明 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
孙广明 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
孙广明 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
孙广明 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
孙广明 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
孙广明 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
孙广明 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
孙广明 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
孙广明 0698a68ff2 Merge branch 'autotest_feilun' into 'master' 
caselib and projectrelease

See merge request easycorp/zentaopms!2691
 2022-04-01 02:05:58 +00:00
孙广明 99a34db8da Merge branch 'autotest_ly' into 'master' 
add design data

See merge request easycorp/zentaopms!2685
 2022-04-01 00:36:21 +00:00
孙广明 5cc345e666 Merge branch 'master_xieqiyu_19665' into 'master' 
* Fix bug#19665.

See merge request easycorp/zentaopms!2676
 2022-03-31 09:42:04 +00:00
孙广明 e93df1c520 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master' 
* Add auto test of kanban.

See merge request easycorp/zentaopms!2683
 2022-03-31 09:37:57 +00:00
孙广明 d72c9123fa Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2679
 2022-03-31 08:55:46 +00:00
孙广明 d1074f74e2 Merge branch 'mayue_fix_bug#21345' into 'master' 
* Fix bug #21345.

See merge request easycorp/zentaopms!2678
 2022-03-31 08:43:43 +00:00
孙广明 4e2f0a3d86 Merge branch 'master_xieqiyu_19273' into 'master' 
* Fix bug#19273.

See merge request easycorp/zentaopms!2666
 2022-03-31 07:24:15 +00:00
孙广明 50f370f185 Merge branch 'sprint/tianshujie_bug21300' into 'master' 
* Fix bug #21300.

See merge request easycorp/zentaopms!2673
 2022-03-31 07:21:28 +00:00
孙广明 0a2abf6cb9 Merge branch 'master_xieqiyu_19197' into 'master' 
* Fix bug#19197.

See merge request easycorp/zentaopms!2667
 2022-03-31 07:18:21 +00:00
孙广明 1746814316 Merge branch 'sprint/master_zhouxudong_17123' into 'master' 
* Fix bug #17123.

See merge request easycorp/zentaopms!2672
 2022-03-31 07:18:02 +00:00
孙广明 5e8b3f2249 Merge branch 'fixbugs_zhouxin_21333' into 'master' 
* Fix bug #21333.

See merge request easycorp/zentaopms!2668
 2022-03-31 06:33:31 +00:00
孙广明 d388d2bfe7 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2671
 2022-03-31 06:26:21 +00:00
孙广明 034cef1679 Merge branch 'mayue_fix_bug#17342' into 'master' 
* Fix bug #17342.

See merge request easycorp/zentaopms!2670
 2022-03-31 06:19:25 +00:00
孙广明 d6d7af7fcc Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master' 
* Add auto test of kanban.

See merge request easycorp/zentaopms!2664
 2022-03-31 05:34:09 +00:00
孙广明 3d2de17fff Merge branch 'liyuchun_fixbug' into 'master' 
* Fix bug #11348.

See merge request easycorp/zentaopms!2648
 2022-03-31 03:08:50 +00:00
孙广明 e2c29e7854 Merge branch 'sprint/master_zhouxudong_18270' into 'master' 
Sprint/master zhouxudong 18270

See merge request easycorp/zentaopms!2654
 2022-03-31 03:08:33 +00:00
孙广明 df2cda6e8b Merge branch 'sprint/master_zhouxudong_18083' into 'master' 
Sprint/master zhouxudong 18083

See merge request easycorp/zentaopms!2653
 2022-03-31 03:06:37 +00:00
孙广明 d15ba0e7f9 Merge branch 'autotest_ly' into 'master' 
Autotest ly

See merge request easycorp/zentaopms!2660
 2022-03-31 02:56:23 +00:00
孙广明 5072b8929b Merge branch 'sprint/master_zhouxudong_18002' into 'master' 
Sprint/master zhouxudong 18002

See merge request easycorp/zentaopms!2659
 2022-03-31 02:37:33 +00:00
孙广明 4487902db3 Merge branch 'sprint/master_zhouxudong_18744' into 'master' 
Sprint/master zhouxudong 18744

See merge request easycorp/zentaopms!2656
 2022-03-31 02:36:13 +00:00
孙广明 2bf755a78d Merge branch 'dht_productplan' into 'master' 
add unittest productplan and new productsunplan.yaml

See merge request easycorp/zentaopms!2548
 2022-03-31 02:10:49 +00:00
孙广明 23469287f6 Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master' 
* Add auto test of kanban.

See merge request easycorp/zentaopms!2651
 2022-03-30 09:24:45 +00:00
孙广明 7af812ca3e Merge branch 'fixbugs_zhouxin_16317' into 'master' 
* Fix bug #16317.

See merge request easycorp/zentaopms!2649
 2022-03-30 09:24:07 +00:00
孙广明 2907e3171d Merge branch 'fixbugs_zhouxin_15286' into 'master' 
* Fix bug #15286.

See merge request easycorp/zentaopms!2645
 2022-03-30 09:15:38 +00:00
孙广明 36244ef5a2 Merge branch 'fixbugs_zhouxin_20813' into 'master' 
* Fix bug #20813.

See merge request easycorp/zentaopms!2646
 2022-03-30 09:14:08 +00:00
孙广明 ce3448ab19 Merge branch 'mayue_fix_bug#16456' into 'master' 
* Fix bug #16456.

See merge request easycorp/zentaopms!2642
 2022-03-30 07:49:30 +00:00
孙广明 2b1b3b1733 Merge branch 'liyuchun_fixbug' into 'master' 
* Fix bug #20939.

See merge request easycorp/zentaopms!2619
 2022-03-30 06:03:01 +00:00
孙广明 3a808fc514 Merge branch 'fixbugs_zhouxin_17322' into 'master' 
Fixbugs zhouxin 17322

See merge request easycorp/zentaopms!2631
 2022-03-30 05:12:36 +00:00
孙广明 60b5461414 Merge branch 'fixbugs_zhouxin_21131' into 'master' 
* Fix bug #21131.

See merge request easycorp/zentaopms!2632
 2022-03-30 05:12:19 +00:00
孙广明 54852b1c3e Merge branch 'app_zry' into 'master' 
* Fix bug 21065.

See merge request easycorp/zentaopms!2620
 2022-03-29 09:23:11 +00:00
孙广明 6274be6d47 Merge branch 'master_xieqiyu_21277' into 'master' 
* Fix bug#21277.

See merge request easycorp/zentaopms!2614
 2022-03-29 08:13:24 +00:00
孙广明 372febd731 Merge branch 'master' into 'autotest_ly' 
# Conflicts:
#   test/ztest
 2022-03-29 07:53:51 +00:00
孙广明 78b5d154af Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master' 
* Add auto test of kanban.

See merge request easycorp/zentaopms!2610
 2022-03-29 06:29:02 +00:00
孙广明 1dac727a25 Merge branch 'fixbug' into 'master' 
* Code for bug #21058.

See merge request easycorp/zentaopms!2593
 2022-03-29 06:01:38 +00:00
孙广明 04d9e62697 Merge branch 'fixbugs_zhouxin_16707' into 'master' 
* Fix bug #16707.

See merge request easycorp/zentaopms!2602
 2022-03-29 06:01:15 +00:00
孙广明 b7216638ec Merge branch 'liyuchun_fixbug_51009' into 'master' 
* Fix bug #13194.

See merge request easycorp/zentaopms!2608
 2022-03-29 05:58:52 +00:00
孙广明 0bd44c1511 Merge branch 'liyuchun_fixbug' into 'master' 
* Fix bug #20804,20946.

See merge request easycorp/zentaopms!2598
 2022-03-29 05:58:04 +00:00
孙广明 0fe342e621 Merge branch 'master_xieqiyu_16137' into 'master' 
* Fix bug#16137,#16136.

See merge request easycorp/zentaopms!2604
 2022-03-29 05:26:06 +00:00
孙广明 dd871db635 Merge branch 'autotest_ly' into 'master' 
update story data

See merge request easycorp/zentaopms!2607
 2022-03-29 05:25:35 +00:00
孙广明 851fe62a79 Merge branch 'master_xieqiyu_11308' into 'master' 
* Fix bug#11308,#20582.

See merge request easycorp/zentaopms!2596
 2022-03-29 01:42:44 +00:00
孙广明 ebd31dd515 Merge branch 'fixbugs_zhouxin_14512' into 'master' 
* Fix bug #14512.

See merge request easycorp/zentaopms!2583
 2022-03-28 09:23:39 +00:00
孙广明 81a934d34c Merge branch 'sprint/autoTest_liumengyi_kanban' into 'master' 
* Add auto test of kanban.

See merge request easycorp/zentaopms!2594
 2022-03-28 09:18:21 +00:00
孙广明 11b4d993dd Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2588
 2022-03-28 08:57:08 +00:00
孙广明 38f92da961 Merge branch 'autotest_ly' into 'master' 
add build test

See merge request easycorp/zentaopms!2587
 2022-03-28 08:21:32 +00:00
孙广明 8b8dccd9cd Merge branch 'mayue_optimize_code' into 'master' 
* Optimize code.

See merge request easycorp/zentaopms!2581
 2022-03-28 07:06:34 +00:00
孙广明 0aa0f12057 Merge branch 'master_xieqiyu_20875' into 'master' 
* Fix bug#20875.

See merge request easycorp/zentaopms!2564
 2022-03-28 06:37:08 +00:00
孙广明 8b1444de59 Merge branch 'sunhuawei_fixbug_13786' into 'master' 
*Fix bug#13786.

See merge request easycorp/zentaopms!2579
 2022-03-28 06:24:20 +00:00
孙广明 85490db2dd Merge branch 'liyuchun_fixbug' into 'master' 
* Fix bug #16895,20941,20942.

See merge request easycorp/zentaopms!2561
 2022-03-28 05:11:11 +00:00
孙广明 97bcdf6255 Merge branch 'autotest_ly' into 'master' 
update test data

See merge request easycorp/zentaopms!2575
 2022-03-28 05:07:46 +00:00
孙广明 20f060bcaf Merge branch 'sprint/autoTest_liumengyi_product' into 'master' 
* Add auto test of product.

See merge request easycorp/zentaopms!2563
 2022-03-28 02:05:44 +00:00
孙广明 21d4a48642 Merge branch 'liyuchun_fixbug' into 'master' 
Fix bug #17252,17367.

See merge request easycorp/zentaopms!2539
 2022-03-28 00:42:01 +00:00
孙广明 e736c8d8c0 Merge branch 'autotest_ly' into 'master' 
add project and product data

See merge request easycorp/zentaopms!2559
 2022-03-28 00:41:34 +00:00
孙广明 2ea79a7e21 Merge branch 'autotest_ly' into 'master' 
update story data

See merge request easycorp/zentaopms!2552
 2022-03-25 07:34:01 +00:00
孙广明 0d6d80e6f2 Merge branch 'sprint/autoTest_liumengyi_product' into 'master' 
* Add auto test of product.

See merge request easycorp/zentaopms!2551
 2022-03-25 07:33:06 +00:00
孙广明 da5795f6c5 Merge branch 'sprint/165_tanghucheng_fixbug' into 'sprint/165_package' 
* Fix bug #21164.

See merge request easycorp/zentaopms!2549
 2022-03-25 06:59:32 +00:00
孙广明 8acea5b35c Merge branch 'master_xieqiyu_20878' into 'master' 
* Fix bug#20878.

See merge request easycorp/zentaopms!2547
 2022-03-25 06:59:00 +00:00
孙广明 06c255995c Merge branch 'mayue_fix_bug#17402' into 'master' 
* Fix bug#17402.

See merge request easycorp/zentaopms!2543
 2022-03-25 06:23:58 +00:00
孙广明 70ef6bae33 Merge branch 'fixbug_zhouxin_16571' into 'master' 
* Fix bug #16571.

See merge request easycorp/zentaopms!2498
 2022-03-25 03:17:04 +00:00
孙广明 82188691db Merge branch 'liyuchun_fixbug' into 'master' 
Liyuchun fixbug #18151,13732.

See merge request easycorp/zentaopms!2516
 2022-03-25 01:19:43 +00:00
孙广明 133c7f7b04 Merge branch 'master' into 'sprint/autoTest_liumengyi_product' 
# Conflicts:
#   module/product/model.php
 2022-03-24 09:04:36 +00:00
孙广明 ea4da61f53 Merge branch 'autotest_ly' into 'master' 
add story stage data

See merge request easycorp/zentaopms!2506
 2022-03-24 06:21:51 +00:00
孙广明 4889b79a59 Merge branch 'sunhuawei_fixbug_20863' into 'master' 
*Fix bug #20863.

See merge request easycorp/zentaopms!2502
 2022-03-24 06:10:01 +00:00
孙广明 8595ff996b Merge branch 'autotest_ly' into 'master' 
update storyspec data

See merge request easycorp/zentaopms!2504
 2022-03-24 06:09:35 +00:00
孙广明 043e9ac9ea Merge branch 'autotest_ly' into 'master' 
add storyreview data

See merge request easycorp/zentaopms!2500
 2022-03-24 02:59:25 +00:00
孙广明 42f7f22cd0 Merge branch 'autotest_ly' into 'master' 
add build and update story

See merge request easycorp/zentaopms!2495
 2022-03-24 01:36:24 +00:00
孙广明 3bfa2b8e0d Merge branch 'sprint/autoTest_liumengyi_todo' into 'master' 
* Add auto test of todo.

See merge request easycorp/zentaopms!2494
 2022-03-24 01:20:23 +00:00
孙广明 85c0bedc77 Merge branch 'master_xieqiyu_21037' into 'master' 
* Fix bug#21037.

See merge request easycorp/zentaopms!2480
 2022-03-23 09:27:21 +00:00
孙广明 c08b31e854 Merge branch 'sunhuawei_fixbug_11441' into 'master' 
*Fix bug#11441.

See merge request easycorp/zentaopms!2479
 2022-03-23 08:47:00 +00:00
孙广明 6e2325563f Merge branch 'master' into 'sprint/autoTest_liumengyi_todo' 
# Conflicts:
#   test/data/todo.yaml
#   test/ztest
 2022-03-23 08:02:10 +00:00
孙广明 06ce541a55 Merge branch 'autotest_ly' into 'master' 
add test by dept and data

See merge request easycorp/zentaopms!2485
 2022-03-23 08:01:30 +00:00
孙广明 337f12b7e3 Merge branch 'master_xieqiyu_20930' into 'master' 
* Fix bug#20930.

See merge request easycorp/zentaopms!2462
 2022-03-23 05:53:02 +00:00
孙广明 62e7ad71fc Merge branch 'liyuchun_bug_20430' into 'master' 
Fix bug #19644,19662,19680,20430.

See merge request easycorp/zentaopms!2466
 2022-03-23 05:51:57 +00:00