Commit Graph
45042 Commits
Author SHA1 Message Date
wangyuting2 129bec2618 * Finish task #70192. 2022-09-26 06:44:02 +00:00
王 于听 00811262c8 Merge branch 'sprint/zentaopms240_fixbug#70191' into 'sprint/zentaopms240'
Sprint/zentaopms240 fixbug#70191

See merge request easycorp/zentaopms!5542
2022-09-26 06:04:39 +00:00
wangyuting2 f1d51e5a0d * Finish task #70191. 2022-09-26 06:02:47 +00:00
wangyuting2 03da1bcf64 * Optimize code for review code. 2022-09-26 05:56:56 +00:00
wangyidong 0ba479e9e5 * finish task #70196. 2022-09-26 13:15:48 +08:00
wangyidong 685799b216 * adjust for set no sprint Menu. 2022-09-23 16:22:32 +08:00
王怡栋 e82c2da808 Merge branch 'sprint/zentaopms240_task_69719' into 'sprint/zentaopms240'
* Finish task #69719.

See merge request easycorp/zentaopms!5514
2022-09-23 05:52:28 +00:00
daitingting fb14ecd593 * Finish task #69719. 2022-09-23 05:18:41 +00:00
王怡栋 0a46a85f71 Merge branch 'sprint/zentaopms240_task#69723' into 'sprint/zentaopms240'
* Finish task #69723

See merge request easycorp/zentaopms!5505
2022-09-23 03:14:57 +00:00
王怡栋 affe10c07b Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27792

See merge request easycorp/zentaopms!5502
2022-09-23 03:14:05 +00:00
wangyuting2 47a4c0fd0a * Finish task #69723 2022-09-23 02:46:31 +00:00
lanzongjun a478be994f * fix bug #27792 2022-09-23 10:12:14 +08:00
王怡栋 7b655bcdca Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27795

See merge request easycorp/zentaopms!5498
2022-09-23 01:23:15 +00:00
lanzongjun ac75c1ee07 * fix bug #27795 2022-09-23 09:20:14 +08:00
王怡栋 60dd30b380 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27800

See merge request easycorp/zentaopms!5495
2022-09-23 01:07:00 +00:00
王怡栋 06098879ba Merge branch 'sprint/zentaopms240_task#69722' into 'sprint/zentaopms240'
* Finish task #69722.

See merge request easycorp/zentaopms!5489
2022-09-23 01:05:34 +00: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
wangyuting2 48187a2051 * Fix bug #27805. 2022-09-22 08:19:20 +00:00
wangyidong cd1798bee6 * fix bug #27768. 2022-09-22 16:08:42 +08:00
wangyuting2 645e068158 * Finish task #69722. 2022-09-22 07:44:03 +00: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