Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
39,487 Commits 2 Branches 292 Tags
4744448fc56ba83afd92f165875d096d3a9751d7
Commit Graph
39487 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
leiyong 4744448fc5 * Adjust method name. 2022-05-26 07:43:52 +00:00
leiyong ea4eb1d2de * Finish task#54979. 2022-05-26 07:28:03 +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
liumengyi 673c192017 * Fix bug #22664. 2022-05-25 15:41:27 +08:00
王怡栋 b4646bcf9c Merge branch 'sprint/master_zhouxudong_54998' into 'master' 
* Finish task #54998.

See merge request easycorp/zentaopms!3591
 2022-05-25 07:17:49 +00:00
王怡栋 601272cd59 Merge branch 'sprint/193_hufangzhou_54994' into 'master' 
* Finish task #54994.

See merge request easycorp/zentaopms!3580
 2022-05-25 07:10:56 +00:00
王怡栋 7466f08e23 Merge branch 'sprint/193_hufangzhou_54996' into 'master' 
* Finish task #54996.

See merge request easycorp/zentaopms!3581
 2022-05-25 07:09:51 +00:00
王怡栋 137085feed Merge branch 'sprint/193_hufangzhou_54990' into 'master' 
* Finish task #54990.

See merge request easycorp/zentaopms!3585
 2022-05-25 07:09:26 +00:00
王怡栋 b68c2e6a80 Merge branch 'sprint/193_hufangzhou_644' into 'master' 
* Resolve issue #644.

See merge request easycorp/zentaopms!3589
 2022-05-25 07:09:06 +00:00
王怡栋 95b32771fa Merge branch 'sgm_task55323' into 'master' 
* Fix bug #55323.

See merge request easycorp/zentaopms!3590
 2022-05-25 07:03:22 +00:00
孙广明 ececdba8df * Fix bug #55323. 2022-05-25 14:46:59 +08:00
孙广明 2c60c73f47 Merge branch 'sprint/195_zg_55147' into 'master' 
* Finish task#55174，55172

See merge request easycorp/zentaopms!3573
 2022-05-25 05:51:37 +00:00
孙广明 2874bcb8a8 Merge branch 'sprint/195_mayue_bug#22901' into 'master' 
* Fix bug #22901.

See merge request easycorp/zentaopms!3584
 2022-05-25 05:50:33 +00:00
孙广明 45398e9ac0 Merge branch 'sprint/192_leiyong_issue_647' into 'master' 
* Issue 657 resolved.

See merge request easycorp/zentaopms!3587
 2022-05-25 05:50:18 +00:00
孙广明 9fe66976f5 Merge branch 'sprint/192_leiyong_issue_645' into 'master' 
* Issue 645 resolved.

See merge request easycorp/zentaopms!3586
 2022-05-25 05:49:31 +00:00
hufangzhou 9e3133e2a3 * Resolve issue #644. 2022-05-25 13:49:25 +08:00
孙广明 5b04aecf56 Merge branch 'sprint/194_liumengyi_fixbug' into 'master' 
* Fix bug #22665.

See merge request easycorp/zentaopms!3588
 2022-05-25 05:49:16 +00:00
liumengyi 52fc5e45ec * Fix bug #22665. 2022-05-25 13:40:38 +08:00
hufangzhou 80c73a6f83 * Finish task #54990. 2022-05-25 13:30:30 +08:00
mayue 33b78769b4 * Fix bug #22901. 2022-05-25 05:28:36 +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
liumengyi 6c97c84844 * Fix bug #22562. 2022-05-25 13:21:50 +08:00
liumengyi 12b1711669 * Add language item of kanban. 2022-05-25 13:14:43 +08: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
sunjun 2219a42fa2 fixbug_sunjun_194 2022-05-25 05:09:51 +00:00
sunjun 4a3a1dee33 fixbug_sunjun_sprint194 2022-05-25 05:06:22 +00:00
孙广明 04932fc4b0 Merge branch 'sprint/195_mayue_bug#22881' into 'master' 
* Fix bug #22881.

See merge request easycorp/zentaopms!3579
 2022-05-25 03:29:21 +00:00
孙广明 051fd7b74f Merge branch 'sprint/195_mayue_bug#22880' into 'master' 
* Fix bug #22880.

See merge request easycorp/zentaopms!3575
 2022-05-25 03:28:42 +00:00
hufangzhou 47151034b0 * Finish task #54996. 2022-05-25 11:21:49 +08:00
sunjun c4d2cfe200 fixbug_sunjun_sprint194 2022-05-25 03:19:07 +00:00
sunjun 532ed847f3 fixbug_sunjun 2022-05-25 03:07:59 +00:00
zenggang 33a23e09c5 * Finish task#55172 2022-05-25 02:51:17 +00:00
hufangzhou 5ea15374ac * Finish task #54994. 2022-05-25 10:51:01 +08:00
王怡栋 b9ae95e669 Merge branch 'sprint/189_package_lanzongjun' into 'master' 
* fix bug #54947

See merge request easycorp/zentaopms!3574
 2022-05-25 02:38:28 +00:00
王怡栋 2c4bbef9a6 Merge branch 'sprint/master_zhouxudong_54981' into 'master' 
Sprint/master zhouxudong 54981

See merge request easycorp/zentaopms!3578
 2022-05-25 02:33:04 +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
zhouxudong 55ab5ee69d * Finish task #54981 #54982. 2022-05-25 02:31:02 +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
mayue 623cc446f9 * Fix bug #22881. 2022-05-25 02:28:08 +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
sunjun 62c617db87 sprint_sunjun_55259 2022-05-25 02:10:02 +00:00
liumengyi 7baafc5ca0 * Code format. 2022-05-25 10:07:06 +08:00
liumengyi 743ea79536 * Fix bug #22665. 2022-05-25 10:04:18 +08:00
mayue 33730f3787 * Fix bug #22880. 2022-05-25 01:56:04 +00:00
lanzongjun 5eb84a81d0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/189_package_lanzongjun 2022-05-25 09:45:32 +08:00
lanzongjun ae45c26343 * fix bug #54947 2022-05-25 09:45:13 +08:00