Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,825 Commits 2 Branches 292 Tags
d8a5944a84499bc18669c27f0cdcdffa3a0a7bee
Commit Graph
48825 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chenjianyu 364eb8da6e * add a task query method for zentao bot. 2022-12-02 08:14:40 +08:00
wangyuting e100ad058c * Fix bug. 2022-12-01 09:03:16 +00:00
王怡栋 8047908575 Merge branch 'zentaopms266_wyd' into 'master' 
* fix bug #30274.

See merge request easycorp/zentaopms!6445
 2022-12-01 09:00:59 +00:00
wangyidong 8007950ef9 * fix bug #30274. 2022-12-01 16:59:45 +08:00
王怡栋 9c5c781b52 Merge branch 'zentaopms_266_task_#77616' into 'master' 
* Fix bug for task #77615,#77616.

See merge request easycorp/zentaopms!6444
 2022-12-01 08:39:27 +00:00
Wenrui LI 1c87eaed8c * fix lang of zentao bot. 2022-12-01 16:37:40 +08:00
daitingting 995f927ae6 * Fix bug for task #77615,#77616. 2022-12-01 08:36:46 +00:00
Wenrui LI d7ab82aaf2 Merge tag 'zentaopms_18.0.beta1' into sprint/xuanxuan_127 
* Add the new tag.
 2022-12-01 16:34:10 +08:00
兰宗俊 94157d4c10 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
fix change product text missing

See merge request easycorp/zentaopms!6443
 2022-12-01 08:15:53 +00:00
lanzongjun 542cd36946 fix change product text missing 2022-12-01 16:14:56 +08:00
王怡栋 5aa2fda450 Merge branch 'zentaopms_266_bug#30429' into 'master' 
* Fix bug #30429.

See merge request easycorp/zentaopms!6436
 2022-12-01 07:58:03 +00:00
王怡栋 dc827982fe Merge branch 'master_bug_23961' into 'master' 
* Fix bug #23961.

See merge request easycorp/zentaopms!6432
 2022-12-01 07:57:10 +00:00
王怡栋 00312f6d4f Merge branch 'sprint/feedback1358' into 'master' 
Sprint/feedback1358

See merge request easycorp/zentaopms!6431
 2022-12-01 07:56:07 +00:00
王怡栋 7013e19604 Merge branch 'sprint/feedback1403' into 'master' 
Sprint/feedback1403

See merge request easycorp/zentaopms!6428
 2022-12-01 07:54:50 +00:00
孙广明 71f18cd3b3 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
fix cp project js error

See merge request easycorp/zentaopms!6442
 2022-12-01 07:42:25 +00:00
lanzongjun a13ae45bd1 fix cp project js error 2022-12-01 15:36:17 +08:00
Wenrui LI 0eb2b21ffe * add more lang for zentao bot. 2022-12-01 15:15:54 +08:00
Yagami 0d028378b4 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-01 15:15:22 +08:00
Yagami cfc70e8176 * Code for task #77800. 2022-12-01 15:15:07 +08:00
朱金勇 fe071c9de7 Merge branch 'check_ext-gd' into 'master' 
* Add check ext-gd extension.

See merge request easycorp/zentaopms!6430
 2022-12-01 07:05:16 +00:00
Wenrui LI a0846ccdfc * refactor zentao bot , add lang. 2022-12-01 14:49:52 +08:00
孙广明 287800ee73 Merge branch 'zentaopms_256' into 'sprint/zentaopms268_mayue_bug#30422' 
# Conflicts:
#   module/productplan/control.php
 2022-12-01 06:47:48 +00:00
mayue c866a1ab41 * Fix bug #30422. 2022-12-01 14:46:04 +08:00
孙广明 a315f7205f Merge branch 'sprint/fixbug_liumengyi_30278' into 'master' 
* Fix bug #30278.

See merge request easycorp/zentaopms!6439
 2022-12-01 06:44:33 +00:00
孙广明 b191213fce Merge branch 'lyk_feedback_1461' into 'master' 
* Resolve feedback #1461.

See merge request easycorp/zentaopms!6440
 2022-12-01 06:36:01 +00:00
孙广明 1caccc3696 Merge branch 'sprint/zentaopms268_mayue_bug#30373' into 'zentaopms_256' 
* Fix bug #30373.

See merge request easycorp/zentaopms!6438
 2022-12-01 06:31:11 +00:00
孙广明 058766bdd5 Merge branch 'sprint/zentaopms268_mayue_bug#30422' into 'zentaopms_256' 
* Fix bug #30422.

See merge request easycorp/zentaopms!6437
 2022-12-01 06:31:01 +00:00
wangyuting 2bd28233ea * Fix bug #30429. 2022-12-01 06:28:13 +00:00
mayue c4b508dd06 * Fix bug #30422. 2022-12-01 14:27:07 +08:00
liuyongkai 80bd2c745c * Resolve feedback #1461. 2022-12-01 14:25:21 +08:00
兰宗俊 fea8d534ab Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
edit story fix empty

See merge request easycorp/zentaopms!6435
 2022-12-01 06:24:34 +00:00
mayue f7c3965d57 * Fix bug #30373. 2022-12-01 14:23:39 +08:00
lanzongjun 1651a1492e edit story fix empty 2022-12-01 14:23:31 +08:00
王怡栋 07ed3b2d9d Merge branch 'zentaopms266_wyd' into 'master' 
* fix bug #30425.

See merge request easycorp/zentaopms!6434
 2022-12-01 06:16:24 +00:00
wangyidong 22081a43de * fix bug #30425. 2022-12-01 14:15:35 +08:00
lanzongjun 7535a68128 rollback code 2022-12-01 14:07:43 +08:00
兰宗俊 c763162cc1 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
master branch  only relation master plan

See merge request easycorp/zentaopms!6433
 2022-12-01 06:05:48 +00:00
lanzongjun 658144ab3a master branch only relation master plan 2022-12-01 14:04:55 +08:00
lanzongjun 315dc16980 master branch only relation master plan 2022-12-01 14:04:26 +08:00
Yagami 788f431911 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-01 13:53:02 +08:00
Yagami 7a843ece37 * Code for task #77800. 2022-12-01 13:52:46 +08:00
chaideqing 3c3ce67354 * Refactor code. 2022-12-01 13:35:05 +08:00
兰宗俊 d4c0fd8501 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
* fix bug #30405

See merge request easycorp/zentaopms!6429
 2022-12-01 05:10:30 +00:00
Lufei 80d2e0f6c0 * Add check ext-gd extension. 2022-12-01 12:16:57 +08:00
lanzongjun 6548926a91 * fix bug #30405 2022-12-01 11:18:53 +08:00
lanzongjun bffe373548 * fix bug #30405 2022-12-01 11:17:05 +08:00
chaideqing ca3adef629 * Refactor code. 2022-12-01 11:15:52 +08:00
孙广明 d256b5c6aa Merge branch 'pms256_xieqiyu_77802' into 'zentaopms_256' 
* Code for task#77802. Modify batch edit plan.

See merge request easycorp/zentaopms!6426
 2022-12-01 02:46:23 +00:00
xieqiyu d5b322bc05 * Code for task#77802. Add tips when branch empty at batch edit plan. 2022-12-01 10:41:27 +08:00
Yagami e08a99744e Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-01 10:34:42 +08:00