Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
41,315 Commits 2 Branches 292 Tags
cc8c52ae8db643dd774691d522519b9882078938
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李玉春 ae0722b146 Merge branch 'liyuchun_fixbug' into 'master' 
* Fix bug #23945.

See merge request easycorp/zentaopms!4247
 2022-06-30 05:18:15 +00:00
李玉春 6489da0369 Merge branch 'sprint/207_mayue_bug#24580' into 'master' 
* Fix bug #24580.

See merge request easycorp/zentaopms!4251
 2022-06-30 03:04:10 +00:00
李玉春 46a88b04d3 Merge branch 'bug_24222' into 'master' 
* Fix bug #24222.

See merge request easycorp/zentaopms!4231
 2022-06-30 02:26:33 +00:00
liyuchun 6dd69c055a * Fix bug #23945. 2022-06-30 02:21:03 +00:00
liyuchun 31ca138b18 * Fix bug #23960. 2022-06-29 08:16:20 +00:00
李玉春 4b2165be06 Merge branch 'sprint/zentaoat_liyang' into 'master' 
*Fix Bug for copyDB

See merge request easycorp/zentaopms!4209
 2022-06-29 05:38:55 +00:00
李玉春 677381331d Merge branch 'gitlab_bug' into 'master' 
* Modify apit params.

See merge request easycorp/zentaopms!4149
 2022-06-27 06:46:11 +00:00
李玉春 4e34d56156 Merge branch 'autotest_ly' into 'master' 
* Fix ztest init.

See merge request easycorp/zentaopms!4151
 2022-06-27 06:45:40 +00:00
李玉春 b4b7a1c9d3 Merge branch 'autotest_ly' into 'master' 
* Add switch DB.

See merge request easycorp/zentaopms!4144
 2022-06-27 02:58:17 +00:00
李玉春 c12226f606 Merge branch 'cyy_style' into 'master' 
* Modify style for select.

See merge request easycorp/zentaopms!4124
 2022-06-24 06:29:55 +00:00
李玉春 45315877e2 Merge branch 'sprint/206_liumengyi_fixbug' into 'master' 
* Code review.

See merge request easycorp/zentaopms!4140
 2022-06-24 06:28:46 +00:00
李玉春 267803004a Merge branch 'cyy_optimize' into 'master' 
* Adjust style.

See merge request easycorp/zentaopms!4110
 2022-06-23 09:21:33 +00:00
liyuchun 5355c2cc98 * Add language. 2022-06-23 05:30:58 +00:00
李玉春 69fa9aa6ed Merge branch 'cyy_optimize' into 'master' 
* Adjust style and codes.

See merge request easycorp/zentaopms!4073
 2022-06-23 01:02:57 +00:00
李玉春 e308778583 Merge branch 'cyy_23862' into 'master' 
* Fix bug #23862.

See merge request easycorp/zentaopms!4064
 2022-06-23 00:16:10 +00:00
李玉春 7df829be39 Merge branch 'zenops_zhouxin_fixbug' into 'master' 
* Adjust code.

See merge request easycorp/zentaopms!4069
 2022-06-22 07:33:37 +00:00
李玉春 497b32f627 Merge branch 'zenops_36' into 'master' 
Zenops 36

See merge request easycorp/zentaopms!4066
 2022-06-22 07:18:41 +00:00
liyuchun 4c6ac43ca2 * Finish task #57658. 2022-06-22 07:16:38 +00:00
李玉春 2b94fe3a83 Merge branch 'cyy_mr' into 'zenops_36' 
* Modify repo id save.

See merge request easycorp/zentaopms!4058
 2022-06-22 05:03:50 +00:00
李玉春 9ac2f27b24 Merge branch 'zenops36_zhouxin_57655' into 'zenops_36' 
* Finish task #57655.

See merge request easycorp/zentaopms!4054
 2022-06-22 02:58:37 +00:00
李玉春 cbed1964c2 Merge branch 'cyy_devops' into 'zenops_36' 
* Finish task #57665.

See merge request easycorp/zentaopms!4027
 2022-06-22 00:35:31 +00:00
liyuchun 6076785841 * Show default branch. 2022-06-21 05:37:24 +00:00
liyuchun 76c813efc9 * Finish task #57657. 2022-06-21 03:25:51 +00:00
liyuchun 76a318cb30 * Finish task #57656. 2022-06-20 06:10:33 +00:00
李玉春 6429293b82 Merge branch 'zhouxin_codereview' into 'master' 
* Code for review.

