Commit Graph
2745 Commits
Author SHA1 Message Date
孙广明 c04d08210a * Code for php error. 2022-07-15 10:56:52 +08:00
liumengyi 5fe08a5c14 * Fix bug #25336. 2022-07-15 10:10:45 +08:00
孙广明 4617c3a040 Merge branch 'fixbug_25202' into 'master'
fixbug_25202

See merge request easycorp/zentaopms!4564
2022-07-15 01:22:47 +00:00
sunjun d375ccf6a3 fixbug_25202 2022-07-15 01:12:58 +00:00
xieqiyu 0c6aa2adb5 * Fix bug#25312. 2022-07-14 15:44:36 +08: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
王怡栋 68c747655c Merge branch 'sprint/master_zhouxudong_25262' into 'master'
* Fix bug #25262.

See merge request easycorp/zentaopms!4543
2022-07-14 05:57:38 +00:00
王怡栋 85c209f5e6 Merge branch 'sprint/master_guofeilong_bug#23351' into 'master'
Sprint/master guofeilong bug#23351

See merge request easycorp/zentaopms!4542
2022-07-14 05:55:09 +00:00
guofeilong dafb0452d3 * Fix bug #23351 2022-07-14 05:50:28 +00:00
zhouxudong 6ffa3a482c * Fix bug #25262. 2022-07-14 05:49:17 +00:00
guofeilong 618d44374a Fix bug #23351 in bug and task batchcreate 2022-07-14 05:37:00 +00:00
孙广明 083ebb7f29 * Fix stage-task tree list bug. 2022-07-14 13:29:23 +08: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
sunjun a40ae1ee63 fixbug_25216 2022-07-14 01:43:36 +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
sunjun 51fe9cc511 fixbug_25216 2022-07-14 01:22:53 +00: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
王怡栋 559baff057 Merge branch 'sprint/215_liumengyi_23641' into 'master'
* Fix bug #23641.

See merge request easycorp/zentaopms!4518
2022-07-13 07:23:02 +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
liumengyi 51dd442c01 * Fix bug #23641. 2022-07-13 14:51:38 +08:00
王怡栋 5f062e08f9 Merge branch 'sprint/215_liumengyi_23641' into 'master'
* Fix bug #23641.

See merge request easycorp/zentaopms!4516
2022-07-13 06:48:13 +00:00
liumengyi db19c66db3 * Fix bug #23641. 2022-07-13 14:45:15 +08:00
孙广明 d2c80aa71a * Code for error. 2022-07-13 14:38:58 +08:00
孙广明 61125b78b5 Merge branch 'sprint/216_mayue_bug24404' into 'master'
Sprint/216 mayue bug24404

See merge request easycorp/zentaopms!4507
2022-07-13 05:29:18 +00: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
mayue 3cfa290a92 * Fix bug #24404. 2022-07-13 11:31:57 +08:00
mayue 090989e25e * Fix bug #24404. 2022-07-13 11:11:36 +08:00
孙广明 1e873272b3 Merge branch 'sprint/216_mayue_bug24404' into 'master'
* Fix bug #24404.

See merge request easycorp/zentaopms!4476
2022-07-13 02:17:12 +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
孙广明 5264032497 * Finish executio task tree. 2022-07-13 08:48:00 +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
王怡栋 d0c15d321f Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
Sprint/master zhouxudong fixbug

See merge request easycorp/zentaopms!4472
2022-07-12 07:41:56 +00:00
王怡栋 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
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
mayue f44d5659df * Fix bug #24404. 2022-07-12 15:00:11 +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
孙广明 4caa38c31e * Code for execution list. 2022-07-12 14:00:25 +08:00