Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
39,746 Commits 2 Branches 292 Tags
fd269a4777559d6972a9127193fdb53ec447505c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李玉春 fd269a4777 Merge branch 'master' into 'sprint/sunhao/fix_kanban' 
# Conflicts:
#   www/js/zui/kanban/min.css
#   www/js/zui/kanban/min.js
 2022-06-02 03:29:40 +00:00
李玉春 8ec70e4495 Merge branch 'sprint/197_sunhao/fix_kanban_virtual_render' into 'sprint/197' 
* fix kanban virtual render not work as expected.

See merge request easycorp/zentaopms!3698
 2022-06-02 00:26:24 +00:00
李玉春 d3a2dfa0c7 Merge branch 'fixbug_sunjun_22531' into 'master' 
fixbug_sunjun_22531

See merge request easycorp/zentaopms!3696
 2022-06-01 09:24:50 +00:00
李玉春 6c0104d8f7 Merge branch 'sprint/197_liumengyi_23124' into 'sprint/197' 
* Fix bug #23124.

See merge request easycorp/zentaopms!3678
 2022-06-01 02:51:31 +00:00
李玉春 767c6e3464 Merge branch 'cyy_23100' into 'master' 
* Fix bug #23100.

See merge request easycorp/zentaopms!3669
 2022-06-01 02:18:27 +00:00
liyuchun 18ef850d70 * Fix bug #21565. 2022-05-31 06:08:29 +00:00
李玉春 e9d89ac072 Merge branch 'sprint/197_liumengyi_32879' into 'sprint/197' 
* Finish task #55678, #55680, #55682, #55683, #55684.

See merge request easycorp/zentaopms!3662
 2022-05-31 06:01:30 +00:00
李玉春 1020c941bf Merge branch 'cyy_fixbug' into 'master' 
* Modify editor saved bug.

See merge request easycorp/zentaopms!3660
 2022-05-31 02:22:40 +00:00
李玉春 ba24d53a03 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3655
 2022-05-30 02:05:18 +00:00
李玉春 a4b7149497 Merge branch 'sunhuawei_fixbug_22873' into 'master' 
*Fix bug #22873.

See merge request easycorp/zentaopms!3650
 2022-05-30 01:18:09 +00:00
李玉春 a29aa19cf6 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
* Fix the display style of the task card.

See merge request easycorp/zentaopms!3654
 2022-05-30 01:07:30 +00:00
李玉春 5cc0364563 Merge branch 'sprint/194_tianshujie_fixbug' into 'master' 
* Fix bug #23010.

See merge request easycorp/zentaopms!3649
 2022-05-27 06:55:49 +00:00
李玉春 84fe5b847e Merge branch 'sprint/194_liumengyi_23012' into 'master' 
* Fix bug #23012.

See merge request easycorp/zentaopms!3641
 2022-05-27 03:02:02 +00:00
李玉春 c96ae16062 Merge branch 'sprint/194_liumengyi_23012' into 'master' 
* Fix bug #23022.

See merge request easycorp/zentaopms!3637
 2022-05-27 01:54:16 +00:00
李玉春 50f48a4c7e Merge branch 'sprint/tianshujie_fixbug' into 'master' 
* Fix bug #22979.

See merge request easycorp/zentaopms!3634
 2022-05-27 00:36:34 +00:00
李玉春 03d7b05aa8 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3631
 2022-05-26 09:10:25 +00:00
李玉春 6ed6d29355 Merge branch 'sunhuawei_fixbug_22989' into 'master' 
*Fix bug #22989.

See merge request easycorp/zentaopms!3623
 2022-05-26 07:38:21 +00:00
李玉春 e119a3faf1 Merge branch 'sprint/194_tianshujie_fixbug' into 'master' 
Sprint/194 tianshujie fixbug

See merge request easycorp/zentaopms!3611
 2022-05-26 05:59:08 +00:00
liyuchun fb771e6bc5 * Fix bug #22956. 2022-05-26 05:42:50 +00:00
liyuchun 8a008bc17a * Fix bug for cli. 2022-05-26 02:48:59 +00:00
李玉春 4a97f7bab4 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3600
 2022-05-26 00:29:58 +00:00
