Commit Graph
664 Commits
Author SHA1 Message Date
孙广明 1978dbd4b8 Merge branch 'fixbug_25216' into 'master'
Fixbug 25216

See merge request easycorp/zentaopms!4528
2022-07-14 01:46:40 +00:00
王怡栋 842a44f27c Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Fix bug for task #60476, and fix bug #25063, and fix bug #25230.

See merge request easycorp/zentaopms!4525
2022-07-14 01:36:52 +00:00
liumengyi b242d1319f * Fix bug #25230. 2022-07-14 09:28:42 +08:00
孙广明 665901a969 * Fix bug #25226. 2022-07-14 09:09:48 +08:00
sunjun 63ee113190 fixbug_25216 2022-07-14 00:44:15 +00:00
王怡栋 677a224d84 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug about kanban actions.

See merge request easycorp/zentaopms!4520
2022-07-13 07:22:35 +00:00
zhouxudong 73dd8c3eeb * Fix bug about kanban actions. 2022-07-13 07:17:04 +00:00
孙广明 d2c80aa71a * Code for error. 2022-07-13 14:38:58 +08:00
孙广明 d8e313669e Merge branch 'sprint/211_sunjun_60474' into 'master'
Sprint/211 sunjun 60474

See merge request easycorp/zentaopms!4503
2022-07-13 05:10:46 +00:00
sunjun 0c7767c3c5 60474 2022-07-13 04:31:32 +00:00
孙广明 f506169428 * Only query active task in execution list. 2022-07-13 08:54:39 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 bd9700212c * Finish task #59706. 2022-07-12 22:48:07 +08:00
孙广明 2557d4ba30 * Code for execution list. 2022-07-12 17:30:14 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
zhouxudong 4e454da271 * Fix bug. 2022-07-12 07:30:01 +00:00
zhouxudong 49ae55568d * Fix bug about kanban's task actions. 2022-07-12 07:18:43 +00: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
孙广明 4caa38c31e * Code for execution list. 2022-07-12 14:00:25 +08:00
孙广明 daf3ef4c99 * Code for execution list. 2022-07-12 00:43:56 +08: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
sunjun 1404449da1 sprint/211_sunjun_60474 2022-07-11 09:09:29 +00:00
wangyidong bb0fdc74c9 * code for bug #24927. 2022-07-08 17:35:06 +08:00
孙广明 1afa07c083 * Code for task list. 2022-07-08 13:37:28 +08:00
王怡栋 b202420822 Merge branch 'sprint/master_zhouxudong_59681' into 'master'
* Finish task #59681.

See merge request easycorp/zentaopms!4431
2022-07-08 03:30:23 +00:00
zhouxudong e8da735c95 * Finish task #59681. 2022-07-08 03:28:02 +00:00
孙广明 df7787bbd1 Merge branch 'fixbug_createTask' into 'master'
Fixbug create task

See merge request easycorp/zentaopms!4427
2022-07-08 02:43:15 +00:00
sunjun d2b201003b fixbug 2022-07-08 02:37:29 +00:00
王怡栋 272ba58696 Merge branch 'sprint/master_zhouxudong_59681' into 'master'
Sprint/master zhouxudong 59681

See merge request easycorp/zentaopms!4426
2022-07-08 02:09:05 +00:00
zhouxudong 7988466f2f * Finish task #59681. 2022-07-08 02:07:45 +00:00
zhouxudong e146c91ecb * Finish task #59681. 2022-07-08 02:04:04 +00:00
sunjun f7400480d4 fixbug_createTask 2022-07-08 02:02:22 +00:00
zhouxudong 85cecc60e5 * Finish task #59681. 2022-07-08 01:55:07 +00:00
zhouxudong f8c7be2001 * Finish task #59681. 2022-07-08 01:47:03 +00:00
zhouxudong e68d805486 * Finish task #59681. 2022-07-07 07:49:17 +00:00
zhouxudong 63128f6258 * Finish task #59681. 2022-07-07 05:36:28 +00:00
zhouxudong 28c6608986 * Finish task #59681. 2022-07-07 02:59:57 +00:00
daitingting 3bdeeea0f0 * Fix bug #24908. 2022-07-07 01:12:48 +00:00
孙广明 52a588ec90 * Code for kanban error. 2022-07-01 14:38:20 +08:00
sunjun 7882690c49 fixbug_22007 2022-06-30 09:16:49 +00:00
caoyanyi ff8bef7fe6 * Fix bug #24222. 2022-06-29 17:09:21 +08:00
zenggang 15feb917ce * Finish task#58772,58774,58775 2022-06-28 05:39:31 +00:00
xieqiyu 78e86b9493 * Finish task#58591. 2022-06-27 11:25:11 +08:00
孙广明 da2b704d31 * Finish task #57157. 2022-06-14 10:46:29 +08:00
zhouxin 68b8268391 * Finish task #55258. 2022-06-13 01:25:38 +00:00
wangyidong 9b699300ff * code for bug #23516. 2022-06-09 16:50:07 +08:00
王怡栋 95fa3f04e1 Merge branch 'fixbug' into 'master'
* Fix bug #23474,23474,23441,23374.

See merge request easycorp/zentaopms!3830
2022-06-09 07:25:39 +00:00