Commit Graph
42050 Commits
Author SHA1 Message Date
王怡栋 b2097b9b7c Merge branch 'sprint/215_tianshujie_60667' into 'master'
* Fix bug #25070.

See merge request easycorp/zentaopms!4480
2022-07-12 07:40:33 +00:00
王怡栋 8423bbb096 Merge branch 'sprint/215_tianshujie_60475' into 'master'
Sprint/215 tianshujie 60475

See merge request easycorp/zentaopms!4479
2022-07-12 07:39:54 +00:00
tianshujie a73cfac42c * Finish task #60475. 2022-07-12 15:33:44 +08:00
liumengyi b4ab8b5b39 * Finish task #60491. 2022-07-12 15:31:11 +08:00
zhouxudong 4e454da271 * Fix bug. 2022-07-12 07:30:01 +00:00
李玉春 4d6d9e4181 Merge branch 'sprint/wangzemei/bug23827' into 'master'
* Code for bug #23827

See merge request easycorp/zentaopms!4478
2022-07-12 07:27:02 +00:00
wangzemei 24aab39145 * Code for bug #23827 2022-07-12 07:24:15 +00:00
王怡栋 8bbc43b99c Merge branch 'sprint/master_zhouxudong_60393' into 'master'
* Finish task #60393.

See merge request easycorp/zentaopms!4468
2022-07-12 07:23:46 +00:00
zhouxudong 49ae55568d * Fix bug about kanban's task actions. 2022-07-12 07:18:43 +00:00
孙广明 398a5f47f7 Merge branch 'sprint216_60640' into 'master'
* Code for task#60640

See merge request easycorp/zentaopms!4477
2022-07-12 07:17:01 +00:00
zhouxudong 09eabd3b84 * Finish task #60393. 2022-07-12 07:15:27 +00:00
zenggang 6a84cd7469 * Code for task#60640 2022-07-12 07:15:13 +00:00
王怡栋 58941466a6 Merge branch 'master_xieqiyu_fixKanbanBug' into 'master'
* Fix bug of story and bug action in execution.

See merge request easycorp/zentaopms!4471
2022-07-12 07:03:09 +00:00
王怡栋 1aa2f24efc Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of create project when select all branch.

See merge request easycorp/zentaopms!4470
2022-07-12 07:00:55 +00:00
mayue f44d5659df * Fix bug #24404. 2022-07-12 15:00:11 +08:00
王怡栋 39d3d083ad Merge branch 'sprint/master_zhouxudong_60376' into 'master'
* Finish task #60388.

See merge request easycorp/zentaopms!4469
2022-07-12 06:57:01 +00:00
liumengyi ba36ed56b5 * Fix bug #60491. 2022-07-12 14:42:55 +08:00
孙广明 507eb73497 Merge branch 'sprint/216_mayue_bug#25081' into 'master'
* Fix bug #25081.

See merge request easycorp/zentaopms!4473
2022-07-12 06:28:56 +00:00
mayue 0a5cf0a831 * Optimize code. 2022-07-12 14:28:17 +08:00
mayue a21626979e * Fix bug #25081. 2022-07-12 14:25:58 +08:00
tianshujie 1d1441f17f * Fix bug #25070. 2022-07-12 14:22:37 +08:00
zhouxudong 94c09e733d * Fix bug about taskkanban. 2022-07-12 06:12:02 +00:00
孙广明 c56ec2cbe4 * Add stage name. 2022-07-12 14:08:35 +08:00
zhouxudong 69101c8409 * Fix bug about taskkanban. 2022-07-12 06:06:02 +00:00
xieqiyu 658a187e47 * Fix bug of story and bug action in execution. 2022-07-12 14:05:40 +08:00
孙广明 4caa38c31e * Code for execution list. 2022-07-12 14:00:25 +08:00
王怡栋 d47cde97d2 Merge branch 'master_xieqiyu_25030' into 'master'
* Fix bug#25030.

See merge request easycorp/zentaopms!4464
2022-07-12 05:31:04 +00:00
wangyidong 366f2ef207 Merge branch 'sprint/master_zhouxudong_60389' 2022-07-12 13:30:27 +08:00
王怡栋 a063544f5f Merge branch 'master' into 'sprint/master_zhouxudong_60389'
# Conflicts:
#   module/file/view/buildform.html.php
#   module/file/view/viewfiles.html.php
2022-07-12 05:30:11 +00:00
liumengyi 154c18ee43 * Finish task #60476. 2022-07-12 11:07:16 +08:00
zhouxudong 951d41d721 * Finish task #60393. 2022-07-12 02:54:06 +00:00
孙广明 d7afa0268b Merge branch 'sprint/216_mayue_bug24404' into 'master'
* Fix bug #24404.

See merge request easycorp/zentaopms!4467
2022-07-12 02:50:36 +00:00
孙广明 1f0652faa8 Merge branch 'sprint216_zg_60640' into 'master'
* Finish task#60640

See merge request easycorp/zentaopms!4466
2022-07-12 02:34:49 +00:00
zenggang f3dd489f61 * Adjust code 2022-07-12 02:32:01 +00:00
zenggang 5d116c16c9 * Finish task#60640 2022-07-12 02:29:20 +00:00
mayue 14ace897ca * Fix bug #24404. 2022-07-12 10:21:23 +08:00
sunjun d1d49fe404 sprint/211_sunjun_60474 2022-07-12 02:03:53 +00:00
xieqiyu bd596ac686 * Fix bug#25030. 2022-07-12 09:32:31 +08:00
tianshujie 40ba26dda6 * Finish task #60475. 2022-07-12 09:21:58 +08:00
zhouxudong 2196d2746d * Finish task #60388. 2022-07-12 01:05:21 +00:00
孙广明 107060744e Merge branch 'sprint/216_mayue_task#60639' into 'master'
* Finish task #60639.

See merge request easycorp/zentaopms!4463
2022-07-12 00:54:34 +00:00
zhouxudong 6b66d72804 * Finish task #60387. 2022-07-12 00:51:29 +00:00
王怡栋 3ca4195444 Merge branch 'master_xieqiyu_25062' into 'master'
* Fix bug#25062.

See merge request easycorp/zentaopms!4460
2022-07-12 00:47:47 +00:00
王怡栋 af542ae500 Merge branch 'sprint/master_zhouxudong_60383' into 'master'
* Finish task #60387 #60386 #60383.

See merge request easycorp/zentaopms!4459
2022-07-12 00:47:35 +00:00
孙广明 5fcb433409 Merge branch 'sprint214_leiyong_task_60375' into 'master'
Sprint214 leiyong task 60375

See merge request easycorp/zentaopms!4456
2022-07-12 00:31:43 +00:00
xieqiyu e7d7930b5b * Fix bug#25062. 2022-07-12 08:13:36 +08:00
孙广明 daf3ef4c99 * Code for execution list. 2022-07-12 00:43:56 +08:00
孙广明 62673467ef Merge branch 'sprint212_fix_bug' into 'master'
* Delete icon.

See merge request easycorp/zentaopms!4443
2022-07-11 15:40:32 +00:00
zhouxudong fd2b8ec129 * Fix bug. 2022-07-11 12:56:31 +00:00
孙广明 f507af4cd0 * Code for stage list. 2022-07-11 18:19:27 +08:00