李玉春 2ae9a39642 Merge branch 'sprint/194_liumengyi_fixbug' into 'master' 
* Fix bug #22920.

See merge request easycorp/zentaopms!3598
 2022-05-25 08:38:33 +00:00
李玉春 b41cdeb6f4 Merge branch 'sprint/194_tianshujie_55257' into 'master' 
Sprint/194 tianshujie 55257

See merge request easycorp/zentaopms!3594
 2022-05-25 08:08:26 +00:00
李玉春 d8846c045e Merge branch 'sprint/194_liumengyi_fixbug' into 'master' 
* Fix bug #22664.

See merge request easycorp/zentaopms!3593
 2022-05-25 07:44:12 +00:00
李玉春 016f55712d Merge branch 'sprint/194_liumengyi_fixbug' into 'master' 
* Fix bug #22562, and add language item of kanban.

See merge request easycorp/zentaopms!3583
 2022-05-25 05:27:40 +00:00
李玉春 120743e044 Merge branch 'fixbug_sunjun_sprint194' into 'master' 
Fixbug sunjun sprint194

See merge request easycorp/zentaopms!3582
 2022-05-25 05:13:54 +00:00
李玉春 b997ed00ab Merge branch 'cyy_22851' into 'master' 
* Fix bug #22851.

See merge request easycorp/zentaopms!3561
 2022-05-25 05:13:17 +00:00
liyuchun 808d3ba75e Merge branch 'sprint_sunjun_55259' 2022-05-25 02:31:49 +00:00
李玉春 19718e6249 Merge branch 'master' into 'sprint_sunjun_55259' 
# Conflicts:
#   module/bug/view/batchcreate.html.php
 2022-05-25 02:31:37 +00:00
李玉春 10691aa653 Merge branch 'fixbug_sunjun_22556' into 'master' 
Fixbug sunjun 22556

See merge request easycorp/zentaopms!3553
 2022-05-25 02:28:26 +00:00
liyuchun 404c5d1d3f Merge branch 'sprint_sunjun_29766' 2022-05-25 02:27:30 +00:00
李玉春 ed24d92ae2 Merge branch 'master' into 'sprint_sunjun_29766' 
# Conflicts:
#   module/kanban/config.php
 2022-05-25 02:27:08 +00:00
李玉春 44325a46f2 Merge branch 'sprint/194_liumengyi_fixbug' into 'master' 
* Fix bug #22665.

See merge request easycorp/zentaopms!3576
 2022-05-25 02:16:02 +00:00
liyuchun e56bd44299 Merge branch 'sgm_sprint195' 2022-05-24 06:58:35 +00:00
李玉春 b5ad70bcb7 Merge branch 'master' into 'sgm_sprint195' 
# Conflicts:
#   db/update17.0.beta1.sql
 2022-05-24 06:58:00 +00:00
李玉春 23dc6ddccd Merge branch 'sgm_unittest' into 'master' 
Sgm unittest

See merge request easycorp/zentaopms!3554
 2022-05-24 06:47:28 +00:00
李玉春 856611ca70 Merge branch 'sprint/194_liumengyi_activeKanban' into 'master' 
* Fnish task #55255.

See merge request easycorp/zentaopms!3558
 2022-05-24 05:40:21 +00:00
李玉春 03469dbd1e Merge branch 'sprint/194_tianshujie_14741' into 'master' 
Sprint/194 tianshujie 14741

See merge request easycorp/zentaopms!3557
 2022-05-24 05:39:25 +00:00
李玉春 ffb7904cee Merge branch 'sprint/194_liumengyi_activeKanban' into 'master' 
* Finish task #55255.

See merge request easycorp/zentaopms!3556
 2022-05-24 05:38:09 +00:00
李玉春 6514b4f605 Merge branch 'sprint_sunjun_test' into 'master' 
add getAssignedByMeTest

See merge request easycorp/zentaopms!3548
 2022-05-20 08:26:05 +00:00
李玉春 8e464285cf Merge branch 'fixbug_sunjun_22695' into 'master' 
Fixbug sunjun 22695

See merge request easycorp/zentaopms!3545
 2022-05-20 05:28:08 +00:00
