Commit Graph
45025 Commits
Author SHA1 Message Date
lanzongjun ac75c1ee07 * fix bug #27795 2022-09-23 09:20:14 +08:00
lanzongjun 5fdd1d0972 * fix bug #27800 2022-09-23 09:03:04 +08:00
wangyidong a3b4211a4c * fix bug #27643. 2022-09-22 16:22:16 +08:00
wangyidong cd1798bee6 * fix bug #27768. 2022-09-22 16:08:42 +08:00
wangyidong a245491755 Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240 2022-09-22 15:28:52 +08:00
王怡栋 f7ed912f0a Merge branch 'sprint/zentaopms240' into 'sprint/zentaopms240_lanzongjun'
# Conflicts:
#   module/project/control.php
2022-09-22 07:28:33 +00:00
lanzongjun 3438ffbbc0 * fix bug #27793 2022-09-22 15:27:04 +08:00
lanzongjun 8f1ebe9a1d * fix bug #27793 2022-09-22 15:25:13 +08:00
lanzongjun db22ae810a Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-22 15:24:55 +08:00
lanzongjun 4c7fe09c1e * fix bug #27793 2022-09-22 15:24:24 +08:00
王怡栋 1b67944be1 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27786

See merge request easycorp/zentaopms!5485
2022-09-22 06:55:30 +00:00
lanzongjun 52fdb68caa * fix bug #27788 2022-09-22 14:53:54 +08:00
lanzongjun c4c57794ea * fix bug #27788 2022-09-22 14:49:33 +08:00
王怡栋 644442f728 Merge branch 'sprint/zentaopms240_story_nosprint' into 'sprint/zentaopms240'
* Adjust for story menu of nosprint.

See merge request easycorp/zentaopms!5483
2022-09-22 06:43:39 +00:00
王怡栋 66d557a280 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
Sprint/zentaopms240 lanzongjun

See merge request easycorp/zentaopms!5470
2022-09-22 06:42:54 +00:00
daitingting 2b41c96585 * Adjust for story menu of nosprint. 2022-09-22 06:36:12 +00:00
wangyidong 653118b916 * fix bug #27783. 2022-09-22 14:32:57 +08:00
王怡栋 1b5a1296e0 Merge branch 'sprint/zentaopms240_task#69699' into 'sprint/zentaopms240'
* Finish task #69699.

See merge request easycorp/zentaopms!5466
2022-09-22 06:15:41 +00:00
wangyuting2 bdae125fd3 * Update white for project. 2022-09-22 06:11:35 +00:00
王怡栋 36f6dd0089 Merge branch 'sprint/zentaopms240_fixbug' into 'sprint/zentaopms240'
* Optimize lang file.

See merge request easycorp/zentaopms!5473
2022-09-22 06:09:02 +00:00
王怡栋 1a40027667 Merge branch 'sprint/zentaopms240_task_69246' into 'sprint/zentaopms240'
Optimize tips.

See merge request easycorp/zentaopms!5477
2022-09-22 06:08:05 +00:00
王怡栋 20d6f6e9da Merge branch 'sprint/zentaopms240_daitingting_nosprint' into 'sprint/zentaopms240'
* Do not dispaly noSprint execution in execution list.

See merge request easycorp/zentaopms!5468
2022-09-22 06:07:15 +00:00
lanzongjun 45aac919b3 Merge branch 'sprint/zentaopms240_lanzongjun' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-22 14:03:51 +08:00
lanzongjun 03441d3bfc * fix bug #27788 2022-09-22 14:03:44 +08:00
daitingting 06022d2d06 * Fix bug for #27683. 2022-09-22 05:57:35 +00:00
daitingting 856012deb0 * Format codes. 2022-09-22 05:41:01 +00:00
daitingting f2abc5711c * Optimize tips for task #69246. 2022-09-22 05:39:45 +00:00
lanzongjun 70c070e15e execution test case 2022-09-22 13:23:32 +08:00
lanzongjun 378ec2a0c9 execution test case 2022-09-22 13:22:21 +08:00
lanzongjun 85ff42bf33 program test case 2022-09-22 11:30:34 +08:00
lanzongjun 9ca3193772 Merge branch 'sprint/zentaopms240_lanzongjun' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-22 11:11:48 +08:00
lanzongjun 70a1559e4f program test case 2022-09-22 11:11:22 +08:00
wangyuting2 e5976d126c * Optimize lang file. 2022-09-22 02:42:36 +00:00
lanzongjun 4acd0b7401 fix noSprint create default execu 2022-09-22 09:42:30 +08:00
wangyidong 64bb6eb19f * adjust for no sprint menu. 2022-09-22 09:42:01 +08:00
lanzongjun bfba29a435 fix noSprint def val 2022-09-22 09:39:48 +08:00
daitingting 1b06c15819 * Do not dispaly noSprint execution in execution list. 2022-09-22 01:18:23 +00:00
wangyuting2 6a82102b27 * Finish task #69699. 2022-09-22 01:05:34 +00:00
wangyidong 0165845882 Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240 2022-09-22 08:31:57 +08:00
wangyidong 2a57f28bc5 * code for create story. 2022-09-22 08:31:44 +08:00
王怡栋 e5cad7fd7a Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27684#27607

See merge request easycorp/zentaopms!5460
2022-09-21 09:14:08 +00:00
wangyidong afabcc1343 * adjust for create story for no sprint project. 2022-09-21 16:44:06 +08:00
wangyidong 6bb5b51ca8 * adjus for create story for no sprint project. 2022-09-21 16:41:39 +08:00
lanzongjun 222a65223f * fix meeting 2022-09-21 16:30:05 +08:00
lanzongjun 13f713060c * fix bug #27684 2022-09-21 15:19:38 +08:00
lanzongjun 77af712c03 * fix bug #27607 2022-09-21 15:13:03 +08:00
王怡栋 d0da351eb3 Merge branch 'sprint/zentaopms240_fixbug#27656' into 'sprint/zentaopms240'
* Fix bug #27656.

See merge request easycorp/zentaopms!5453
2022-09-21 07:04:38 +00:00
王怡栋 259e03174d Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
fix noSprint

See merge request easycorp/zentaopms!5451
2022-09-21 07:02:35 +00:00
lanzongjun 9ab3bc4937 * fix bug #27605 2022-09-21 15:01:49 +08:00
lanzongjun 41f14e7ae4 add default sprint 2022-09-21 14:51:41 +08:00