Commit Graph
696 Commits
Author SHA1 Message Date
wangyidong 39ce15c672 * fix bug #27092. 2022-08-31 16:11:54 +08:00
sunguangming 5463a7e62c * merge code. 2022-08-31 14:06:04 +08:00
wangyidong 11c3ef03cc * adjust for delete estimate. 2022-08-26 22:14:53 +08:00
王怡栋 3eaf146f25 Merge branch 'sprint/zentaopms230' into '230'
# Conflicts:
#   module/task/model.php
2022-08-26 06:52:24 +00:00
wangyidong 3a5f4201ed * adjust for multi task. 2022-08-26 14:50:48 +08:00
王怡栋 662f428288 Merge branch 'sprint/zentaopms230' into '230'
# Conflicts:
#   module/task/control.php
2022-08-26 06:39:53 +00:00
sunguangming a27dc9a3f2 * Code for mulit task. 2022-08-26 14:33:50 +08:00
wangyidong d9b1aa5e8d * adjust for finish. 2022-08-25 13:25:58 +08:00
sunguangming f49d83f024 Merge branch '230' into sprint/zentaopms230 2022-08-25 09:59:07 +08:00
wangyidong c0467f2b7d * adjust for activate task. 2022-08-24 22:20:54 +08:00
sunguangming 01172dd284 * Code for muliple task. 2022-08-24 16:05:21 +08:00
wangyidong fcc537bacc * code for task #65286. 2022-08-23 17:26:04 +08:00
wangyidong 5a61f56960 * adjust for start and finish linear task. 2022-08-19 15:47:24 +08:00
wangyidong ae326809cc * adjust for start, assignto, finish task in linear task. 2022-08-17 21:15:36 +08:00
sunguangming 7f69b62231 * Code for task #65278. 2022-08-17 16:51:28 +08:00
sunguangming 6a1bb3f756 * Code for task #65278. 2022-08-17 16:13:26 +08:00
wangyidong aa4fd1de10 * adjust for linear task. 2022-08-17 13:07:33 +08:00
tianshujie 26085d7a41 * Operations type execution and story or design type stage do not display story field. 2022-08-12 14:56:27 +08:00
zhouxudong b0351e7036 * Fix bug #25672. 2022-07-26 05:27:05 +00:00
zhouxudong 9d5f891419 * Finish task #61441. 2022-07-21 01:40:43 +00:00
zhouxudong 1c4c282aee * Finish task #61441. 2022-07-21 01:29:57 +00:00
zhouxudong c637a40725 * Finish task #61441. 2022-07-20 06:56:14 +00:00
zhouxudong 8e46671c20 * Finish task #61441. 2022-07-20 03:07:38 +00:00
zhouxudong 178ea59c4e * Finish task #61441. 2022-07-20 02:30:19 +00:00
zhouxudong 5688575ea9 * Fix bug. 2022-07-18 03:13:48 +00:00
孙广明 900e2342a2 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4582
2022-07-15 06:16:50 +00:00
tianshujie 656cc5f060 * Fix bug #25321. 2022-07-15 14:07:32 +08:00
zhouxudong 56c1339fbe * Fix bug. 2022-07-15 03:36:57 +00:00
孙广明 6b19ed146d Merge branch 'sprint/tianshujie_25268' into 'master'
Sprint/tianshujie 25268

See merge request easycorp/zentaopms!4547
2022-07-14 07:24:17 +00:00
tianshujie 711c0e9e8c * Fix bug #25088. 2022-07-14 14:46:46 +08:00
zhouxudong 6ffa3a482c * Fix bug #25262. 2022-07-14 05:49:17 +00:00
孙广明 cb6e69a9b9 * Fix execution list drop load bug. 2022-07-14 10:16:04 +08:00
孙广明 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