李玉春 3c59f5c4a0 Merge branch 'sprint/191_tianshujie_fixbug' into 'master' 
* Fix bug #22617.

See merge request easycorp/zentaopms!3540
 2022-05-20 03:09:22 +00:00
李玉春 2eaf30a558 Merge branch 'fixbug_sunjun_22696' into 'master' 
fixbug_sunjun_22696

See merge request easycorp/zentaopms!3539
 2022-05-20 03:02:22 +00:00
李玉春 2dc44d9fe6 Merge branch 'sprint/191_tianshujie_fixbug' into 'master' 
Sprint/191 tianshujie fixbug

See merge request easycorp/zentaopms!3535
 2022-05-20 01:35:06 +00:00
liyuchun 9d05eee2a0 * Fix bug #22666. 2022-05-20 01:18:12 +00:00
李玉春 125a240f4b Merge branch 'cyy_22698' into 'master' 
* Fix bug #22698.

See merge request easycorp/zentaopms!3536
 2022-05-20 01:07:46 +00:00
李玉春 6c870f57c9 Merge branch 'sprint/192_leiyong_bug_22713' into 'master' 
* Fix bug#22713.

See merge request easycorp/zentaopms!3532
 2022-05-20 00:52:57 +00:00
李玉春 0fa2c55ece Merge branch 'sprint/192_leiyong_task_54488' into 'master' 
* Finish task#54488.

See merge request easycorp/zentaopms!3531
 2022-05-20 00:29:05 +00:00
李玉春 8a2a953d17 Merge branch 'sprint/189_liumengyi_22691' into 'sprint/189_package' 
* Code format for bug 22691.

See merge request easycorp/zentaopms!3529
 2022-05-19 09:04:00 +00:00
李玉春 0378ea04aa Merge branch 'sprint/189_liumengyi_22691' into 'sprint/189_package' 
* Fix bug #22691.

See merge request easycorp/zentaopms!3528
 2022-05-19 08:57:46 +00:00
李玉春 7382fc1476 Merge branch 'sprint/191_liumengyi_fixbug' into 'master' 
* Fix bug for kanban closed and bug batch assign.

See merge request easycorp/zentaopms!3527
 2022-05-19 08:55:16 +00:00
李玉春 0885cef63b Merge branch 'cyy_22688' into 'master' 
* Fix bug #22688.

See merge request easycorp/zentaopms!3523
 2022-05-19 07:54:19 +00:00
李玉春 bf230553ab Merge branch 'sprint/190_mayue_bug#22639' into 'master' 
* Fix bug #22639.

See merge request easycorp/zentaopms!3509
 2022-05-19 07:53:26 +00:00
李玉春 088bea319e Merge branch 'sprint/192_leiyong_task_54469' into 'master' 
Sprint/192 leiyong task 54469

See merge request easycorp/zentaopms!3517
 2022-05-19 07:53:10 +00:00
李玉春 b2909b2b54 Merge branch 'sprint_sunjun_fixbug' into 'master' 
sprint_sunjun_fixbug

See merge request easycorp/zentaopms!3518
 2022-05-19 07:49:04 +00:00
李玉春 1ada06c384 Merge branch 'sprint/189_liumengyi_fixbug' into 'sprint/189_package' 
* Fix bug #22689.

See merge request easycorp/zentaopms!3521
 2022-05-19 07:44:36 +00:00
李玉春 696c0ea711 Merge branch 'sunhuawei_fixbug_22375' into 'master' 
*Fix bug #22375.

See merge request easycorp/zentaopms!3520
 2022-05-19 07:32:07 +00:00
李玉春 fd977ff822 Merge branch 'sprint/191_zhouxin_fixbug' into 'master' 
* Fix bug #22651,#22645.

See merge request easycorp/zentaopms!3512
 2022-05-19 06:40:20 +00:00
李玉春 579391bd84 Merge branch 'sprint/191_liumengyi_54350' into 'master' 
* Finish task #54350.

See merge request easycorp/zentaopms!3506
 2022-05-19 03:18:38 +00:00
李玉春 aa81ba0c65 Merge branch 'sprint/191_liumengyi_54320' into 'master' 
* Code format for task #54320.

See merge request easycorp/zentaopms!3505
 2022-05-19 02:46:10 +00:00