See merge request easycorp/zentaopms!4001
 2022-06-17 05:38:33 +00:00
liyuchun e447ec9a11 * Remove unused code. 2022-06-16 08:57:09 +00:00
liyuchun 13b26f2119 * Add param when exec pipeline. 2022-06-16 08:55:46 +00:00
liyuchun 08b36c0418 * Finish task #57065. 2022-06-16 07:50:39 +00:00
李玉春 e627551ce6 Merge branch 'cyy_optimize' into 'master' 
* Modify page locate.

See merge request easycorp/zentaopms!3968
 2022-06-16 04:25:45 +00:00
李玉春 a3440508a4 Merge branch 'sprint/wangzemei/23705' into 'master' 
* fix bug 23705

See merge request easycorp/zentaopms!3940
 2022-06-16 03:04:15 +00:00
liyuchun 9c675ceb6b * Fix error. 2022-06-15 08:12:42 +00:00
李玉春 be990c21f1 Merge branch 'sprint/sunhao/zui_labels' into 'master' 
* optimize style for labels with outline.

See merge request easycorp/zentaopms!3939
 2022-06-15 07:33:18 +00:00
李玉春 481b40a16b Merge branch 'cyy_23586' into 'master' 
* Fix bug #23586.

See merge request easycorp/zentaopms!3879
 2022-06-15 00:45:00 +00:00
李玉春 4740125462 Merge branch 'sprint/203_mayue_bug23184' into 'master' 
* Fix bug #23184.

See merge request easycorp/zentaopms!3913
 2022-06-14 08:50:25 +00:00
李玉春 578252713b Merge branch '201_zhouxin_issues' into 'master' 
* Fix issue.

See merge request easycorp/zentaopms!3869
 2022-06-10 08:14:03 +00:00
李玉春 15812a5cb1 Merge branch '201_zhouxin_56467' into 'master' 
201 zhouxin 56467

See merge request easycorp/zentaopms!3853
 2022-06-10 02:53:00 +00:00
李玉春 3cd9b94ecb Merge branch 'cyy_56548' into 'master' 
* Modify task import.

See merge request easycorp/zentaopms!3834
 2022-06-09 09:13:47 +00:00
李玉春 fa152a30c8 Merge branch '201_zhouxin_fixbug' into 'master' 
* Fix bug for task #56458.

See merge request easycorp/zentaopms!3838
 2022-06-09 09:13:26 +00:00
李玉春 227586f566 Merge branch 'cyy_56548' into 'master' 
* Modify access check.

See merge request easycorp/zentaopms!3833
 2022-06-09 07:48:59 +00:00
李玉春 f8581fd2c4 Merge branch 'zentaopms_199' into 'master' 
Zentaopms 199

See merge request easycorp/zentaopms!3832
 2022-06-09 07:38:52 +00:00
李玉春 9b0368a6f4 Merge branch 'sprint/199_cyy_56548' into 'zentaopms_199' 
Sprint/199 cyy 56548

See merge request easycorp/zentaopms!3811
 2022-06-09 07:13:01 +00:00
liyuchun f1c720c4a0 * Finish task #56556. 2022-06-09 06:36:52 +00:00
liyuchun bd2503c558 Merge branch 'liyuchun_56551' of https://gitlab.zcorp.cc/easycorp/zentaopms into liyuchun_56551 2022-06-09 06:00:44 +00:00
liyuchun 975088c89d * Adjust task width. 2022-06-09 05:59:43 +00:00
李玉春 3df63e8a2f Merge branch 'sprint/199_mayue_story#9206' into 'master' 
* Optimize code.

See merge request easycorp/zentaopms!3814
 2022-06-09 02:32:04 +00:00
liyuchun d4d24b6e9d * Code for task #56551. 2022-06-09 01:24:38 +00:00
liyuchun bfbfea8bab Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-08 03:15:53 +00:00
liyuchun e78871abde Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-07 08:50:23 +00:00
李玉春 c8c1bfc4c0 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
* Fix bug #23358.

See merge request easycorp/zentaopms!3768
 2022-06-07 06:49:05 +00:00
