Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,524 Commits 2 Branches 292 Tags
287800ee73fbfd7fdf0bcce764fd0264375eefca
Commit Graph
48524 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
孙广明 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
孙广明 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
mayue c4b508dd06 * Fix bug #30422. 2022-12-01 14:27:07 +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
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
兰宗俊 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
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
孙广明 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
Yagami 6263ee7a5c * Code for task #77801. 2022-12-01 10:34:23 +08:00
xieqiyu c109140c81 * Code for task#77802. Modify batch edit plan. 2022-12-01 10:06:33 +08:00
兰宗俊 73e8aa89e9 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
* fix bug #30402

See merge request easycorp/zentaopms!6425
 2022-12-01 01:45:49 +00:00
lanzongjun aff72c1c26 * fix bug #30402 2022-12-01 09:44:04 +08:00
孙广明 917e23dbcd Merge branch 'sprint/zentaopms268_mayue_task#77795' into 'zentaopms_256' 
* Unlink bug when edit branch of plan.

See merge request easycorp/zentaopms!6424
 2022-12-01 01:08:20 +00:00
mayue d16d7fcb08 * Unlink bug when edit branch of plan. 2022-12-01 09:06:16 +08:00
孙广明 9eb0117eae Merge branch 'sprint/zentaopms268_mayue_task#77795' into 'zentaopms_256' 
* Finish task #77795.

See merge request easycorp/zentaopms!6420
 2022-12-01 00:44:30 +00:00
孙广明 f44f500593 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
Sprint/zentaopms256 lanzongjun

See merge request easycorp/zentaopms!6423
 2022-12-01 00:44:23 +00:00
孙广明 3e5731a93d Merge branch 'pms256_xieqiyu_77802' into 'zentaopms_256' 
Pms256 xieqiyu 77802

See merge request easycorp/zentaopms!6422
 2022-12-01 00:44:10 +00:00
lanzongjun 65fe5985a2 code meeting fix 2022-12-01 08:29:35 +08:00
xieqiyu c9bcbe74ae * Code for task#78030. 2022-11-30 22:29:51 +08:00
xieqiyu 7c51a7f992 * Code for task#77802. 2022-11-30 22:18:27 +08:00
mayue fe91c3e210 * Finish task #77795. 2022-11-30 17:22:39 +08:00
兰宗俊 9952631059 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
* Finish Task #77806

See merge request easycorp/zentaopms!6418
 2022-11-30 08:00:42 +00:00
lanzongjun d704662eca Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms256_lanzongjun 2022-11-30 15:58:15 +08:00
lanzongjun 2a75393953 * Finish Task #77806 2022-11-30 15:57:08 +08:00
兰宗俊 f9819edbbe Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
* Finish Task #77799#77806

See merge request easycorp/zentaopms!6415
 2022-11-30 07:49:08 +00:00
lanzongjun f90d78b40e Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms256_lanzongjun 2022-11-30 15:19:30 +08:00
lanzongjun b1831623e5 * Finish Task #77806 2022-11-30 15:16:44 +08:00
xieqiyu 6aafddee29 * Fix bug of change branch at edit plan page. 2022-11-30 14:44:28 +08:00
lanzongjun 9eebd0051d * Finish Task #77799 2022-11-30 13:44:25 +08:00
lanzongjun 2ea882a99a Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms256_lanzongjun 2022-11-30 13:19:07 +08:00
lanzongjun ea1b231783 * Finish Task #77799 2022-11-30 13:14:27 +08:00
孙广明 529a0d3828 Merge branch 'pms256_xieqiyu_77794' into 'zentaopms_256' 
Pms256 xieqiyu 77794

See merge request easycorp/zentaopms!6411
 2022-11-30 02:46:30 +00:00
xieqiyu 86baf6e608 * Code for task#77794. Modify the page of plan view. 2022-11-30 10:10:22 +08:00
xieqiyu 86577288b2 * Code for task#77794. Modify sql. 2022-11-30 09:50:37 +08:00
xieqiyu 2a92cee55e * Code for task#77794. Batch edit productplan. 2022-11-30 09:45:37 +08:00
xieqiyu 5095e566d8 * Code for task#77794. Edit productplan. 2022-11-30 09:30:44 +08:00
孙广明 f2e618cfa9 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
* Finish Task #77798#77796

See merge request easycorp/zentaopms!6403
 2022-11-30 01:20:50 +00:00
lanzongjun 7e0f9114c0 code meeting fix 2022-11-30 09:17:05 +08:00