李玉春 4b7fd6beee Merge branch 'sprint/191_liumengyi_54318' into 'master' 
* Finish task #54318.

See merge request easycorp/zentaopms!3502
 2022-05-19 02:45:46 +00:00
李玉春 c8312488ff Merge branch 'sprint/191_liumengyi_54319' into 'master' 
* Finish task #54319.

See merge request easycorp/zentaopms!3501
 2022-05-19 02:45:28 +00:00
李玉春 fd0ca7e9fd Merge branch 'sprint/191_liumengyi_54320' into 'master' 
* Finish task #54320.

See merge request easycorp/zentaopms!3503
 2022-05-19 02:33:54 +00:00
李玉春 c2af0518fa Merge branch 'cyy_bug' into 'master' 
* Fix bug #22601.

See merge request easycorp/zentaopms!3497
 2022-05-19 02:23:40 +00:00
李玉春 6b667195b1 Merge branch 'sprint/191_tianshujie_54329' into 'master' 
Sprint/191 tianshujie 54329

See merge request easycorp/zentaopms!3496
 2022-05-19 02:22:36 +00:00
李玉春 79006b3f89 Merge branch 'sprint/tianshujie_22636' into 'master' 
* Fix bug #22636.

See merge request easycorp/zentaopms!3494
 2022-05-18 08:57:05 +00:00
李玉春 f5fb327f55 Merge branch 'sprint/191_liumengyi_fixbug' into 'master' 
* Fix bug #22633.

See merge request easycorp/zentaopms!3488
 2022-05-18 08:04:59 +00:00
李玉春 20f96a7d4c Merge branch 'sprint/191_liumengyi_22628' into 'master' 
* Fix bug #22628.

See merge request easycorp/zentaopms!3485
 2022-05-18 07:32:38 +00:00
李玉春 7b4f3b4abd Merge branch 'sprint/191_liumengyi_22590' into 'master' 
* Fix bug #22590.

See merge request easycorp/zentaopms!3478
 2022-05-18 05:38:52 +00:00
李玉春 282f694f17 Merge branch 'sprint/191_tianshujie_54391' into 'master' 
Sprint/191 tianshujie 54391

See merge request easycorp/zentaopms!3453
 2022-05-18 00:53:44 +00:00
李玉春 1f768098c6 Merge branch 'sprint/191_liumengyi_54354' into 'master' 
Sprint/191 liumengyi 54354

See merge request easycorp/zentaopms!3461
 2022-05-17 09:28:22 +00:00
李玉春 782e860754 Merge branch 'sprint/191_liumengyi_54349' into 'master' 
Sprint/191 liumengyi 54349

See merge request easycorp/zentaopms!3455
 2022-05-17 09:18:05 +00:00
李玉春 743ba6a6da Merge branch 'sprint/191_tianshujie_54353' into 'master' 
Sprint/191 tianshujie 54353

See merge request easycorp/zentaopms!3437
 2022-05-17 02:38:25 +00:00
李玉春 bf512c437b Merge branch 'sprint/191_liumengyi_54336' into 'master' 
* Finish task #54346,#54345.

See merge request easycorp/zentaopms!3436
 2022-05-17 02:25:55 +00:00
李玉春 8d8a321ed6 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
* Fix bug #22490.

See merge request easycorp/zentaopms!3422
 2022-05-16 06:14:07 +00:00
李玉春 4d086ec901 Merge branch 'sprint/tianshujie_bug22489' into 'master' 
* Fix bug #22489.

See merge request easycorp/zentaopms!3409
 2022-05-16 01:27:47 +00:00
李玉春 8dc60251fc Merge branch 'sprint/189_liumengyi_fixbug' into 'master' 
* Fix bug for update.

See merge request easycorp/zentaopms!3405
 2022-05-16 00:30:19 +00:00
李玉春 d53b7da921 Merge branch 'mayue_fix_apibug' into 'master' 
* Optimize code.

See merge request easycorp/zentaopms!3402
 2022-05-13 09:39:10 +00:00
李玉春 a3c63501f9 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
* Fix bug #22483.

See merge request easycorp/zentaopms!3396
 2022-05-13 06:30:08 +00:00