李玉春 6a1f0a9562 Merge branch 'sprint/fixbug_liumengyi_23340' into 'master' 
* Fix bug #23340.

See merge request easycorp/zentaopms!3762
 2022-06-07 05:28:37 +00:00
李玉春 cf20ee9361 Merge branch 'sprint/tianshujie_23258' into 'master' 
* Fix bug #23258.

See merge request easycorp/zentaopms!3761
 2022-06-07 01:47:07 +00:00
李玉春 21c7ec71b5 Merge branch 'fixbug_sunjun_22885' into 'master' 
fixbug_sunjun_22885

See merge request easycorp/zentaopms!3752
 2022-06-07 01:13:09 +00:00
李玉春 0da04fca77 Merge branch 'sprint/scx_executionbug' into 'master' 
* Fix bug #23291.

See merge request easycorp/zentaopms!3748
 2022-06-07 01:12:52 +00:00
李玉春 9d1276c73a Merge branch 'sprint/tianshujie_bug23335' into 'master' 
* Fix bug #23335.

See merge request easycorp/zentaopms!3760
 2022-06-07 01:02:23 +00:00
李玉春 61142f9f67 Update managemembers.js 2022-06-07 01:01:59 +00:00
李玉春 4bb6bf8843 Merge branch 'fixbug_sunjun_23101' into 'master' 
fixbug_sunjun_23101

See merge request easycorp/zentaopms!3737
 2022-06-07 00:52:50 +00:00
李玉春 189af78ca7 Merge branch 'sprint/scx_recordestimate' into 'master' 
* Modify taskrecordestimate api.

See merge request easycorp/zentaopms!3735
 2022-06-07 00:51:58 +00:00
李玉春 91f7d07cd5 Merge branch 'sprint/fixbug_liumengyi_23290' into 'master' 
* Fix bug #23327.

See merge request easycorp/zentaopms!3759
 2022-06-06 09:30:11 +00:00
李玉春 fd356fbb99 Merge branch 'sprint/sunhao/fix_kanban_col_height' into 'master' 
* fix kanban lane height with auto height option.

See merge request easycorp/zentaopms!3747
 2022-06-06 07:11:13 +00:00
李玉春 35f14676f9 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3749
 2022-06-06 07:10:50 +00:00
李玉春 4709cb6e9f Merge branch 'sprint/scx_zaction' into 'master' 
Sprint/scx zaction

See merge request easycorp/zentaopms!3734
 2022-06-06 02:14:14 +00:00
李玉春 6fe727b009 Update model.php 2022-06-06 02:13:20 +00:00
李玉春 49c1f2161c Update ztcli 2022-06-06 02:09:19 +00:00
liyuchun 16658fdb1c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-06 01:20:49 +00:00
李玉春 bd8ecb4f1c Merge branch 'sprint/196_leiyong_fix_bug' into 'master' 
* Fix bug#23204.

See merge request easycorp/zentaopms!3719
 2022-06-02 07:55:36 +00:00
李玉春 66ca553dad Merge branch 'sprint/master_zhouxudong_23111' into 'master' 
Sprint/master zhouxudong 23111 19265

See merge request easycorp/zentaopms!3722
 2022-06-02 06:32:26 +00:00
liyuchun 620aa77d04 * Finish task #55841. 2022-06-02 06:02:58 +00:00
liyuchun b860d66062 * Fix task #55841. 2022-06-02 05:59:40 +00:00
李玉春 88da2f7565 Merge branch 'sprint/197_tianshujie_fixbug' into 'master' 
Sprint/197 tianshujie fixbug

See merge request easycorp/zentaopms!3714
 2022-06-02 05:27:06 +00:00
liyuchun 92dd5b24b7 Merge branch 'sprint/sunhao/fix_kanban_fullscreen' 2022-06-02 05:20:59 +00:00
李玉春 d36ec41688 Merge branch 'master' into 'sprint/sunhao/fix_kanban_fullscreen' 
# Conflicts:
#   www/js/zui/kanban/min.js
 2022-06-02 05:20:38 +00:00
liyuchun 5fe2567eb6 Merge branch 'sprint/sunhao/fix_kanban' 2022-06-02 03:30:31 +00:00
李玉春 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
liyuchun 29ceb63023 * Fix bug #23132. 2022-06-02 02:49:27 +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