李玉春 9771a318d5 Merge branch 'fix_bug' into 'master' 
Fix bug

See merge request easycorp/zentaopms!3391
 2022-05-13 05:19:58 +00:00
李玉春 5b90338ebb Merge branch 'sprint/tianshujie_bug22437' into 'master' 
* Fix bug #22437.

See merge request easycorp/zentaopms!3379
 2022-05-13 00:59:11 +00:00
李玉春 d618aea1ee Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3368
 2022-05-12 07:55:25 +00:00
李玉春 70fcf381cf Merge branch 'sunhuawei_fixbug_22365' into 'master' 
Sunhuawei fixbug 22365

See merge request easycorp/zentaopms!3352
 2022-05-12 05:33:28 +00:00
李玉春 b557af3aee Merge branch 'sprint/189_liumengyi_unittest' into 'master' 
* add unit test of sprint 189.

See merge request easycorp/zentaopms!3350
 2022-05-12 02:47:51 +00:00
李玉春 5a8b0f22b3 Merge branch 'sprint/189_liumengyi' into 'master' 
* Fix bug for close product.

See merge request easycorp/zentaopms!3343
 2022-05-11 09:08:08 +00:00
李玉春 327242d3c4 Merge branch 'sprint/189_liumengyi' into 'master' 
* Refactoring bug search code.

See merge request easycorp/zentaopms!3339
 2022-05-11 08:18:55 +00:00
liyuchun 356aa74ca1 * Fix bug when create gitlab server. 2022-05-11 06:58:54 +00:00
李玉春 dd61c615e4 Merge branch 'sprint/189_liumengyi_22311' into 'master' 
* Mofidy date format.

See merge request easycorp/zentaopms!3327
 2022-05-11 06:23:41 +00:00
李玉春 655981316d Merge branch 'sprint/189_liumengyi_22311' into 'master' 
* Fix bug #22311, #22304,#22320,#22317.

See merge request easycorp/zentaopms!3326
 2022-05-11 06:12:04 +00:00
李玉春 2aeee3f5f4 Merge branch 'sprint/189_liumengyi_53647' into 'master' 
* Fix bug for #task 53647.

See merge request easycorp/zentaopms!3319
 2022-05-11 02:47:29 +00:00
李玉春 22cafe2e02 Merge branch 'sprint/189_liumengyi_53647' into 'master' 
* Finish task #53647.

See merge request easycorp/zentaopms!3318
 2022-05-11 02:40:46 +00:00
李玉春 25a2285ccc Merge branch 'sprint_sunjun_53654' into 'master' 
Sprint sunjun 53654

See merge request easycorp/zentaopms!3308
 2022-05-10 07:43:55 +00:00
liyuchun 01344d05b9 Merge branch 'sprint/scx_testcase' of https://gitlab.zcorp.cc/easycorp/zentaopms into scx_testcase 2022-05-09 07:43:25 +00:00
liyuchun e74e7c90a1 * Add unitcase. 2022-05-09 07:43:07 +00:00
李玉春 1ad3357c4f Merge branch 'sprint/tianshujie_case_block' into 'master' 
* Add case of block model.

See merge request easycorp/zentaopms!3289
 2022-05-09 05:03:31 +00:00
李玉春 bc3973b2fa Merge branch 'cyy_22212' into 'master' 
* Fix bug #22212.

See merge request easycorp/zentaopms!3286
 2022-05-09 05:03:11 +00:00
李玉春 da8d15ce52 Merge branch 'sprint/scx_feedbackView' into 'master' 
* Fix feedback adminView bug .

See merge request easycorp/zentaopms!3292
 2022-05-09 02:47:59 +00:00
李玉春 4596c69ae1 Merge branch 'autotest_doc_wangxiaomeng' into 'master' 
edit doc

See merge request easycorp/zentaopms!3281
 2022-05-09 00:31:19 +00:00
liyuchun e2d43c69a6 * Add unit case. 2022-05-07 07:36:05 +00:00
李玉春 623b2e4bf5 Merge branch 'sprint/tianshujie_case_doc' into 'master' 
* Add test case for doc.

See merge request easycorp/zentaopms!3280
 2022-05-07 07:10:25 +00:00